summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-10-035-4/+36
| |\ \ | | |/ | |/|
| | * removed max-heght from project.scssprojectsAndrey2015-10-021-6/+0
| | * max height to layout.scssAndrey2015-10-021-0/+6
| | * section and .content now in layout.csscAndrey2015-10-022-11/+10
| | * CSS markup fixedAndrey2015-10-025-38/+30
| | * css aligningAndrey2015-10-011-1/+0
| | * content block height fixAndrey2015-10-012-3/+45
| * | Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-022-3/+8
| |\ \
| | * | Hide password in the service settings formhide_services_passwordValery Sizov2015-10-022-3/+8
| * | | Merge branch 'access_level_badge_bug' into 'master' Dmitriy Zaporozhets2015-10-022-3/+7
| |\ \ \
| | * | | Wrong access level badge on MR commentsaccess_level_badge_bugValery Sizov2015-10-022-3/+7
| * | | | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-023-17/+29
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Refactor PasswordsController to use before_actionsRobert Speicher2015-10-011-21/+21
| | * | | Add User#recently_sent_password_reset?Robert Speicher2015-10-011-0/+4
| | * | | Autofocus the email field on the password reset formRobert Speicher2015-09-301-1/+1
| | * | | Only allow password reset emails once per minuteRobert Speicher2015-09-301-7/+15
| * | | | Merge branch 'ensure-ci-project' into 'master' Dmitriy Zaporozhets2015-10-025-52/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove unnecessary fork ci logicDmitriy Zaporozhets2015-10-023-46/+7
| | * | | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-022-6/+2