Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ux/suppress-ci-yml-warning' into 'master' | Grzegorz Bizon | 2015-12-14 | 2 | -34/+81 |
|\ | |||||
| * | Merge branch 'master' into ux/suppress-ci-yml-warning | Grzegorz Bizon | 2015-12-14 | 59 | -1810/+682 |
| |\ | |||||
| * | | Do not display ci build status if builds enabled but no `.gitlab-ci.yml` | Grzegorz Bizon | 2015-12-14 | 1 | -1/+30 |
| * | | Improve gitlab ci commits specs (refactoring) | Grzegorz Bizon | 2015-12-14 | 2 | -35/+39 |
| * | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabled | Grzegorz Bizon | 2015-12-14 | 1 | -7/+21 |
* | | | Use a new admin runners path when reseting runners token | Grzegorz Bizon | 2015-12-14 | 1 | -1/+1 |
* | | | Merge branch 'master' into ci/persist-registration-token | Grzegorz Bizon | 2015-12-14 | 2 | -0/+0 |
|\ \ \ | |||||
| * | | | Move CI admin builds and runners specs to correct directory [ci skip] | Kamil Trzcinski | 2015-12-14 | 2 | -0/+0 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into ci/persist-registration-token | Grzegorz Bizon | 2015-12-14 | 64 | -1820/+836 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'ci-project-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 42 | -1125/+490 |
| |\ \ | |||||
| | * | | Fix specs | Kamil Trzcinski | 2015-12-11 | 3 | -4/+5 |
| | * | | Fix after column rename | Kamil Trzcinski | 2015-12-11 | 5 | -16/+16 |
| | * | | Fix errors | Kamil Trzcinski | 2015-12-11 | 3 | -4/+3 |
| | * | | Fix triggers tests | Kamil Trzcinski | 2015-12-11 | 2 | -19/+13 |
| | * | | Reimplement Trigger API | Kamil Trzcinski | 2015-12-11 | 1 | -0/+80 |
| | * | | Remove ci_ prefix from all ci related things | Kamil Trzcinski | 2015-12-11 | 11 | -200/+199 |
| | * | | Add runners token | Kamil Trzcinski | 2015-12-11 | 1 | -1/+1 |
| | * | | Migrate CI::Project to Project | Kamil Trzcinski | 2015-12-11 | 38 | -961/+253 |
| * | | | Merge branch 'ci-services-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 19 | -682/+189 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fix specs | Kamil Trzcinski | 2015-12-10 | 2 | -3/+3 |
| | * | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 19 | -682/+189 |
| * | | Fix tests | Dmitriy Zaporozhets | 2015-12-11 | 1 | -1/+1 |
| * | | Fix tests for new issuable sidebar | Dmitriy Zaporozhets | 2015-12-11 | 1 | -7/+20 |
| * | | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037 | Douwe Maan | 2015-12-11 | 1 | -1/+1 |
| * | | Merge branch 'complexity/rubocop-metrics' into 'master' | Douwe Maan | 2015-12-11 | 3 | -6/+128 |
| |\ \ | |||||
| | * | | Refactor CI YAML processor's validators | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| | * | | Move `common_mentionable_setup` to shared context in specs | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| | * | | Add `RepositoryPush` specs | Grzegorz Bizon | 2015-12-08 | 1 | -0/+122 |
| * | | | emoji aliases problem | Valery Sizov | 2015-12-11 | 1 | -0/+9 |
* | | | | Stub also `ensure_*` method in CI runners API specsci/persist-registration-token | Grzegorz Bizon | 2015-12-11 | 1 | -0/+1 |
* | | | | Ensure that runners registration token is present | Grzegorz Bizon | 2015-12-11 | 1 | -1/+1 |
* | | | | Make sure that token `ensure_*` method always returns a token | Grzegorz Bizon | 2015-12-11 | 1 | -1/+8 |
* | | | | Add specs for feature that regenerates runners token | Grzegorz Bizon | 2015-12-11 | 1 | -0/+22 |
* | | | | Use new runners registration token to register CI runners | Grzegorz Bizon | 2015-12-11 | 1 | -3/+6 |
* | | | | Add specs for `TokenAuthenticatable` concern | Grzegorz Bizon | 2015-12-11 | 1 | -0/+50 |
|/ / / | |||||
* | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 1 | -1/+20 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 287 | -3357/+6649 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+10 |
| * | | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 101 | -878/+3122 |
| |\ \ \ | |||||
| * | | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 1 | -0/+11 |
* | | | | | AuthHash should not parameterize email user | Corey Hinshaw | 2015-12-10 | 1 | -2/+2 |
* | | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu... | Dmitriy Zaporozhets | 2015-12-10 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Add spec for invalid options in project creation | Stan Hu | 2015-12-09 | 1 | -0/+7 |
* | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -0/+17 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 1 | -0/+17 |
* | | | | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching | Douwe Maan | 2015-12-10 | 209 | -285/+579 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'devise_paranoid_mode' into 'master' | Robert Speicher | 2015-12-10 | 1 | -13/+13 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use devise paranoid mode and ensure the same message is returned every time | Drew Blessing | 2015-12-09 | 1 | -13/+13 |
| | |/ / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/mr-broken' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix specsmr-broken | Douwe Maan | 2015-12-08 | 1 | -2/+2 |