summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-0518-358/+341
|\
| * Fix create_trigger_request_service_specrefactor-build-serviceKamil Trzcinski2015-10-052-6/+6
| * Fix gitlab_ci_yaml_processor specsKamil Trzcinski2015-10-051-0/+3
| * Fix GitLabCiService and remove ci_yaml_file from CI push dataKamil Trzcinski2015-10-053-22/+11
| * Add stage testsKamil Trzcinski2015-10-051-0/+34
| * Make rubocop happyKamil Trzcinski2015-10-052-3/+3
| * Fix rest of testsKamil Trzcinski2015-10-054-128/+61
| * Fix build pipeliningKamil Trzcinski2015-10-051-0/+55
| * Fix next bunch of testsKamil Trzcinski2015-10-052-8/+14
| * Fix triggers specKamil Trzcinski2015-10-051-23/+8
| * Fix next round of testsKamil Trzcinski2015-10-0511-54/+72
| * Make commit_spec runKamil Trzcinski2015-10-055-102/+91
| * Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-052-38/+9
| * Refactor commit and buildKamil Trzcinski2015-10-051-1/+1
* | Evaluate benchmark blocks in the proper contextYorick Peterse2015-10-051-1/+3
* | Merge branch 'ci-web-hooks'Dmitriy Zaporozhets2015-10-051-0/+27
|\ \
| * | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-051-0/+27
| |/
* | Merge branch 'benchmark-suite' into 'master' Yorick Peterse2015-10-054-3/+105
|\ \ | |/ |/|
| * Added benchmark_subject method for benchmarksYorick Peterse2015-10-052-4/+21
| * Basic setup for an RSpec based benchmark suitebenchmark-suiteYorick Peterse2015-10-023-1/+84
| * Don't use "rm" for cleaning tmp/buildsYorick Peterse2015-10-021-2/+4
* | 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
|\ \ \ \