summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Increase clusters bundle specs timeout60398-increase-timeouts-clusters-bundleEnrique Alcantara2019-04-111-1/+1
|
* Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'Rémy Coutable2019-04-103-0/+11
|\ | | | | | | | | CE: Resolve "Support fast unit tests in EE" See merge request gitlab-org/gitlab-ce!26861
| * Require possible EE extensionLin Jen-Shin2019-04-102-0/+6
| |
| * Add a test for fast_spec_helperLin Jen-Shin2019-04-101-0/+5
| |
* | Merge branch 'update-issue_workflow-docs' into 'master'Achilleas Pipinellis2019-04-102-2/+6
|\ \ | | | | | | | | | | | | Add missing team and stage labels in the workflow labels doc See merge request gitlab-org/gitlab-ce!27224
| * | Add missing team and stage labels in the workflow labels docRémy Coutable2019-04-102-2/+6
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'quarantine-flaky-specs' into 'master'Douglas Barbosa Alexandre2019-04-104-4/+4
|\ \ | |/ |/| | | | | Quarantine flaky specs See merge request gitlab-org/gitlab-ce!27222
| * Quarantine flaky specsquarantine-flaky-specsRémy Coutable2019-04-104-4/+4
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-1026-57/+125
|\ \
| * \ Merge branch 'patch-49' into 'master'Nick Thomas2019-04-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | Change reason for waiting See merge request gitlab-org/gitlab-ce!26607
| | * | Change reason for waitingRaphael Das Gupta2019-04-101-1/+1
| |/ / | | | | | | | | | Apparently one has to wait, but DNS can't be involved at this step. (As the DNS records had already to be ready and presumably propagated for the ACME challenge to work.) So let's assume it's the content delivery network serving the certificate that needs some time here.
| * | Merge branch 'docs-fix-bin-qa-command' into 'master'Ramya Authappan2019-04-101-8/+10
| |\ \ | | | | | | | | | | | | | | | | Add 'bundle exec' to the 'bin/qa' calls in qa/README.md See merge request gitlab-org/gitlab-ce!27169
| | * | Add 'bundle exec' to the 'bin/qa' calls in qa/README.mddocs-fix-bin-qa-commandRémy Coutable2019-04-091-8/+10
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'tp-2019-04-08-quarantine' into 'master'Ramya Authappan2019-04-102-3/+4
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Quarantine failing nightly tests See merge request gitlab-org/gitlab-ce!27174
| | * | Quarantine failing nightly teststp-2019-04-08-quarantineTanya Pazitny2019-04-092-3/+4
| | | |
| * | | Merge branch 'update-workhorse-8-5-1' into 'master'Sean McGivern2019-04-102-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v8.5.1 See merge request gitlab-org/gitlab-ce!27217
| | * | | Update GitLab Workhorse to v8.5.1Nick Thomas2019-04-102-1/+6
| | | | |
| * | | | Merge branch 'mw-i18n-app-workers' into 'master'Kamil Trzciński2019-04-104-16/+67
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in app/workers See merge request gitlab-org/gitlab-ce!27181
| | * | | | Externalize strings in app/workersMartin Wortschack2019-04-104-16/+67
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | - email_receiver_worker - object_storage/migrate_uploads_worker - Update PO file
| * | | | Merge branch 'winh-jest-valid-describe' into 'master'Kushal Pandya2019-04-107-18/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Enable ESLint rule jest/valid-describe See merge request gitlab-org/gitlab-ce!27140
| | * | | Wrap modal mutation names in template stringswinh-jest-valid-describeWinnie Hellmann2019-04-101-3/+3
| | | | |
| | * | | Hard code test name in timeline_entry_item_spec.jsWinnie Hellmann2019-04-102-7/+1
| | | | |
| | * | | Hard code test name in suggestion_diff_row_spec.jsWinnie Hellmann2019-04-101-1/+1
| | | | |
| | * | | Wrap import project mutation names in template stringsWinnie Hellmann2019-04-101-2/+2
| | | | |
| | * | | Wrap file template mutation names in template stringsWinnie Hellmann2019-04-101-5/+5
| | | | |
| | * | | Enable ESLint rule jest/valid-describeWinnie Hellmann2019-04-101-0/+1
| | | | |
| * | | | Merge branch 'dz-patch-50' into 'master'Lin Jen-Shin2019-04-101-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add doc link to omnibus for changing gitlab.yml See merge request gitlab-org/gitlab-ce!27216
| | * | | | Add doc link to omnibus for changing gitlab.ymlDmitriy Zaporozhets2019-04-101-1/+2
| | | | | |
| * | | | | Merge branch '6623-extract-ee-specific-files-lines-for-ci-spec-serializers' ↵Yorick Peterse2019-04-101-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Extract EE specific files/lines for CI spec/serializers" See merge request gitlab-org/gitlab-ce!27214
| | * | | | | Use different query count expectations in EE6623-extract-ee-specific-files-lines-for-ci-spec-serializersMatija Čupić2019-04-101-2/+4
| | | | | | |
| * | | | | | Merge branch 'fix-cluster-health-ce' into 'master'Sean McGivern2019-04-102-1/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct path to cluster health partial Closes gitlab-ee#10990 See merge request gitlab-org/gitlab-ce!27107
| | * | | | | Correct path to cluster health partialReuben Pereira2019-04-102-1/+6
| |/ / / / /
| * | | | | Merge branch '6073-extract-ee-specific-files-lines-for-some-ci-files' into ↵Yorick Peterse2019-04-101-3/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Extract EE specific files/lines for some CI files" Closes gitlab-ee#6073 See merge request gitlab-org/gitlab-ce!27210
| | * | | | Add optional IGNORE_ACCESSORS in RetryBuildService6073-extract-ee-specific-files-lines-for-some-ci-filesMatija Čupić2019-04-101-3/+5
| | | | | |
| * | | | | Merge branch 'master' into 'master'James Lopez2019-04-102-0/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add time tracking to issue board entities Closes #27780 See merge request gitlab-org/gitlab-ce!26850
| | * | | | Add time tracking to issue board entitiespataar2019-04-102-0/+4
| |/ / / /
| * | | | Merge branch 'increase-rspec-retries' into 'master'Rémy Coutable2019-04-101-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Double retries for rspec-retries See merge request gitlab-org/gitlab-ce!27208
| | * | | | Double retries for rspec-retriesLin Jen-Shin2019-04-101-2/+2
| | |/ / / | | | | | | | | | | | | | | | It was 2*4 => 8 times before, so 4 times is still half retries
| * | | | Merge branch 'quarantine-flaky-specs' into 'master'Kamil Trzciński2019-04-101-1/+1
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | Quarantine a flaky spec in spec/features/issues/user_creates_branch_and_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!27202
| * | | | Quarantine a flaky spec in ↵Rémy Coutable2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/features/issues/user_creates_branch_and_merge_request_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceGitLab Release Tools Bot2019-04-10364-1733/+6567
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '47327-fix-github-project-import-visibility' into 'master'Douwe Maan2019-04-103-4/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub project import visibility See merge request gitlab-org/gitlab-ce!27133
| | * | | | Address style review commentDaniel Wyatt2019-04-091-2/+0
| | | | | |
| | * | | | Apply suggestion to changelogs/unreleased/47327-fix-github-import-visibility.ymlDaniel Wyatt2019-04-091-1/+1
| | | | | |
| | * | | | Add test for github project import to user namespace.Daniel Wyatt2019-04-091-0/+12
| | | | | |
| | * | | | Fix GitHub project import visibilityDaniel Wyatt2019-04-083-3/+8
| | | | | |
| * | | | | Merge branch 'run-quarantine-specs-on-master-and-schedule-only' into 'master'Lin Jen-Shin2019-04-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only run quarantine tests on master and schedules See merge request gitlab-org/gitlab-ce!27203
| | * | | | | Only run quarantine tests on master and schedulesrun-quarantine-specs-on-master-and-schedule-onlyRémy Coutable2019-04-101-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch 'patch-49' into 'master'Achilleas Pipinellis2019-04-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct spelling mistake in documentation See merge request gitlab-org/gitlab-ce!26795
| | * | | | | Correct spelling mistake in documentationChris Rose2019-03-301-1/+1
| | | | | | |