summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'projects' into 'master' "revert-layout-changesDmitriy Zaporozhets2015-10-055-36/+4
* Merge pull request #9673 from fscherwi/patch-1Dmitriy Zaporozhets2015-10-041-1/+1
|\
| * change build status image to svg [ci skip]fscherwi2015-09-271-1/+1
* | Merge pull request #9690 from ggarnier/masterDmitriy Zaporozhets2015-10-0441-113/+85
|\ \
| * | Fix rubocop warnings in featuresGuilherme Garnier2015-10-036-35/+33
| * | Fix rubocop warnings in spec/lib and spec/tasksGuilherme Garnier2015-10-033-7/+3
| * | Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-0339-238/+237
| |\ \ | |/ / |/| |
* | | Merge branch 'fix-cache-key-expiration-for-commits' into 'master' Dmitriy Zaporozhets2015-10-034-4/+5
|\ \ \
| * | | Update README cache key to use full project namespaceStan Hu2015-10-022-3/+3
| * | | Fix bug where transferring a project would result in stale commit linksStan Hu2015-10-022-1/+2
* | | | 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-025-3/+14
|\ \ \ \
| * | | | Hide password in the service settings formhide_services_passwordValery Sizov2015-10-025-3/+14
* | | | | Merge branch 'access_level_badge_bug' into 'master' Dmitriy Zaporozhets2015-10-024-3/+20
|\ \ \ \ \
| * | | | | Wrong access level badge on MR commentsaccess_level_badge_bugValery Sizov2015-10-024-3/+20
* | | | | | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-027-101/+125
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Conform to spec guidelines that only exist in my headrs-throttle-resetRobert Speicher2015-10-021-1/+1
| * | | | | Fix spec broken by updated Devise translationsRobert Speicher2015-10-011-1/+1
| * | | | | Refactor PasswordsController to use before_actionsRobert Speicher2015-10-012-22/+22
| * | | | | Add recently_reset message to Devise translationsRobert Speicher2015-10-011-0/+1
| * | | | | Add User#recently_sent_password_reset?Robert Speicher2015-10-012-0/+24
| * | | | | Update config/locales/devise.en.yml with latest versionRobert Speicher2015-10-011-51/+52
| * | | | | Remove specs for "login after reset"Robert Speicher2015-09-301-40/+0
| * | | | | Update feature specRobert Speicher2015-09-301-0/+1
| * | | | | Autofocus the email field on the password reset formRobert Speicher2015-09-301-1/+1
| * | | | | Only allow password reset emails once per minuteRobert Speicher2015-09-302-14/+51
* | | | | | Merge branch 'migration-doc-fix' into 'master' Jacob Vosmaer2015-10-021-1/+8
|\ \ \ \ \ \
| * | | | | | Back and forth permission on builds/migration-doc-fixKamil Trzcinski2015-10-021-1/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ensure-ci-project' into 'master' Dmitriy Zaporozhets2015-10-0211-122/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix testsDmitriy Zaporozhets2015-10-022-29/+4
| * | | | | Remove unnecessary fork ci logicDmitriy Zaporozhets2015-10-025-84/+8
| * | | | | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-025-10/+5
| * | | | | Ensure GitLab CI project exists when CI service is activated manuallyensure-ci-projectDmitriy Zaporozhets2015-10-011-0/+5
* | | | | | Added benchmark-ips to the GemfileYorick Peterse2015-10-022-0/+4
* | | | | | 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 spec/modelsGuilherme Garnier2015-10-0311-19/+14
| | | | | * | Fix rubocop warnings in libGuilherme Garnier2015-10-036-9/+5
| | | | | * | Fix rubocop warnings in appGuilherme Garnier2015-10-0314-42/+29
| | | | | * | Enable "UselessAssignment" rubocop lintGuilherme Garnier2015-10-031-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2015-10-013-3/+38
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'upgrade-version' into 'master' Patricio Cano2015-10-011-3/+9
| |\ \ \ \ \ \
| | * \ \ \ \ \ solved conflictkaren Carias2015-09-30757-2068/+21025
| | |\ \ \ \ \ \
| | * | | | | | | made info more clearkaren Carias2015-09-091-1/+3
View Lorry Controller Status