summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update docs board features tierupdate-docs-board-features-tierVictor Wu2018-07-131-5/+5
|
* Merge branch 'winh-upgrade-grape-path-helpers' into 'master'Stan Hu2018-07-122-1/+6
|\ | | | | | | | | Upgrade grape-path-helpers to 1.0.6 See merge request gitlab-org/gitlab-ce!20601
| * Upgrade grape-path-helpers to 1.0.6Winnie Hellmann2018-07-122-1/+6
| |
* | Merge branch 'polish-severity-facets' into 'master'Mek Stittri2018-07-121-16/+18
|\ \ | | | | | | | | | | | | Polish severity level facets further See merge request gitlab-org/gitlab-ce!20572
| * | Polish severity level facets furtherpolish-severity-facetsMek Stittri2018-07-111-16/+18
| | |
* | | Merge branch '48912-vue-files-without-tests-missing-in-coverage-report' into ↵Annabel Gray2018-07-121-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include Vue files without tests in coverage report Closes #48912 See merge request gitlab-org/gitlab-ce!20431
| * | | Include Vue files that are not covered by tests in test coverage48912-vue-files-without-tests-missing-in-coverage-reportWinnie Hellmann2018-07-121-2/+2
| | | |
* | | | Merge branch 'an/no-healthcheck-until-brooklyn' into 'master'Robert Speicher2018-07-123-64/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove healthchecks from prometheus endpoint Closes #49112 See merge request gitlab-org/gitlab-ce!20565
| * | | | Remove healthchecks from prometheus endpointAndrew Newdigate2018-07-123-64/+11
|/ / / /
* | | | Merge branch 'backport-widget-changes' into 'master'Filipa Lacerda2018-07-123-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport mr widget changes from EE See merge request gitlab-org/gitlab-ce!20598
| * | | | Backport mr widget changes from EEbackport-widget-changesAnnabel Dunstone Gray2018-07-123-2/+6
| | | | |
* | | | | Merge branch 'i18n-extract-app/views/admin-groups' into 'master'Rémy Coutable2018-07-127-43/+105
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/admin/groups' See merge request gitlab-org/gitlab-ce!19924
| * | | | | i18n: externalize strings from 'app/views/admin/groups'Tao Wang2018-07-137-43/+105
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | Merge branch '48241-fix-invalid-byte-sequence-in-qa' into 'master'Grzegorz Bizon2018-07-121-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "QA: False failure on QA test "Push to protected branch when allowed" during staging failover rehearsal" Closes #48241 See merge request gitlab-org/gitlab-ce!20561
| * | | | | | Ensure Encoding.default_external is set to UTF-8 when running QA scenariosRémy Coutable2018-07-121-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'issue_47709' into 'master'Sean McGivern2018-07-124-0/+44
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to toggle notifications for issues due soon Closes #47709 See merge request gitlab-org/gitlab-ce!20530
| * | | | | Allow to toggle notifications for issues due soonFelipe Artur2018-07-124-0/+44
| | | | | |
* | | | | | Merge branch 'vuex-test-helper-improvements' into 'master'Phil Hughes2018-07-1210-88/+233
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vuex test helper improvements Closes #44912, #44919, and #44920 See merge request gitlab-org/gitlab-ce!20513
| * | | | | | Vuex test helper improvementsLukas Eipert2018-07-1210-88/+233
|/ / / / / /
* | | | | | Merge branch 'qa-fix-timestamp' into 'master'Grzegorz Bizon2018-07-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Fix duplicate year in namespace name See merge request gitlab-org/gitlab-ce!20581
| * | | | | | [QA] Fix duplicate year in namespace nameqa-fix-timestampRémy Coutable2018-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch ↵Grzegorz Bizon2018-07-121-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49139-sleep-before-installing-tiller-to-prevent-race-condition' into 'master' Resolve "Installing helm tiller sometimes fails with no api token found" Closes #49139 See merge request gitlab-org/gitlab-ce!20580
| * | | | | | | Add sleep to QA test before installing tiller49139-sleep-before-installing-tiller-to-prevent-race-conditionDylan Griffith2018-07-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we ocassionally see a race condition error: No API token found for service account "default", retry after the token is automatically created and added to the service account Waiting 10 seconds should remove this risk.
* | | | | | | | Merge branch 'fix-performance-problem-of-tags-query' into 'master'Yorick Peterse2018-07-122-4/+16
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance problem of tags query Closes gitlab-com/infrastructure#4550 See merge request gitlab-org/gitlab-ce!20555
| * | | | | | | Fix performance problem of accessing tag list for projects api endpointsfix-performance-problem-of-tags-queryKamil Trzciński2018-07-122-4/+16
| | | | | | | |
* | | | | | | | Merge branch 'docs-port-ee-contributing-to-ce' into 'master'Jacob Schatz2018-07-121-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md to port Contribution Flow section from EE doc See merge request gitlab-org/gitlab-ce!20546
| * | | | | | | | Update CONTRIBUTING.md to port contribution flow section from EE docMarcel Amirault2018-07-111-0/+19
| | | | | | | | |
* | | | | | | | | Merge branch '48789-remove-event-listeners-scroll' into 'master'Phil Hughes2018-07-127-84/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve performance of MR Changes tab: reduce event listeners on scroll event" Closes #48639 and #48789 See merge request gitlab-org/gitlab-ce!20558
| * | | | | | | | | Resolve "Improve performance of MR Changes tab: reduce event listeners on ↵Filipa Lacerda2018-07-127-84/+27
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | scroll event"
* | | | | | | | | Merge branch 'winh-remove-service-architecture-docs' into 'master'Filipa Lacerda2018-07-122-228/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove old service architecture from Vue docs See merge request gitlab-org/gitlab-ce!20579
| * | | | | | | | Remove old service architecture from Vue docsWinnie Hellmann2018-07-122-228/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-264' into 'master'Rémy Coutable2018-07-1217-22/+229
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding spec to test basic forking functionalities See merge request gitlab-org/gitlab-ce!20097
| * | | | | | | | Adding spec to test basic forking functionalitiesMykhailo Formus2018-07-1217-22/+229
|/ / / / / / / /
* | | | | | | | Merge branch '48690-follow-up-from-milestone-tests' into 'master'Rémy Coutable2018-07-123-11/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Follow-up from "Milestone tests"" Closes #48690 See merge request gitlab-org/gitlab-ce!20563
| * | | | | | | | move #has_milestone? to issuable sidebar;48690-follow-up-from-milestone-testsddavison2018-07-113-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #48690
* | | | | | | | | Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-1230-55/+1313
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304
| * | | | | | | | | Fix CI/CD importdz-manifest-importDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that fronted ci_cd_only variable must be a string Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add newly translated strings to locale/gitlab.potDmitriy Zaporozhets2018-07-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add mysql and postgres spec for manifest import buttonDmitriy Zaporozhets2018-07-111-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Fix a link to subgroup doc from manifest docDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Improve manifest feature after backend reviewDmitriy Zaporozhets2018-07-1112-53/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Improve manifest feature frontend after reviewDmitriy Zaporozhets2018-07-113-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Rename button at manifest import formDmitriy Zaporozhets2018-07-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Make the manifest import feature spec a postgres onlyDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Refactor manifest import codeDmitriy Zaporozhets2018-07-116-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add feature specs for manifest importDmitriy Zaporozhets2018-07-113-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Move manifest import to separate page and add feature specsDmitriy Zaporozhets2018-07-115-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Fix icon for manifest import and mention manifest feature in APIDmitriy Zaporozhets2018-07-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add documentation for manifest import featureDmitriy Zaporozhets2018-07-115-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | Add ability to disable manifest importDmitriy Zaporozhets2018-07-113-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>