summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'lfs_object_removal' into 'master' 23858-task-listsSean McGivern2016-10-311-0/+3
|\ | | | | | | | | | | | | Remove unreferenced LFS objects from DB and fs Fixes #3666 See merge request !5901
| * Remove unreferenced LFS objects from DB and fsFrank Groeneveld2016-10-281-0/+3
| |
* | Create cycle analytics bundlePhil Hughes2016-10-281-0/+1
|/ | | | This prevents VueJS being included in application.js & therefore included on everypage
* Merge branch 'issue_1008_1' into 'master' Sean McGivern2016-10-281-0/+4
|\ | | | | | | | | | | | | | | | | Jira refactoring to jira gem part of gitlab-org/gitlab-ee#1008 Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits See merge request !6598
| * Finish updates to use JIRA gemFelipe Artur2016-10-261-0/+4
| | | | | | | | Code improvements, bug fixes, finish documentation and specs
* | Merge branch 'dz-revert-revert' into 'master' Dmitriy Zaporozhets2016-10-271-15/+18
|\ \ | | | | | | | | | | | | | | | | | | Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"."" Looks like I accidently reverted https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7035 although I did not want to . This MR reverts my revert. See merge request !7127
| * | Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather ↵dz-revert-revertDmitriy Zaporozhets2016-10-271-15/+18
| |/ | | | | | | | | | | than "/twitter"."" This reverts commit 9dbd5b3cfad10b214ae5ef27c39246bbb74a5077.
* | Updated mail_room and added sentinel support to Reply by Email21645-mail_room_sentinelGabriel Mazetto2016-10-261-1/+16
|/
* Revert "Change "Group#web_url" to return "/groups/twitter" rather than ↵Dmitriy Zaporozhets2016-10-241-18/+15
| | | | | | "/twitter"." This reverts commit c81ff152e08d58c13efbd50c40dd2e083ac65083.
* Fix reply-by-email not working due to queue name mismatchsh-fix-mailroom-configStan Hu2016-10-231-1/+1
| | | | | | | | | | mail_room was configured to deliver mail to the `incoming_email` queue while `EmailReceiveWorker` was reading the `email_receiver` queue. Adds a migration that repeats the work of a previous migration to ensure all mails that wound up in the old queue get processed. Closes #23689
* Fix bug where e-mails were not being sent out via SidekiqStan Hu2016-10-211-0/+1
| | | | | | | | | | By default, ActionMailer uses the "mailers" queue, but this entry was not included in the list of queues for Sidekiq to use. For more details: * https://github.com/plataformatec/devise/wiki/How-To:-Send-devise-emails-in-background-(Resque,-Sidekiq-and-Delayed::Job) * http://guides.rubyonrails.org/active_job_basics.html
* Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-212-1/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use separate queues for all Sidekiq workers ## What does this MR do? This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc. This is a critical part we need in 8.13, despite it being so close to release day. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [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/23370 See merge request !7006
| * Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-212-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dumping too many jobs in the same queue (e.g. the "default" queue) is a dangerous setup. Jobs that take a long time to process can effectively block any other work from being performed given there are enough of these jobs. Furthermore it becomes harder to monitor the jobs as a single queue could contain jobs for different workers. In such a setup the only reliable way of getting counts per job is to iterate over all jobs in a queue, which is a rather time consuming process. By using separate queues for various workers we have better control over throughput, we can add weight to queues, and we can monitor queues better. Some workers still use the same queue whenever their work is related. For example, the various CI pipeline workers use the same "pipeline" queue. This commit includes a Rails migration that moves Sidekiq jobs from the old queues to the new ones. This migration also takes care of doing the inverse if ever needed. This does require downtime as otherwise new jobs could be scheduled in the old queues after this migration completes. This commit also includes an RSpec test that blacklists the use of the "default" queue and ensures cron workers use the "cronjob" queue. Fixes gitlab-org/gitlab-ce#23370
* | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-211-15/+18
|/ | | | | Bring back the old behaviour which was changed by 6b90ccb9. Fixes #23527.
* Create protected branches bundleAlfredo Sumaran2016-10-201-0/+1
|
* Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-191-5/+1
|
* Validate if project label title does not exist at group levelDouglas Barbosa Alexandre2016-10-191-0/+1
|
* Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-191-0/+6
|
* Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-183-0/+3
|\
| * Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-183-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve Merge conflicts in editor ## What does this MR do? This is the second iteration of https://gitlab.com/gitlab-org/gitlab-ce/issues/20344 which now allows to resolve conflicts manually providing an editor to the user. ## Are there points in the code the reviewer needs to double check? - Previous implementation has been refactored almost from the ground up. - Also some components like `parallel-conflict-lines` has been optimized to work well with PhantomJS. - The app and files required files are loaded only when needed. `merge_conflicts_bundle.js` is only loaded in `/<group>/<project>/merge_requests/<Id>/conflicts` only ## Why was this MR needed? Some MRs were unable to be solved interactively in the UI, with this MR we let the user to manually fix complex merge request conflicts. ## Screenshots (if relevant) <img src="/uploads/33a016f025bd590b1fc6eeee1ee11626/Screen_Shot_2016-09-19_at_1.39.39_PM.png" width="800"> ## 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 - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/3567. See merge request !6374
| | * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-174-2/+12
| | |\
| | * | Refactor JS codeAlfredo Sumaran2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
| | * | Allow setting content for resolutionsSean McGivern2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading conflicts: 1. Add a `type` field. `text` works as before, and has `sections`; `text-editor` is a file with ambiguous conflict markers that can only be resolved in an editor. 2. Add a `content_path` field pointing to a JSON representation of the file's content for a single file. 3. Hitting `content_path` returns a similar datastructure to the `file`, but without the `content_path` and `sections` fields, and with a `content` field containing the full contents of the file (with conflict markers). When writing conflicts: 1. Instead of `sections` being at the top level, they are now in a `files` array. This matches the read format better. 2. The `files` array contains file hashes, each of which must contain: a. `new_path` b. `old_path` c. EITHER `sections` (which works as before) or `content` (with the full content of the resolved file).
| | * | Add instrumentation to conflict classesSean McGivern2016-10-131-0/+1
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-10-171-4/+10
|\ \ \ \ | |/ / / | | | | | | | | 22191-delete-dynamic-envs-mr
| * | | Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-171-4/+10
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename users routing from /u/:username to /users/:username for consistency with other routes Renames /u/:username to /users/:username To follow consistency with other routes (like groups) and UsersController name. Now when you can use `/:username` for accessing user page there is no need in shortcut like `/u/` See merge request !6851
| | * | Add todo for deprecated user routes and more information about deprecation ↵dz-rename-user-routesDmitriy Zaporozhets2016-10-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | to changelog 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>
* | | | Remove destroy from environments [ci skip]Kamil Trzcinski2016-10-171-1/+1
| | | |
* | | | Add environment stop action [ci skip]Kamil Trzcinski2016-10-171-1/+5
|/ / /
* | | Fix 404 when group path has dot in the namedz-fix-group-with-dotDmitriy Zaporozhets2016-10-161-1/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceJacob Schatz2016-10-151-0/+2
|\ \ \
| * | | Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to prevent routing error when user access URL like /123 when there is no resource located under such name Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add exists to users routes and fix endpoint.Bryce Johnson2016-10-151-0/+1
| | | |
* | | | Revert conflict resolution in routes.rb.Bryce Johnson2016-10-151-792/+0
| | | |
* | | | Make UX upgrades to SignIn/Register views.Bryce Johnson2016-10-151-0/+792
|/ / / | | | | | | | | | | | | | | | | | | - Tab between register and sign in forms - Add individual input validation error messages - Validate username - Update many styles for all login-box forms
* | | Merge branch 'issue-23306-fix' into 'master' Dmitriy Zaporozhets2016-10-141-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing routes to make group edits work 6b90ccb9fd changed the routes so that users/groups can be accessed via`/:id`, but the Rails `form_for` method expects to use the `groups#show` path helper for the form action URL. This causes group edits and deletes to fail because the PUT/PATCH/DELETE methods did not exist for `/:id`. This MR adds these methods so that `form_for` continues to work. Closes #23306 See merge request !6874
| * | | Move edit group scenario to rspec and refactor groups_specDmitriy Zaporozhets2016-10-141-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add missing routes to make group edits workStan Hu2016-10-131-0/+4
| | |/ | |/| | | | | | | Closes #23306
* | | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
| * | | Changed how collections are renderedPhil Hughes2016-10-061-794/+0
| | | | | | | | | | | | | | | | | | | | Used variables in haml for replicated checks Fixed broken conflict
| * | | Merge branch 'master' into members-uiPhil Hughes2016-10-0619-75/+845
| |\ \ \
| * \ \ \ Merge branch 'master' into members-uiPhil Hughes2016-10-049-38/+64
| |\ \ \ \
| * | | | | Included groups on project_members pagePhil Hughes2016-09-131-1/+1
| | | | | |
* | | | | | Rename method in testZ.J. van de Weg2016-10-141-0/+5
| | | | | |
* | | | | | Moved ci_status environments logic to new action ci_envrionments_status and ↵Luke Bennett2016-10-142-5/+1
| |_|_|/ / |/| | | | | | | | | | | | | | set up frontend polling
* | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues Board ## What does this MR do? This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid a lot of conflicts with EE multiple boards feature. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[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)~~ - [x] API support added - Tests - [X] Added for this feature/bug - [ ] 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) - [ ] 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? https://gitlab.com/gitlab-org/gitlab-ee/issues/929 https://gitlab.com/gitlab-org/gitlab-ee/issues/1084 See merge request !6727
| * | | | Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-111-1/+1
| | | | |
* | | | | Merge branch 'download_snippets' into 'master' Sean McGivern2016-10-121-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-0/+1
| | | | | |