summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fixed Rubocop offensesGabriel Mazetto2015-12-1516-64/+65
* Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-142-34/+81
|\
| * Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-1459-1810/+682
| |\
| * | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-141-1/+30
| * | Improve gitlab ci commits specs (refactoring)Grzegorz Bizon2015-12-142-35/+39
| * | Suppress warning about missing `.gitlab-ci.yml` if builds are disabledGrzegorz Bizon2015-12-141-7/+21
* | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
* | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-142-0/+0
|\ \ \
| * | | Move CI admin builds and runners specs to correct directory [ci skip]Kamil Trzcinski2015-12-142-0/+0
| | |/ | |/|
* | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1464-1820/+836
|\ \ \ | |/ /
| * | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1442-1125/+490
| |\ \
| | * | Fix specsKamil Trzcinski2015-12-113-4/+5
| | * | Fix after column renameKamil Trzcinski2015-12-115-16/+16
| | * | Fix errorsKamil Trzcinski2015-12-113-4/+3
| | * | Fix triggers testsKamil Trzcinski2015-12-112-19/+13
| | * | Reimplement Trigger APIKamil Trzcinski2015-12-111-0/+80
| | * | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-1111-200/+199
| | * | Add runners tokenKamil Trzcinski2015-12-111-1/+1
| | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1138-961/+253
| * | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-1419-682/+189
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix specsKamil Trzcinski2015-12-102-3/+3
| | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1019-682/+189
| * | Fix testsDmitriy Zaporozhets2015-12-111-1/+1
| * | Fix tests for new issuable sidebarDmitriy Zaporozhets2015-12-111-7/+20
| * | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-1/+1
| * | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-113-6/+128
| |\ \
| | * | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-081-3/+3
| | * | Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon2015-12-081-3/+3
| | * | Add `RepositoryPush` specsGrzegorz Bizon2015-12-081-0/+122
| * | | emoji aliases problemValery Sizov2015-12-111-0/+9
* | | | Stub also `ensure_*` method in CI runners API specsci/persist-registration-tokenGrzegorz Bizon2015-12-111-0/+1
* | | | Ensure that runners registration token is presentGrzegorz Bizon2015-12-111-1/+1
* | | | Make sure that token `ensure_*` method always returns a tokenGrzegorz Bizon2015-12-111-1/+8
* | | | Add specs for feature that regenerates runners tokenGrzegorz Bizon2015-12-111-0/+22
* | | | Use new runners registration token to register CI runnersGrzegorz Bizon2015-12-111-3/+6
* | | | Add specs for `TokenAuthenticatable` concernGrzegorz Bizon2015-12-111-0/+50
|/ / /
* | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-111-1/+20
|\ \ \
| * \ \ Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-10287-3357/+6649
| |\ \ \ | | | |/ | | |/|
| * | | Licence also accepted as license fileZeger-Jan van de Weg2015-12-101-1/+10
| * | | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-11101-878/+3122
| |\ \ \
| * | | | Add specs on #licenseZeger-Jan van de Weg2015-10-151-0/+11
* | | | | AuthHash should not parameterize email userCorey Hinshaw2015-12-101-2/+2
* | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu...Dmitriy Zaporozhets2015-12-101-0/+7
|\ \ \ \ \
| * | | | | Add spec for invalid options in project creationStan Hu2015-12-091-0/+7
* | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-101-0/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-101-0/+17
* | | | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-10209-285/+579
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'devise_paranoid_mode' into 'master' Robert Speicher2015-12-101-13/+13
| |\ \ \ \ \
| | * | | | | Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-13/+13
| | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |