summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Fix builds view count indicatorKamil Trzcinski2015-10-151-2/+2
* Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-152-2/+14
|\
| * Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-152-2/+14
* | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-151-1/+1
|\ \
| * | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-151-1/+1
| * | Eager load various issue/note associationsYorick Peterse2015-10-151-1/+1
| |/
* | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-152-14/+5
|\ \
| * \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1525-224/+188
| |\ \ | | |/
| * | Always return HTML in git_not_foundJacob Vosmaer2015-10-141-1/+1
| * | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-081-13/+4
* | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-151-2/+23
|\ \ \
| * | | Fix specsKamil Trzcinski2015-10-141-6/+6
| * | | Refactor builds viewKamil Trzcinski2015-10-141-5/+5
| * | | Added builds viewKamil Trzcinski2015-10-141-2/+23
* | | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-0/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix error preventing displaying of commit data for a directory with a leading...Stan Hu2015-10-121-0/+7
* | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-142-2/+2
|\ \ \ \
| * | | | Simplify code around (cross)-referencesDouwe Maan2015-10-122-2/+2
* | | | | Show warning if build doesn't have runners with specified tags or runners did...Kamil Trzcinski2015-10-142-3/+3
| |_|/ / |/| | |
* | | | 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
View Lorry Controller Status