summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| | * | | Ensure GitLab CI project exists when CI service is activated manuallyensure-ci-projectDmitriy Zaporozhets2015-10-011-0/+5
| * | | | Merge branch 'add_last_push_widget' into 'master' Dmitriy Zaporozhets2015-10-022-0/+4
| |\ \ \ \
| | * | | | Add last push widget to starred projects dashboardDrew Blessing2015-10-012-0/+4
* | | | | | Fix rubocop warnings in appGuilherme Garnier2015-10-0314-42/+29
|/ / / / /
* | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-10-011-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-011-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix link with emojiSAKATA Sinji2015-10-021-1/+1
* | | | | | Merge branch 'rs-update-note' into 'master'Robert Speicher2015-10-013-9/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Simplify Note#editable?rs-update-noteRobert Speicher2015-09-301-1/+1
| * | | | | Ensure notes are highlighted properly when they're updatedRobert Speicher2015-09-301-7/+9
| * | | | | Don't render the edit_form view for system notesRobert Speicher2015-09-301-1/+3
| | |/ / / | |/| | |
* | | | | Remove email footer textZeger-Jan van de Weg2015-10-011-2/+0
| |/ / / |/| | |
* | | | Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-012-19/+17
|\ \ \ \
| * | | | Avoid unnecessary usage of local varsshow-diff-stats-for-mrDmitriy Zaporozhets2015-10-012-6/+3
| * | | | Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-19/+20
* | | | | Merge branch 'fix-email-typo' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \
| * | | | | notify: fix typo in merged_merge_request_email templateBen Boeckel2015-09-301-1/+1
* | | | | | Merge branch 'fix-visit-project-button' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ \ \ \ \
View Lorry Controller Status