summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-07524-2001/+10263
|\
| * Fix routing in CI mailerDmitriy Zaporozhets2015-10-077-8/+8
| * Fix ci build routing and few testsci-build-pageDmitriy Zaporozhets2015-10-063-4/+8
| * 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-0613-396/+23
| * Move CI build page to CE projectDmitriy Zaporozhets2015-10-066-3/+247
| * Merge branch 'ci-commit-page' into 'master' Dmitriy Zaporozhets2015-10-066-1/+92
| |\
| | * Link ci_status_path to new ci commit pageci-commit-pageDmitriy Zaporozhets2015-10-061-1/+2
| | * Render CI statuses on commit pageDmitriy Zaporozhets2015-10-065-0/+90
| * | Merge branch 'fix_search_in_file_tree' into 'master' Dmitriy Zaporozhets2015-10-061-1/+4
| |\ \
| | * | Fix search in FilesValery Sizov2015-10-061-1/+4
| * | | Fix broken grouping sql clause when rendering commits for CIKamil Trzcinski2015-10-061-2/+3
| | |/ | |/|
| * | Merge branch 'fix-ci-bugs' into 'master' Kamil Trzciński2015-10-065-15/+26
| |\ \
| | * | Fixed failure reading .gitlab-ci.ymlfix-ci-bugsKamil Trzcinski2015-10-061-1/+1
| | * | Latest builds always include builds with unique name and unique refKamil Trzcinski2015-10-061-1/+1
| | * | Fix graphical glitchesKamil Trzcinski2015-10-053-13/+24
| | |/
| * | Merge branch 'closer-ci-integration' into 'master' Dmitriy Zaporozhets2015-10-061-22/+36
| |\ \ | | |/ | |/|
| | * Use CI commit status for merge request widgetcloser-ci-integrationDmitriy Zaporozhets2015-10-061-22/+36
| * | Fix builds viewKamil Trzcinski2015-10-051-1/+1
| |/
| * Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-056-28/+3
| |\
| | * Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-056-28/+3
| | |\
| | | * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-056-28/+3
| * | | Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/g...Dmitriy Zaporozhets2015-10-056-1/+27
| |\ \ \ | | |/ / | |/| |
| | * | improved code style and layout option namingPeter Göbel2015-10-055-6/+6
| | * | added user preference to change layout widthPeter Göbel2015-10-056-1/+27
| * | | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-0528-236/+188
| |\ \ \
| | * | | Fix create_trigger_request_service_specrefactor-build-serviceKamil Trzcinski2015-10-051-1/+2
| | * | | Fix GitLabCiService and remove ci_yaml_file from CI push dataKamil Trzcinski2015-10-051-21/+2
| | * | | Add stage testsKamil Trzcinski2015-10-051-1/+2
| | * | | Fix rest of testsKamil Trzcinski2015-10-052-8/+6
| | * | | Fix build pipeliningKamil Trzcinski2015-10-052-2/+13
| | * | | Fix next bunch of testsKamil Trzcinski2015-10-052-2/+9
| | * | | Fix triggers specKamil Trzcinski2015-10-051-3/+7
| | * | | Fix next round of testsKamil Trzcinski2015-10-058-46/+30
| | * | | Fix builds_without_retryKamil Trzcinski2015-10-053-13/+10
| | * | | Make commit_spec runKamil Trzcinski2015-10-056-67/+69
| | * | | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-056-22/+11
| | * | | Refactor commit and buildKamil Trzcinski2015-10-0525-186/+163
| * | | | Merge branch 'fix-referer-origin' into 'master' Patricio Cano2015-10-051-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix referals for :back and relative URL installs.Geoffrey Challen2015-10-031-1/+1
| * | | | Merge branch 'revert-layout-changes' into 'master' Dmitriy Zaporozhets2015-10-055-36/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Revert "Merge branch 'projects' into 'master' "revert-layout-changesDmitriy Zaporozhets2015-10-055-36/+4
| | | |/ | | |/|
| * | | Merge branch 'ci-web-hooks'Dmitriy Zaporozhets2015-10-055-63/+55
| |\ \ \
| | * | | CI web hooks menu active state and consitent titleci-web-hooksDmitriy Zaporozhets2015-10-052-2/+2
| | * | | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-055-62/+54
| | |/ /
| * | | Fix anchors to comments in diffsValery Sizov2015-10-051-0/+7
| |/ /
| * | Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-0321-81/+100
| |\ \ | | |/
| | * Merge branch 'fix-cache-key-expiration-for-commits' into 'master' Dmitriy Zaporozhets2015-10-032-2/+2
| | |\
| | | * Update README cache key to use full project namespaceStan Hu2015-10-021-1/+1
| | | * Fix bug where transferring a project would result in stale commit linksStan Hu2015-10-021-1/+1