summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add todo for deprecated user routes and more information about deprecation ↵dz-rename-user-routesDmitriy Zaporozhets2016-10-172-1/+3
| | | | | | to changelog Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add user routing rename to CHANGELOGDmitriy Zaporozhets2016-10-131-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove /u/ prefix from user pages in documentationDmitriy Zaporozhets2016-10-1313-87/+87
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update users routing specDmitriy Zaporozhets2016-10-132-6/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rename users routing from /u/:username to /users/:username for consistency ↵Dmitriy Zaporozhets2016-10-121-4/+8
| | | | | | with other routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-125-1/+222
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: New /users/:id/events endpoint ## What does this MR do? If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level). ## Why was this MR needed? Because it's a nice feature to calculate leaderboards, for instance for #17815. ## What are the relevant issue numbers? Closes #20866. See merge request !6771
| * Make spec deterministicuser-events-apiRémy Coutable2016-10-111-11/+9
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Addresses Robert's feedbackRémy Coutable2016-10-113-4/+5
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * API: New /users/:id/events endpointRémy Coutable2016-10-104-0/+222
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'add-disabled-delete-button' into 'master' Robert Speicher2016-10-122-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add disabled delete button to protected branches ## What does this MR do? Add's a disabled CSS style for the delete button on protected branches instead of hiding the button ## What are the relevant issue numbers? Closes #22358 See merge request !6439
| * | Add disabled delete button to protected branchesClement Ho2016-10-112-2/+3
| | |
* | | Merge branch 'speed-up-api-projects-spec' into 'master' Robert Speicher2016-10-121-13/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up specs for GET /projects/:id/events ## What does this MR do? Just groups some expectations into a single `it` block. Reduce this particular tests block time by half. See merge request !6778
| * | | Speed up specs for GET /projects/:id/eventsspeed-up-api-projects-specRémy Coutable2016-10-101-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | From 8.15s to 4.55s by grouping expectations Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-1217-45/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes inconsistency regarding tagging immediately as merged once you create a … - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 #20708 See merge request !6408
| * | | | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-1116-46/+65
| | | | |
| * | | | writes tests to verify the issue is solved and fixes breaking issues.tiagonbotelho2016-10-092-6/+14
| | | | |
| * | | | removes inconsistency regarding tagging immediately as merged once you ↵tiagonbotelho2016-10-092-1/+7
| | | | | | | | | | | | | | | | | | | | create a branch using new branch button and adds changelog entry
* | | | | Merge branch 'download_snippets' into 'master' Sean McGivern2016-10-124-3/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 'Download' button to snippet view ## What does this MR do? Adds a `Download` button above a snippet. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Requested in #22811 ## Screenshots (if relevant) ![image](/uploads/59b67aa02cc601c08a18fd60c37797ed/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [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 - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 you do - 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 #22811 See merge request !6720
| * | | | | Added 'Download' button to snippet viewJustin DiPierro2016-10-114-3/+14
| | | | | |
* | | | | | Merge branch 'sh-update-changelog' into 'master' Stan Hu2016-10-111-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entry for 8.12.6 See merge request !6816
| * | | | | | Add CHANGELOG entry for 8.12.6sh-update-changelogStan Hu2016-10-111-0/+3
|/ / / / / /
* | | | | | Merge branch 'select2-fix-for-project-lfs-enabled' into 'master' Rémy Coutable2016-10-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix JS bug with select2 because of missing `data-field` attribute in select box. Fix JS bug with select2 because of missing `data-field` attribute in select box. Fixes #23193 See merge request !6812
| * | | | | | FIx JS bug with select2 because of missing `data-field` attribute in select box.Patricio Cano2016-10-111-1/+1
| | | | | | |
* | | | | | | Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-114-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Share projects only with groups current_user can access Aims to address the issues here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23004 * Projects can be shared with non-existent groups * Projects can be shared with groups that the current user does not have access to read Concerns: The new implementation of the API endpoint allows projects to be shared with a larger range of groups than can be done via the web UI. The form for sharing a project with a group uses the following API endpoint to index the available groups: https://gitlab.com/gitlab-org/gitlab-ce/blob/494269fc92f61098ee6bd635a0426129ce2c5456/lib/api/groups.rb#L17. The groups indexed in the web form will only be those groups that the user is currently a member of. The new implementation allows projects to be shared with any group that the authenticated user has access to view. This widens the range of groups to those that are public and internal. See merge request !2005 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entriesRémy Coutable2016-10-111-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'allow_multiple_labels_commands' into 'master' Rémy Coutable2016-10-113-3/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow multiple labels commands ### What does this MR do? This MR should add multiple command support for all label related commands. ### What are the relevant issue numbers? Closes #22965 See merge request !6780
| * | | | | | | allow multiple labels commandsbarthc2016-10-113-3/+62
| | | | | | | |
* | | | | | | | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-113-0/+17
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respond with 404 Not Found for non-existent tags ## What does this MR do? Handles the case when a non-existent tag is being viewed, and responds with 404 Not Found instead of 500 Internal Server Error. ## Are there points in the code the reviewer needs to double check? The small changes should be clear from a simple diff. ## Why was this MR needed? To resolve the issue #22211. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 #22211 See merge request !6699
| * | | | | | | Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-11391-1934/+6133
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '22211-500-instead-of-404' of ↵Linus G Thiel2016-10-050-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/yesbabyyes/gitlab-ce into 22211-500-instead-of-404
| | * | | | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-053-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-existent tags should be handled with 404 Not Found.
| * | | | | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-052-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-existent tags should be handled with 404 Not Found.
| * | | | | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-053-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-existent tags should be handled with 404 Not Found.
* | | | | | | | | | Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-119-1/+221
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to bulk assign issues to author of merge request ## What does this MR do? Provides a link to auto-assign issues to the author of a merge request, when they are mentioned as being closed by the MR. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To help avoid working on a MR without having assigned related issues to self ## What are the relevant issue numbers? Fixes #18876 ## Screenshots (if relevant) ![ScreenShot-P216](/uploads/1af5e71a0a0ff0a60c5d7b54c0e09d9c/ScreenShot-P216.png) ## Tasks - [x] Refactor or move away from using `BulkUpdateService` - [x] ~~Consider alternate link message when only a subset of issues will be assigned~~ - [x] Minimize repeated calls to expensive `closes_issues` method - [x] Move away from using inflector for pluralization and fix flash message - [x] Change auth `before_action` and fallback to error flash message - [x] Shouldn't overwrite current assignee if one exists ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5725
| * | | | | | | | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-101-1/+1
| | | | | | | | | | |
| * | | | | | | | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-073-3/+22
| | | | | | | | | | |
| * | | | | | | | | | Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-069-1/+202
| | | | | | | | | | |
* | | | | | | | | | | Remove pointless `.vagrant_enabled` fileRobert Speicher2016-10-111-0/+0
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'guests_cant_see_mrs' into 'master' Sean McGivern2016-10-1113-13/+143
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make guests unable to view MRs ## What does this MR do? Make guests unable to view MRs. This also fixes a bug when a non-member user could get notification if mentioned (in private project, it's OK for public project). Now if you are a guest and you will be mentioned in one of the MRs you won't get a notification. ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1410 See merge request !6673
| * | | | | | | | | | Make guests unable to view MRsguests_cant_see_mrsValery Sizov2016-10-1113-13/+143
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'build-instead-create-in-label-link-spec' into 'master' Dmitriy Zaporozhets2016-10-111-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build instead create in label_link model spec ## What does this MR do? This MR improves spec for label link model. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Because for check validations, we can use build instead create a record in the database. ## Screenshots (if relevant) No ## Does this MR meet the acceptance criteria? - n/a [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - n/a [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - n/a API support added - Tests - n/a 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) - n/a [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6792
| * | | | | | | | | | | Build instead create in label_link model specSemyon Pupkov2016-10-111-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-empty-describe' into 'master' Dmitriy Zaporozhets2016-10-111-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove empty describe block on key spec model ## What does this MR do? Removes unnecessary describe in test ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? It describe block not needed. ## Screenshots (if relevant) No ## Does this MR meet the acceptance criteria? - n/a [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - n/a [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - n/a API support added - Tests - n/a 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? No See merge request !6793
| * | | | | | | | | | | | Remove empty describe block on key spec modelSemyon Pupkov2016-10-111-3/+0
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix-changelog-entries-in-wrong-version' into 'master' Robert Speicher2016-10-111-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some CHANGELOG entries to the 8.13.0 part Spotted while reviewing https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/789/diffs#diff-1 [ci skip] See merge request !6809
| * | | | | | | | | | | | Move some CHANGELOG entries to the 8.13.0 partRémy Coutable2016-10-111-4/+4
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spotted while reviewing https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/789/diffs#diff-1. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'docs/refactor-operations' into 'master' Achilleas Pipinellis2016-10-1111-364/+370
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move operations/ to new location ## What does this MR do? Move operations/ to new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6519
| * | | | | | | | | | | | Move operations/ to new locationdocs/refactor-operationsAchilleas Pipinellis2016-10-1111-364/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'sh-fix-changelog' into 'master' Rémy Coutable2016-10-111-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate CHANGELOG entry mail_room was bumped for 8.12.5. See merge request !6806
| * | | | | | | | | | | | | Remove duplicate CHANGELOG entrysh-fix-changelogStan Hu2016-10-111-1/+0
| | | | | | | | | | | | | |