summaryrefslogtreecommitdiff
path: root/config/routes.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-impersonation-issue' into 'master'Robert Speicher2016-04-251-3/+3
* Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-1/+1
|\
| * Remove unnecessary brackets on WIKI_SLUG_ID route constraintsDouglas Barbosa Alexandre2016-01-141-1/+1
| * Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-1/+1
* | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+6
|\ \ | |/ |/|
| * Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-1/+1
| * Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+6
* | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-141-2/+2
* | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-141-3/+2
* | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-0/+1
* | Disable `:format` in artifacts browser pathGrzegorz Bizon2016-01-141-1/+1
* | Move artifacts controller level upGrzegorz Bizon2016-01-141-7/+3
* | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-1/+2
* | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-141-1/+9
* | Broadcast Messages can now be editedRobert Speicher2016-01-131-1/+1
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-3/+3
|\ \ | |/
| * Merge branch 'issue_3076' into 'master' Drew Blessing2016-01-081-3/+3
| |\
| | * Fix problem with projects ending with .keys #3076Jose Corcuera2016-01-061-3/+3
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-071-0/+18
|\ \ \ | |/ /
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+18
| |/
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-061-61/+64
|\ \ | |/
| * Grace period support for TFAGabriel Mazetto2015-12-241-0/+1
| * Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-211-1/+1
| |\
| | * Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+1
| * | Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
| |/
| * Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-141-45/+21
| |\
| | * Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-34/+21
| | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-101-11/+0
| * | Add CI runners registration token reset buttonGrzegorz Bizon2015-12-111-0/+1
| |/
| * Merge branch 'master' into merge-if-greenDouwe Maan2015-12-091-1/+2
| |\
| | * Move Builds tab to the endDouwe Maan2015-12-081-1/+1
| | * Merge branch 'master' into mr-buildsDouwe Maan2015-12-081-0/+1
| | |\
| | * | Add Builds tab to MR detail pageDouwe Maan2015-12-081-0/+1
| * | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-081-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Implement languages graph pageDmitriy Zaporozhets2015-12-081-0/+1
| | |/
| * | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-1/+2
| |\ \ | | |/
| | * Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-071-0/+1
| | |\
| | | * Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-041-0/+1
| | * | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
| | |/
| * | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-1/+5
| |\ \ | | |/
| | * Rails update to 4.2.4Valery Sizov2015-11-251-1/+1
| | * award emojiValery Sizov2015-11-191-0/+4
| * | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-0/+1
| * | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-181-9/+28
| |\ \ | | |/
| | * Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-171-1/+1
| | |\
| | | * Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-1/+1
| | * | Create milestones in the groupDmitriy Zaporozhets2015-11-161-1/+1
| | |/
| | * Add support for git lfs.lfsMarin Jankovski2015-11-161-1/+1
| | * Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-141-1/+3
| | |\
| | | * refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-1/+3