summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix rubocop warnings in featuresGuilherme Garnier2015-10-031-4/+4
* Fix rubocop warnings in spec/lib and spec/tasksGuilherme Garnier2015-10-033-7/+3
* Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-039-103/+62
|\
| * Update README cache key to use full project namespaceStan Hu2015-10-021-2/+2
| * Merge branch 'access_level_badge_bug' into 'master' Dmitriy Zaporozhets2015-10-021-0/+12
| |\
| | * Wrong access level badge on MR commentsaccess_level_badge_bugValery Sizov2015-10-021-0/+12
| * | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-023-33/+43
| |\ \ | | |/ | |/|
| | * 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-011-1/+1
| | * Add User#recently_sent_password_reset?Robert Speicher2015-10-011-0/+20
| | * Remove specs for "login after reset"Robert Speicher2015-09-301-40/+0
| | * Update feature specRobert Speicher2015-09-301-0/+1
| | * Only allow password reset emails once per minuteRobert Speicher2015-09-301-7/+36
| * | Merge branch 'ensure-ci-project' into 'master' Dmitriy Zaporozhets2015-10-024-68/+5
| |\ \
| | * | Fix testsDmitriy Zaporozhets2015-10-022-29/+4
| | * | Remove unnecessary fork ci logicDmitriy Zaporozhets2015-10-022-38/+1
| | * | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-021-2/+1
* | | | Fix rubocop warnings in spec/modelsGuilherme Garnier2015-10-0311-19/+14
|/ / /
* | | Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-011-0/+6
|\ \ \ | |/ / |/| |
| * | Fix link with emojiSAKATA Sinji2015-10-021-0/+6
* | | Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'Dmitriy Zaporozhets2015-10-011-0/+1
|\ \ \
| * | | Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being d...Stan Hu2015-10-011-0/+1
| |/ /
* | | Merge branch 'disable-report-button-if-already-reported' into 'master' Douwe Maan2015-10-013-2/+15
|\ \ \
| * | | Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-293-36/+14
| * | | Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-292-2/+37
* | | | Merge branch 'ci-fixes' into 'master' Kamil Trzciński2015-10-011-0/+11
|\ \ \ \
| * | | | Fix: CI token removal regression from build traceci-fixesKamil Trzcinski2015-10-011-0/+11
| | |/ / | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-10-0111-84/+158
|\ \ \ \
| * \ \ \ Merge branch 'mr_improve_errors_handling'Dmitriy Zaporozhets2015-10-011-0/+14
| |\ \ \ \
| | * | | | Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+14
| | |/ / /
| * | | | Merge branch 'include-full-path-in-new-mr-page' into 'master' Dmitriy Zaporozhets2015-10-012-12/+32
| |\ \ \ \
| | * | | | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-302-12/+32
| | |/ / /
| * | | | Merge branch 'project_moving' into 'master' Dmitriy Zaporozhets2015-10-012-4/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Note the original location of a moved project when notifying users of the moveproject_movingValery Sizov2015-10-012-4/+4
| | |/ /
| * | | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-24/+24
| |/ /
| * | Merge branch 'merge-ci-data' into 'master' Dmitriy Zaporozhets2015-09-305-44/+84
| |\ \
| | * | Fix sometimes failing testsKamil Trzcinski2015-09-301-5/+5
| | * | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-305-39/+79
* | | | Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-0171-530/+579
|\ \ \ \ | |/ / /
| * | | Refactor CI helpersDmitriy Zaporozhets2015-09-292-2/+2
| |/ /
| * | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-292-18/+22
| * | Merge branch 'ci-commits-to-projects' into 'master' Dmitriy Zaporozhets2015-09-2927-118/+135
| |\ \
| | * | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projectsKamil Trzcinski2015-09-293-7/+6
| | * | Fix testsKamil Trzcinski2015-09-292-6/+7
| | * | Rename commits to ci_commitsKamil Trzcinski2015-09-291-2/+2
| | * | Fix testsKamil Trzcinski2015-09-293-9/+6
| | * | Fix register_build_service testsKamil Trzcinski2015-09-291-5/+4
| | * | Fix testsKamil Trzcinski2015-09-298-38/+49
| | * | WIPKamil Trzcinski2015-09-2923-74/+84
View Lorry Controller Status