- 28 Nov, 2016 5 commits
-
-
Valery Sizov authored
CE upstream See merge request !912
-
Alejandro Rodríguez authored
[ci skip]
-
Alejandro Rodríguez authored
[ci skip]
-
Valery Sizov authored
-
Valery Sizov authored
-
- 25 Nov, 2016 2 commits
-
-
Robert Speicher authored
Port of rephrase-system-notes to EE See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7692 See merge request !913
-
Douwe Maan authored
-
- 24 Nov, 2016 31 commits
-
-
Alejandro Rodríguez authored
-
Alejandro Rodríguez authored
-
Rémy Coutable authored
Fix StrongAttibutes error with Ruby 2.1 Similarly to gitlab-org/gitlab-ce!7625 See merge request !909
-
Sean McGivern authored
You can only assign default_branch when editing a project Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7726 See merge request !7741
-
Robert Schilling authored
You can only assign default_branch when editing a project or when creating a project for a specified user [ci skip] You can only assign default_branch when editing a project [ci skip]
-
Kamil Trzciński authored
changes environment.last_deployment to a try expression so it does not fail if e… ## What does this MR do? Fixes the call on `environment.last_deployment` to not break when `environment`is not yet set. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24779 See merge request !7671
-
Rémy Coutable authored
Don't convert data which already is the target type With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one. See merge request !7740
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Move admin spam spinach test to RSpec See merge request !7708
-
Robert Schilling authored
-
Achilleas Pipinellis authored
Merge branch '24908-install-instructions-seem-to-have-two-database-steps-out-of-order' into 'master' Fix documentation to create the `pg_trm` extension before creating the DB Closes #24908 See merge request !7735
-
Achilleas Pipinellis authored
Add missing documentation. ## What does this MR do? Add documentation to Build events on webhooks See merge request !7717
-
tiagonbotelho authored
-
Sean McGivern authored
Add default_branch attr to Project API payload in docs. See merge request !7726
-
Robert Speicher authored
Document that we always use `do...end` for `before` in RSpec [ci skip] See merge request !7697
-
Achilleas Pipinellis authored
Change wording in JIRA doc so that redirect in the docs portal will work. See merge request !908
-
Achilleas Pipinellis authored
Add missing JIRA file that redirects to the new location See merge request !7736
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
[ci skip]
-
Robert Speicher authored
[ci skip]
-
Rémy Coutable authored
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Douwe Maan authored
Backport Note#commands_changes from EE One small thing from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870 that was missed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7604. /cc @rdavila See merge request !7730
-
Robert Speicher authored
Log mv_namespace parameters [ci skip] See merge request !7729
-
Douwe Maan authored
-
Chris Wilson authored
-
Douwe Maan authored
Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
-
Rémy Coutable authored
Move admin abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7691
-
Annabel Dunstone Gray authored
Simplify copy on "Create a new list" dropdown in Issue Boards ## What does this MR do? It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659. ## Are there points in the code the reviewer needs to double check? Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified: File: `doc/user/project/issue_board.md` ``` In short, here's a list of actions you can take in an Issue Board: - [Create a new list](#creating-a-new-list). - [Delete an existing list](#deleting-a-list). ``` because I was not sure if changing those was necessary. Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly. File: `spec/features/boards/boards_spec.rb` ## Why was this MR needed? It is an improvement, as suggested in #24659 ## Screenshots (if relevant) **Before:** ![before](/uploads/cffd30b0e9a21d16bc25d046eb4ca42b/before.png) **After:** ![after2](/uploads/95b049e0c1c565c4ccd1a72a3f4be925/after2.png) ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [X] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #24659 See merge request !7605
-
Rémy Coutable authored
Move abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7659
-
Ruben Davila authored
-
- 23 Nov, 2016 2 commits
-
-
Achilleas Pipinellis authored
Remove heading ids from University docs Having ids in headings was preventing the ToC to render correctly See merge request !7720
-
Achilleas Pipinellis authored
[ci skip]
-