summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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
| | | | | | | |
| * | | | | | | Merge branch 'patch-37' into 'master'Achilleas Pipinellis2019-04-101-0/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds details about adding links to external accounts. Fixes #54884. Closes #54884 See merge request gitlab-org/gitlab-ce!24007
| | * | | | | | Adds details about adding links to external accounts. Fixes #54884.knod2019-04-101-0/+11
| |/ / / / / /
| * | | | | | Merge branch 'docs/AuthorizedKeysCommand-by-default-in-Docker' into 'master'Achilleas Pipinellis2019-04-101-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for AuthorizedKeysCommand enabled by default in Docker See merge request gitlab-org/gitlab-ce!27184
| | * | | | | | Documentation for omnibus-gitlab!3191Sebastian Schweizer2019-04-091-0/+3
| | | | | | | |
| * | | | | | | Merge branch 'docs/add-runner-token-reset' into 'master'Evan Read2019-04-101-7/+47
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guide on how to reset runners token See merge request gitlab-org/gitlab-ce!26829
| | * | | | | | | Add guide on how to reset runners tokenSteve Azzopardi2019-04-101-7/+47
| | | | | | | | |
| * | | | | | | | Merge branch 'revert-2cc01f12' into 'master'Rémy Coutable2019-04-104-89/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'" Closes #60315 See merge request gitlab-org/gitlab-ce!27195
| | * | | | | | | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'"revert-2cc01f12Stan Hu2019-04-104-89/+10
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | This reverts merge request !26481
| * | | | | | | | Merge branch '59276-more-k8s-logging' into 'master'James Lopez2019-04-108-2/+78
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improvements of kubernetes.log" Closes #59276 See merge request gitlab-org/gitlab-ce!26895
| | * | | | | | | | Add more info logging to cluster appsDylan Griffith2019-04-108-2/+78
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log events so that it's easy to see when different requests are starting.
| * | | | | | | | Merge branch 'docs/add-internal-anchor-check' into 'master'Achilleas Pipinellis2019-04-101-1/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run anchor check on every build See merge request gitlab-org/gitlab-ce!26745
| | * | | | | | | | Run anchor check on every buildEvan Read2019-04-101-1/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'docs/fix-external-links' into 'master'Achilleas Pipinellis2019-04-103-9/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update broken links to new destinations See merge request gitlab-org/gitlab-ce!27155
| | * | | | | | | | Update broken links to new destinationsEvan Read2019-04-103-9/+5
| |/ / / / / / / /
| * | | | | | | | Merge branch 'greg-housekeeping-docs' into 'master'Achilleas Pipinellis2019-04-102-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Update housekeeping docs to match UI See merge request gitlab-org/gitlab-ce!27182