summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Only render 404 page from /publicinified_404_errorValery Sizov2015-10-1313-23/+19
* Make group deleted text consistent with group created and updated textsteuneboon2015-10-121-1/+1
* Fix typo(missing quote) when deleting groupsteuneboon2015-10-121-1/+1
* Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-077-163/+91
|\
| * Fix tests and few CI featuresDmitriy Zaporozhets2015-10-072-1/+2
| * Move CI services to project settings areaDmitriy Zaporozhets2015-10-072-59/+49
| * Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-074-84/+38
| * Remove Continuous Integration from project menuDmitriy Zaporozhets2015-10-071-20/+3
* | Add directory feature buttonStan Hu2015-10-072-4/+41
|/
* Fix ci build routing and few testsci-build-pageDmitriy Zaporozhets2015-10-061-2/+6
* Refactor commit/build tests and fix CI cancelDmitriy Zaporozhets2015-10-061-1/+1
* Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-063-42/+6
* Move CI build page to CE projectDmitriy Zaporozhets2015-10-061-0/+25
* Merge branch 'ci-commit-page' into 'master' Dmitriy Zaporozhets2015-10-061-0/+7
|\
| * Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-0/+7
* | Fix broken grouping sql clause when rendering commits for CIKamil Trzcinski2015-10-061-2/+3
|/
* Fix graphical glitchesKamil Trzcinski2015-10-051-3/+5
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-053-16/+2
|\
| * Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-053-16/+2
| |\
| | * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-053-16/+2
* | | Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/g...Dmitriy Zaporozhets2015-10-051-0/+1
|\ \ \ | |/ / |/| |
| * | added user preference to change layout widthPeter Göbel2015-10-051-0/+1
| |/
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-053-5/+6
|\ \ | |/ |/|
| * Fix next round of testsKamil Trzcinski2015-10-051-1/+1
| * Refactor commit and buildKamil Trzcinski2015-10-053-5/+6
* | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-052-53/+45
|/
* 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
View Lorry Controller Status