summaryrefslogtreecommitdiff
path: root/config/routes.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-151-9/+21
|\
| * Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-0/+10
| |\
| | * Add "Replace" and "Upload" featuresliyakun2015-09-151-0/+10
| * | Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-101-0/+11
| |\ \ | | |/
| * | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-9/+11
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-091-15/+25
|\ \ \ | | |/ | |/|
| * | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-091-0/+2
| |\ \
| | * | CRUD for admin labelsValery Sizov2015-09-031-0/+2
| * | | FogBugz project importJared Szechy2015-09-081-0/+9
| | |/ | |/|
| * | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-071-9/+13
| |\ \
| | * | Fix broken Wiki Page HistoryStan Hu2015-09-011-9/+13
| | |/
| * | Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-1/+1
| |/
| * Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-6/+1
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-0/+1
|\ \ | |/
| * Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-0/+1
* | Groundwork for merging CI into CEDouwe Maan2015-08-251-0/+99
|/
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+2
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-2/+2
* Add abuse report management in admin areaDmitriy Zaporozhets2015-08-061-0/+1
* Allow users to send abuse reportsDmitriy Zaporozhets2015-08-061-0/+3
* Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-051-2/+2
|\
| * Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-041-1/+1
| |\
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-2/+2
* | | Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+1
| |/ |/|
* | Add support for destroying project milestonesStan Hu2015-07-171-1/+1
|/
* Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+1
* Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-0/+1
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-061-1/+1
|\
| * Audit log for user authenticationValery Sizov2015-07-061-1/+1
* | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+1
|/
* Refactor admin user pageDmitriy Zaporozhets2015-06-221-0/+3
* Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-1/+1
* Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-1/+1
* Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+2
* Add RootControllerRobert Speicher2015-06-131-1/+1
* Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-131-1/+0
* Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+1
* Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-031-2/+2
* Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-291-1/+0
|\
| * Remove jasmine-rails; add teaspoonRobert Speicher2015-05-281-1/+0
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-0/+1
|/
* Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-1/+1
* Add support for backup codesDmitriy Zaporozhets2015-05-091-1/+5
* Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-091-0/+1
* Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-261-1/+1
* Add atom feed for project activity.Douwe Maan2015-04-231-3/+3
* Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-231-0/+1
|\
| * Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-0/+1
| |\
| | * rails g jasmine_rails:installRobert Speicher2015-04-181-0/+1
* | | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-221-1/+2
|/ /