summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | * | | | | Update housekeeping docs to match UIGreg Myers2019-04-102-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Correct screenshot and menu location on housekeeping docs
| * | | | | Merge branch 'docs-60290-docs-lint-broken-in-master' into 'master'50130-cluster-cluster-details-update-automatically-after-cluster-is-createdAchilleas Pipinellis2019-04-095-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change mode to 644 for doc/ci/variables/img/ See merge request gitlab-org/gitlab-ce!27179
| | * | | | | Change mode to 644 for doc/ci/variables/img/docs-60290-docs-lint-broken-in-masterRémy Coutable2019-04-095-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch '60305-fix-mr-assignee-for-mr-push-options' into 'master'Douglas Barbosa Alexandre2019-04-092-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR assignees for push options Closes #60305 See merge request gitlab-org/gitlab-ce!27186
| | * | | | | | Fix MR assignees for push optionsNick Thomas2019-04-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With multiple MR assignees, `merge_request.assignee_id` is always nil, and `merge_request.assignee_ids` isn't in `merge_request.attributes`. So the existing code doesn't set assignees in the created MR. This fix gets all the tests passing, but we should also check that no other associations in the MergeRequest need similar fixups.
| * | | | | | | Merge branch 'quarantine-flaky-test' into 'master'Douglas Barbosa Alexandre2019-04-091-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Quarantine flaky test: "Discussion Comments Issue behaves like discussion comments clicking "Comment" will post a comment" / spec/support/features/discussion_comments_shared_example.rb:19 See merge request gitlab-org/gitlab-ce!27183
| | * | | | | | Quarantine flaky testMichael Kozono2019-04-091-1/+1
| | | | | | | |
| * | | | | | | Merge branch ↵Robert Speicher2019-04-091-17/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6649-extract-ee-specific-files-lines-for-ci-cd-app-serializers' into 'master' Extract preloaded_relations See merge request gitlab-org/gitlab-ce!27168
| | * | | | | | Extract preloaded_relations into method6649-extract-ee-specific-files-lines-for-ci-cd-app-serializersMatija Čupić2019-04-091-17/+23
| | | | | | | |
| * | | | | | | Merge branch 'remove-disabled-pages-domains' into 'master'Nick Thomas2019-04-0912-33/+154
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Mark disabled pages domain for removal See merge request gitlab-org/gitlab-ce!26212
| | * | | | | | Mark unverified pages domains for removalVladimir Shushlin2019-04-0912-33/+154
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set pages_domain.remove_at when disabling it Add specs for marking pages domain for removal Notify user that domain is being removed Add documentation
| * | | | | | Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'Douglas Barbosa Alexandre2019-04-097-7/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update comments about N + 1 Gitaly calls See merge request gitlab-org/gitlab-ce!27178
| | * | | | | | Update comments about N + 1 Gitaly callsZeger-Jan van de Weg2019-04-097-7/+8
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | To make sure all known issues are linked to the correct epic, I've gone through the code base, and updated the comments where required.
| * | | | | | Merge branch 'quarantine-flaky-specs' into 'master'Kamil Trzciński2019-04-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine a flaky spec in spec/features/issues/user_interacts_with_awards_spec.rb See merge request gitlab-org/gitlab-ce!27176
| | * | | | | | Quarantine a flaky spec in ↵Rémy Coutable2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/features/issues/user_interacts_with_awards_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>