summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix polling for transformed individual notes30299-fix-polling-for-transformed-notesHeinrich Lee Yu2019-02-134-6/+15
| | | | | Sets `updated_at` so that the transformed note is returned together with the new reply
* Merge branch 'docs-anchors1' into 'master'Evan Read2019-02-131-7/+7
|\ | | | | | | | | Docs: Fixing path in links in api release doc See merge request gitlab-org/gitlab-ce!24975
| * Docs: Fixing path in links in api release docMarcel Amirault2019-02-131-7/+7
|/
* Merge branch 'master' into 'master'Evan Read2019-02-131-1/+1
|\ | | | | | | | | Fix a typo in ./doc/ci/examples/deploy_spring_boot_to_cloud_foundry/index.md from "deafult" to "default". See merge request gitlab-org/gitlab-ce!25153
| * Fix a typo.Kengo Kimura2019-02-121-1/+1
| |
* | Merge branch 'two_factor_authentication_update' into 'master'Evan Read2019-02-131-1/+1
|\ \ | | | | | | | | | | | | Update what supports U2F workflow See merge request gitlab-org/gitlab-ce!25047
| * | Update what supports U2F workflowMateusz Konieczny2019-02-081-1/+1
| | | | | | | | | | | | | | | note that "only" and "so we _strongly_ recommend" is becoming suspect. It may be considered worthwhile to change it, but in turn it would fail to explain why GitLab requires that both methods are enabled
* | | Merge branch 'bump-gitaly-version-1.19.1' into 'master'Stan Hu2019-02-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Upgrade gitaly to 1.19.1 See merge request gitlab-org/gitlab-ce!25177
| * | | Fix regression bug in gitaly CommitStats RPCJohn Cai2019-02-121-1/+1
| | | |
* | | | Merge branch ↵Robert Speicher2019-02-122-7/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '57604-checking-a-box-in-an-issue-description-consistently-throws-an-error-on-11-8-0-rc2' into 'master' Checking a box in an issue description consistently throws an error Closes #57604 See merge request gitlab-org/gitlab-ce!25174
| * | | Find checkbox input with less specific selectorBrett Walker2019-02-122-7/+27
|/ / /
* | | Merge branch 'winh-noteable_note_spec-vue-test-utils' into 'master'Fatih Acet2019-02-122-38/+98
|\ \ \ | | | | | | | | | | | | | | | | Convert noteable_note_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24983
| * | | Convert noteable_note_spec.js to Vue test utilsWinnie Hellmann2019-02-122-38/+98
|/ / / | | | | | | | | | (cherry picked from commit 861f93e6fc72ef4adbc4ace3fd297382e07b619c)
* | | Merge branch ↵Lin Jen-Shin2019-02-121-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57426-review-apps-some-merge-related-tests-fail-in-review-qa-jobs-but-not-in-package-and-qa' into 'master' Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineService Closes #57426 See merge request gitlab-org/gitlab-ce!25168
| * | | Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineServiceRémy Coutable2019-02-121-2/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'fix_#56347' into 'master'Annabel Dunstone Gray2019-02-124-9/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix overlapping empty-header logo Closes #56347 See merge request gitlab-org/gitlab-ce!24868
| * | | | Replace useless divs with flex layout in navbarjoola2019-02-124-9/+11
|/ / / / | | | | | | | | | | | | Notable changes proposed by @pslaughter
* | | | Merge branch 'fix-broken-links-in-help' into 'master'Rémy Coutable2019-02-122-3/+44
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix broken links on help page Closes #57554 See merge request gitlab-org/gitlab-ce!25120
| * | | Update RE used to prefix links with /help/Frank Sauerburger2019-02-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update the regular expression in the help controller used to prefix relative links on the help page with /help/. As suggested by @rymai, the look-ahead pattern to detect external links is simplified from `[a-zA-Z0-9.+-]` to `\w`.
| * | | Fix broken links on help pageFrank Sauerburger2019-02-112-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the help controller to correctly handle relative links on the help pages when the relative link is before an external link on the same line in the markdown file. Test cases have been implement to check for - relative links before external link on same line, - HTTPS in query part of link, - URLs without '//' and - protocol-relative links.
* | | | Merge branch 'sh-log-rails-queue-duration' into 'master'James Lopez2019-02-125-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log queue duration in production_json.log Closes #57420 See merge request gitlab-org/gitlab-ce!25075
| * | | | Log queue duration in production_json.logStan Hu2019-02-125-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `queue_duration` is a useful metric that is currently in api_json.log but not in production_json.log. We should add it because it tells us how long the request sat in Workhorse before Unicorn processed it. Having this field enables the support team to better troubleshoot when delays began to happen.
* | | | | Merge branch 'fix-space-unicode' into 'master'Filipa Lacerda2019-02-123-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change unicode for non-standard spaces See merge request gitlab-org/gitlab-ce!24795
| * | | | | Change unicode for non-standard spacesMarcel Amirault2019-02-123-5/+10
|/ / / / /
* | | | | Merge branch 'remove-fast-destroy-flag' into 'master'Douglas Barbosa Alexandre2019-02-123-50/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fast_destroy_uploads feature flag Closes #54937 See merge request gitlab-org/gitlab-ce!24930
| * | | | | Remove fast_destroy_uploads feature flagJan Provaznik2019-02-123-50/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fast destroy of uploads was successfully enabled and test.
* | | | | | Merge branch 'tz-fix-copy-as-gfm-firefox' into 'master'Phil Hughes2019-02-121-5/+29
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transforming Gfm also on paste so it works also in FF Closes #57561 See merge request gitlab-org/gitlab-ce!25146
| * | | | | Transforming Gfm also on paste so it works also in FFTim Zallmann2019-02-121-5/+29
|/ / / / /
* | | | | Merge branch ↵Grzegorz Bizon2019-02-122-2/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | '7048_usage_ping_for_security_dashboard_as_default_view_for_groups-ce' into 'master' Usage ping for Group overview default user preference See merge request gitlab-org/gitlab-ce!24980
| * | | | Protect group overview usage ping w/ feature flag7048_usage_ping_for_security_dashboard_as_default_view_for_groups-ceVictor Zagorodny2019-02-122-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_preferences key is includes into system usage data only if group_overview_security_dashboard feature flag is enabled; see https://gitlab.com/gitlab-org/gitlab-ee/issues/7048
| * | | | Add user_preferences_usage to usage pingVictor Zagorodny2019-02-122-1/+9
| | | | |
* | | | | Merge branch '57551-collapse-board-list-fix' into 'master'Phil Hughes2019-02-122-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add flex styles to board list only if board list is expanded Closes #57551 See merge request gitlab-org/gitlab-ce!25113
| * | | | | Add flex styles to board list only if board list is expandedAnnabel Dunstone Gray2019-02-112-1/+8
| | | | | |
* | | | | | Merge branch '57223-wiki-finder' into 'master'Kamil Trzciński2019-02-122-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove BATCH_SIZE from WikiFileFinder Closes #57223 See merge request gitlab-org/gitlab-ce!24933
| * | | | | | Remove BATCH_SIZE from WikiFileFinder57223-wiki-finderJarka Košanová2019-02-062-3/+6
| | | | | | |
* | | | | | | Merge branch ↵Yorick Peterse2019-02-122-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '8798-geo-implement-selective-sync-support-for-the-various-fdw-queries' into 'master' Replace dots with an underscore when creating an alias for the recursive CTE See merge request gitlab-org/gitlab-ce!25112
| * | | | | | | Replace dots with an underscore when creating an alias for the CTEDouglas Barbosa Alexandre2019-02-112-1/+10
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Arel table to use as the alias contains a schema in your name, e.g., "gitlab_secondary"."namespaces" it produces an invalid query.
* | | | | | | Merge branch '57564-contributing-button-border' into 'master'Filipa Lacerda2019-02-122-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the border style of CONTRIBUTING button when it exists Closes #57564 See merge request gitlab-org/gitlab-ce!25124
| * | | | | | | Fix the border style of CONTRIBUTING button when it existsTakuya Noguchi2019-02-122-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | Merge branch 'docs-issues-functionalities' into 'master'Achilleas Pipinellis2019-02-121-37/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clean up issues functionalities doc See merge request gitlab-org/gitlab-ce!24931
| * | | | | | | | Clean up issues functionalities docMarcel Amirault2019-02-051-37/+37
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-misc' into 'master'Achilleas Pipinellis2019-02-127-19/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Misc small fixes to docs See merge request gitlab-org/gitlab-ce!24952
| * | | | | | | | | Docs: Misc small fixes to docsMarcel Amirault2019-02-127-19/+25
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-realignment-ce-2' into 'master'Achilleas Pipinellis2019-02-1213-17/+87
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Realign more CE docs that diverged from EE unnecessarily (second MR) See merge request gitlab-org/gitlab-ce!24948
| * | | | | | | | | Docs: Realign more CE docs that diverged from EE unnecessarily (second MR)Marcel Amirault2019-02-1213-17/+87
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-realignment-ce' into 'master'Achilleas Pipinellis2019-02-124-8/+58
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Realign several CE docs that diverged from EE unnecessarily See merge request gitlab-org/gitlab-ce!24849
| * | | | | | | | | Docs: Realign several CE docs that diverged from EE unnecessarilyMarcel Amirault2019-02-124-8/+58
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-32' into 'master'Achilleas Pipinellis2019-02-121-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added example for get file archive See merge request gitlab-org/gitlab-ce!23432
| * | | | | | | | | Added example for get file archiveArihant2019-02-121-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Grzegorz Bizon2019-02-123-2/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54850-pages-domain-show-view-is-not-protected-by-access-control' into 'master' Fix access to pages domain settings Closes #54850 See merge request gitlab-org/gitlab-ce!24926