Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-token | Pawel Chojnacki | 2017-07-10 | 3 | -7/+9 |
| | | | | | + fix typos, and capitalization + point configuration to `gitlab.rb` as well | ||||
* | Add tests for token auth. | Pawel Chojnacki | 2017-07-06 | 3 | -20/+63 |
| | |||||
* | Limit docs line lenght | Pawel Chojnacki | 2017-07-06 | 1 | -3/+4 |
| | |||||
* | Merge prometheus unicorn sampler settigns within monitoring settings | Pawel Chojnacki | 2017-07-05 | 3 | -11/+4 |
| | |||||
* | Add spaces between test phases | Pawel Chojnacki | 2017-07-05 | 3 | -3/+20 |
| | | | | + fix wrong test setup | ||||
* | Finish refactring processed configuraiton, and add test validating ip range ↵ | Pawel Chojnacki | 2017-07-05 | 2 | -10/+24 |
| | | | | matching | ||||
* | Add Changelog entry | Pawel Chojnacki | 2017-07-05 | 1 | -0/+4 |
| | |||||
* | correctly handle transforming settings into useful datastructure | Pawel Chojnacki | 2017-07-05 | 2 | -2/+5 |
| | |||||
* | Bring back healthcheck token access to monitoring resources, but mark this ↵ | Pawel Chojnacki | 2017-07-05 | 4 | -8/+47 |
| | | | | as deprecated | ||||
* | Remove the need to use health check token | Pawel Chojnacki | 2017-07-05 | 10 | -65/+87 |
| | | | | | in favor of whitelist that will be used to control the access to monitoring resources | ||||
* | Merge branch '34544_add_italian_translation_of_i18n' into 'master'34621-add-subgroups-limitations-to-pages-docs | Douwe Maan | 2017-07-04 | 4 | -1/+1149 |
|\ | | | | | | | | | | | | | Add Italian translation of Cycle Analytics Page & Project Page & Repository Page Closes #34544 See merge request !12578 | ||||
| * | fix the format of the translation string | 黄涛 | 2017-07-03 | 1 | -4/+4 |
| | | |||||
| * | fix the format of the translation string | 黄涛 | 2017-06-30 | 1 | -136/+137 |
| | | |||||
| * | add Italian translation to I18N | 黄涛 | 2017-06-30 | 4 | -1/+1148 |
| | | | | | | | | | | | | | | | | | | translated of Cycle Analytics Page translated of Project Page translated of Repository Page add Changelog Closes #34544 | ||||
* | | Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master' | Sean McGivern | 2017-07-04 | 3 | -13/+69 |
|\ \ | | | | | | | | | | | | | | | | | | | Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Closes #34456 See merge request !12574 | ||||
| * | | Prevent accidental deletion of protected MR source branch by repeating ↵dm-always-verify-source-branch-can-be-deleted | Douwe Maan | 2017-07-04 | 3 | -13/+69 |
| | | | | | | | | | | | | checks before actual deletion | ||||
* | | | Merge branch 'revert-2c879643' into 'master' | Sean McGivern | 2017-07-04 | 5 | -4/+52 |
|\ \ \ | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-12499' into 'master'" See merge request !12633 | ||||
| * | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643 | Douwe Maan | 2017-07-04 | 5 | -4/+52 |
| | | | | | | | | | | | | This reverts merge request !12557 | ||||
* | | | | Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' ↵ | Grzegorz Bizon | 2017-07-04 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update prometheus client gem See merge request !12632 | ||||
| * \ \ \ | Merge branch 'master' into ↵bump-prometheus-version-to-fix-text-representation-problem | Paweł Chojnacki | 2017-07-04 | 47 | -229/+1174 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | 'bump-prometheus-version-to-fix-text-representation-problem' # Conflicts: # Gemfile.lock | ||||
| * | | | | Update prometheus client gem | Pawel Chojnacki | 2017-07-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'dm-9-3-requires-mysql-trigger' into 'master' | Sean McGivern | 2017-07-04 | 3 | -6/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that GitLab 9.3 requires the TRIGGER permission on MySQL Closes #34358 See merge request !12573 | ||||
| * | | | | | Document that GitLab 9.3 requires the TRIGGER permission on MySQLdm-9-3-requires-mysql-trigger | Douwe Maan | 2017-07-04 | 3 | -6/+15 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master' | Rémy Coutable | 2017-07-04 | 4 | -10/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Closes #32035 See merge request !11218 | ||||
| * | | | | | updated changelog entry | Stefan Hanreich | 2017-06-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | chaining the methods in ref_slug | Stefan Hanreich | 2017-06-24 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | fixed incorrect test case (for real), added another one | Stefan Hanreich | 2017-06-19 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | fixed incorrect test case | Stefan Hanreich | 2017-06-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of ↵ | Stefan Hanreich | 2017-06-18 | 0 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | gitlab.com:lawli3t/gitlab-ce into feature/no-hypen-at-end-of-commit-ref-slug | ||||
| | * | | | | | added additional test case | Stefan Hanreich | 2017-06-18 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | using bang method for gsub | Stefan Hanreich | 2017-05-11 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | remove trailing comma | Stefan Hanreich | 2017-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix typo | Stefan Hanreich | 2017-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | removed superfluos tests | Stefan Hanreich | 2017-05-11 | 1 | -7/+1 |
| | | | | | | | |||||
| | * | | | | | updated regex to use beginning / ending of string metacharacters | Stefan Hanreich | 2017-05-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of ↵ | Stefan Hanreich | 2017-05-11 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:lawli3t/gitlab-ce into feature/no-hypen-at-end-of-commit-ref-slug | ||||
| | | * | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035 | Stefan Hanreich | 2017-05-09 | 2 | -2/+4 |
| | | | | | | | | |||||
| | * | | | | | | Updated spec for build to include new ref_slug invariants | Stefan Hanreich | 2017-05-11 | 1 | -8/+16 |
| | | | | | | | | |||||
| | * | | | | | | added changelog entry | Stefan Hanreich | 2017-05-11 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035 | Stefan Hanreich | 2017-05-11 | 2 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | added additional test case | Stefan Hanreich | 2017-06-18 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | using bang method for gsub | Stefan Hanreich | 2017-06-18 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | remove trailing comma | Stefan Hanreich | 2017-06-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix typo | Stefan Hanreich | 2017-06-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | removed superfluos tests | Stefan Hanreich | 2017-06-18 | 1 | -7/+1 |
| | | | | | | | | |||||
| * | | | | | | | updated regex to use beginning / ending of string metacharacters | Stefan Hanreich | 2017-06-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Updated spec for build to include new ref_slug invariants | Stefan Hanreich | 2017-06-18 | 1 | -8/+16 |
| | | | | | | | | |||||
| * | | | | | | | added changelog entry | Stefan Hanreich | 2017-06-18 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035 | Stefan Hanreich | 2017-06-18 | 2 | -2/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'enable-new-navigation-option-in-preferences' into 'master' | Filipa Lacerda | 2017-07-04 | 3 | -26/+18 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Enables the option in user preferences to turn on the new navigation See merge request !12630 |