summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-033-17/+28
|\
| * Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-021-1/+3
| |\
| | * Hide password in the service settings formhide_services_passwordValery Sizov2015-10-021-1/+3
| * | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-16/+24
| |\ \ | | |/ | |/|
| | * Refactor PasswordsController to use before_actionsRobert Speicher2015-10-011-21/+21
| | * Only allow password reset emails once per minuteRobert Speicher2015-09-301-7/+15
| * | Add last push widget to starred projects dashboardDrew Blessing2015-10-011-0/+1
* | | Fix rubocop warnings in appGuilherme Garnier2015-10-033-4/+4
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-10-013-22/+5
|\ \
| * \ Merge branch 'mr_improve_errors_handling'Dmitriy Zaporozhets2015-10-011-0/+1
| |\ \ | | |/ | |/|
| | * Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+1
| * | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-21/+0
| |/
| * Delegate ci_project parameters to projectsKamil Trzcinski2015-09-301-1/+4
* | Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-0122-271/+232
|\ \ | |/
| * Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-293-32/+39
| * Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-292-43/+35
| * Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-284-37/+29
| * Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-284-77/+76
| |\
| | * Move runners page to project settingsDmitriy Zaporozhets2015-09-254-77/+76
| * | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+6
| |\ \
| | * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+6
| * | | Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-261-0/+4
| | |/ | |/|
| * | Remove CI dashboardDmitriy Zaporozhets2015-09-241-14/+2
| |/
| * Show CI status on commit pageDmitriy Zaporozhets2015-09-241-0/+2
| * Check for CI enabled in correct placeDmitriy Zaporozhets2015-09-242-1/+1
| * Add header for ci graphs and check that it is enabledDmitriy Zaporozhets2015-09-241-0/+7
| * Merge branch 'master' into move-ci-chartsDmitriy Zaporozhets2015-09-241-0/+5
| |\
| | * Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-241-37/+8
| | |\
| | * \ Merge branch 'rs-fix-help-links' into 'master' Douwe Maan2015-09-231-0/+5
| | |\ \
| | | * | Simplify help path prefixingrs-fix-help-linksRobert Speicher2015-09-231-17/+4
| | | * | Prevent double-prefixing of help page pathsRobert Speicher2015-09-221-0/+18
| * | | | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-232-24/+10
| | |_|/ | |/| |
| * | | Remove non-existing pageDmitriy Zaporozhets2015-09-231-5/+2
| * | | Fix search for ci projects and cleanup unnecessary codeDmitriy Zaporozhets2015-09-231-7/+1
| * | | Simplify CI projects queryDmitriy Zaporozhets2015-09-231-3/+6
| * | | Show only enabled CI projectsDmitriy Zaporozhets2015-09-231-25/+2
| |/ /
| * | Fix error when MR source branch no longer exists.fix-mr-missing-source-branch-errorDouwe Maan2015-09-221-2/+1
| |/
| * Merge branch 'fix-ci-permissions' into 'master' Dmitriy Zaporozhets2015-09-221-1/+1
| |\
| | * Fix permissions problemsKamil Trzcinski2015-09-211-1/+1
| * | Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-211-4/+6
| |\ \ | | |/ | |/|
| | * Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-181-4/+6
| * | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-0/+7
| * | Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-0/+4
| |\ \
| | * | Minor code cleanupnotification-levelsDouwe Maan2015-09-201-2/+3
| | * | Use the `find_by_user_id` magic finder instead of `where`.Patricio Cano2015-09-161-1/+1
| | * | Merge branch 'master' into notification-levelsPatricio Cano2015-09-1626-13/+941
| | |\ \
| | * \ \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-1616-44/+63
| | |\ \ \
| | * | | | Notification dropdown now shows currently active level, and also shows what t...Patricio Cano2015-09-141-1/+3
| | * | | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-1/+1
| | * | | | PAtrially working notification buttonDarby2015-09-141-0/+1
View Lorry Controller Status