summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-011-0/+12
|\
| * Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-311-0/+12
* | Initialize Sidekiq with the list of queues used by GitLabsh-init-sidekiq-queuesStan Hu2016-11-011-0/+16
* | Merge branch 'blacklist-osl' into 'master' Robert Speicher2016-11-011-0/+7
|\ \
| * | Blacklist the OSL 3.0 licenseSean McGivern2016-10-281-0/+7
* | | Merge branch 'lfs_object_removal' into 'master' 23858-task-listsSean McGivern2016-10-311-0/+3
|\ \ \ | |_|/ |/| |
| * | Remove unreferenced LFS objects from DB and fsFrank Groeneveld2016-10-281-0/+3
* | | Create cycle analytics bundlePhil Hughes2016-10-281-0/+1
|/ /
* | Merge branch 'issue_1008_1' into 'master' Sean McGivern2016-10-281-0/+4
|\ \ | |/ |/|
| * Finish updates to use JIRA gemFelipe Artur2016-10-261-0/+4
* | Merge branch 'dz-revert-revert' into 'master' Dmitriy Zaporozhets2016-10-271-15/+18
|\ \
| * | Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather tha...dz-revert-revertDmitriy Zaporozhets2016-10-271-15/+18
| |/
* | 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 "/twit...Dmitriy Zaporozhets2016-10-241-18/+15
* Fix reply-by-email not working due to queue name mismatchsh-fix-mailroom-configStan Hu2016-10-231-1/+1
* Fix bug where e-mails were not being sent out via SidekiqStan Hu2016-10-211-0/+1
* Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-212-1/+48
|\
| * Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-212-1/+48
* | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-211-15/+18
|/
* 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
| |\
| | * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-174-2/+12
| | |\
| | * | Refactor JS codeAlfredo Sumaran2016-10-131-0/+1
| | * | Allow setting content for resolutionsSean McGivern2016-10-131-0/+1
| | * | Add instrumentation to conflict classesSean McGivern2016-10-131-0/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy...Kamil Trzcinski2016-10-171-4/+10
|\ \ \ \ | |/ / /
| * | | Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-171-4/+10
| |\ \ \ | | |_|/ | |/| |
| | * | Add todo for deprecated user routes and more information about deprecation to...dz-rename-user-routesDmitriy Zaporozhets2016-10-171-0/+2
| | * | Rename users routing from /u/:username to /users/:username for consistency wi...Dmitriy Zaporozhets2016-10-121-4/+8
* | | | 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
* | | 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
* | | | 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
|/ / /
* | | Merge branch 'issue-23306-fix' into 'master' Dmitriy Zaporozhets2016-10-141-0/+3
|\ \ \
| * | | Move edit group scenario to rspec and refactor groups_specDmitriy Zaporozhets2016-10-141-1/+0
| * | | Add missing routes to make group edits workStan Hu2016-10-131-0/+4
| | |/ | |/|
* | | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-141-1/+1
|\ \ \
| * | | Changed how collections are renderedPhil Hughes2016-10-061-794/+0
| * | | 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
View Lorry Controller Status