summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-tokenPawel Chojnacki2017-07-103-7/+9
* Add tests for token auth.Pawel Chojnacki2017-07-063-20/+63
* Limit docs line lenghtPawel Chojnacki2017-07-061-3/+4
* Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-053-11/+4
* Add spaces between test phasesPawel Chojnacki2017-07-053-3/+20
* Finish refactring processed configuraiton, and add test validating ip range m...Pawel Chojnacki2017-07-052-10/+24
* Add Changelog entryPawel Chojnacki2017-07-051-0/+4
* correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-052-2/+5
* Bring back healthcheck token access to monitoring resources, but mark this as...Pawel Chojnacki2017-07-054-8/+47
* Remove the need to use health check tokenPawel Chojnacki2017-07-0510-65/+87
* Merge branch '34544_add_italian_translation_of_i18n' into 'master'34621-add-subgroups-limitations-to-pages-docsDouwe Maan2017-07-044-1/+1149
|\
| * fix the format of the translation string黄涛2017-07-031-4/+4
| * fix the format of the translation string黄涛2017-06-301-136/+137
| * add Italian translation to I18N黄涛2017-06-304-1/+1148
* | Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'Sean McGivern2017-07-043-13/+69
|\ \
| * | Prevent accidental deletion of protected MR source branch by repeating checks...dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-043-13/+69
* | | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-045-4/+52
|\ \ \
| * | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-045-4/+52
* | | | Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' int...Grzegorz Bizon2017-07-041-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'bump-prometheus-version-to-fix-text-representatio...bump-prometheus-version-to-fix-text-representation-problemPaweł Chojnacki2017-07-0447-229/+1174
| |\ \ \ \ | | |/ / /
| * | | | Update prometheus client gemPawel Chojnacki2017-07-041-2/+2
* | | | | Merge branch 'dm-9-3-requires-mysql-trigger' into 'master'Sean McGivern2017-07-043-6/+15
|\ \ \ \ \
| * | | | | Document that GitLab 9.3 requires the TRIGGER permission on MySQLdm-9-3-requires-mysql-triggerDouwe Maan2017-07-043-6/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-044-10/+21
|\ \ \ \ \
| * | | | | updated changelog entryStefan Hanreich2017-06-271-1/+1
| * | | | | chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
| * | | | | fixed incorrect test case (for real), added another oneStefan Hanreich2017-06-191-1/+2
| * | | | | fixed incorrect test caseStefan Hanreich2017-06-191-1/+1
| * | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of gitlab.com:lawli...Stefan Hanreich2017-06-180-0/+0
| |\ \ \ \ \
| | * | | | | added additional test caseStefan Hanreich2017-06-181-0/+1
| | * | | | | using bang method for gsubStefan Hanreich2017-05-111-2/+2
| | * | | | | remove trailing commaStefan Hanreich2017-05-111-1/+1
| | * | | | | fix typoStefan Hanreich2017-05-111-1/+1
| | * | | | | removed superfluos testsStefan Hanreich2017-05-111-7/+1
| | * | | | | updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-05-111-1/+1
| | * | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of gitlab.com:lawli...Stefan Hanreich2017-05-110-0/+0
| | |\ \ \ \ \
| | | * | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-05-092-2/+4
| | * | | | | | Updated spec for build to include new ref_slug invariantsStefan Hanreich2017-05-111-8/+16
| | * | | | | | added changelog entryStefan Hanreich2017-05-111-0/+4
| | * | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-05-112-2/+4
| * | | | | | | added additional test caseStefan Hanreich2017-06-181-0/+1
| * | | | | | | using bang method for gsubStefan Hanreich2017-06-181-2/+2
| * | | | | | | remove trailing commaStefan Hanreich2017-06-181-1/+1
| * | | | | | | fix typoStefan Hanreich2017-06-181-1/+1
| * | | | | | | removed superfluos testsStefan Hanreich2017-06-181-7/+1
| * | | | | | | updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-06-181-1/+1
| * | | | | | | Updated spec for build to include new ref_slug invariantsStefan Hanreich2017-06-181-8/+16
| * | | | | | | added changelog entryStefan Hanreich2017-06-181-0/+4
| * | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-06-182-2/+4
* | | | | | | | Merge branch 'enable-new-navigation-option-in-preferences' into 'master'Filipa Lacerda2017-07-043-26/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |