summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add new to test bulk_update endpoint for issues and MRsRobert Schilling2019-02-145-5/+222
| | | | | Add documentation for issues and MRs. Add shared tests for both bulk updating issues and MRs.
* API: Bulk update for issues and merge requestsRobert Schilling2019-02-143-0/+54
| | | | | | This MR adds support for bulk update actions for issues and merge requests. A single API call can be used to update a list of issues or merge requests
* 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
| * | | | | | | Fix access to pages domain settingsVladimir Shushlin2019-02-123-2/+22
|/ / / / / / /
* | | | | | | Merge branch 'bl-forward-gitlab-svg' into 'master'Filipa Lacerda2019-02-122-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-svg to 1.52 See merge request gitlab-org/gitlab-ce!25145
| * | | | | | | Update gitlab-svg to 1.52Brandon Labuschagne2019-02-122-5/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '55209-tool-tip-hides-menu-item' into 'master'Phil Hughes2019-02-123-8/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tool Tip Hides Menu Item" Closes #55209 See merge request gitlab-org/gitlab-ce!24285
| * | | | | | | Hide More Actions tooltip when the menu opens55209-tool-tip-hides-menu-itemSimon Knox2019-02-123-8/+33
| | | | | | | |
* | | | | | | | Merge branch 'Doc-project-cicd-timeout-settings-location' into 'master'Achilleas Pipinellis2019-02-121-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding info for the location of cicd timeout setting per project See merge request gitlab-org/gitlab-ce!25136
| * | | | | | | | Adding info for the location of cicd timeout setting per projectAndrew Winata2019-02-121-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-32' into 'master'Achilleas Pipinellis2019-02-121-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: add description on how to retrieve artifacts when authentication is required See merge request gitlab-org/gitlab-ce!23197
| * | | | | | | | | Docs: add description on how to retrieve artifacts when authentication is ↵Roland2019-02-121-1/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | required
* | | | | | | | | Merge branch 'sh-import-source-branch-github-forks' into 'master'Yorick Peterse2019-02-125-5/+74
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the source branch for a GitHub import Closes #57370 See merge request gitlab-org/gitlab-ce!25064
| * | | | | | | | Create the source branch for a GitHub importStan Hu2019-02-115-5/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the GitHub importer creates a merge request, it retrieves the SHA but does not actually create the source branch. This makes it impossible to merge an open merge request, particularly if the source branch were from a forked project. In that case, the branch will never exist because the original `project-name:source-branch` name is never created, nor is it a valid branch name. To prevent possible branch name conflicts, forked source branches are now renamed `github/fork/project-name/source-branch` and created when necessary. Note that we only create the source branch if the merge request is open. For projects that have many merge requests, the project would end up with a lot of possibly dead branches. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57370
* | | | | | | | | Merge branch 'sh-terminate-pg-connections-on-setup' into 'master'Rémy Coutable2019-02-121-0/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kill all PostgreSQL connections for rake dev:setup Closes gitlab-development-kit#450 See merge request gitlab-org/gitlab-ce!24743
| * | | | | | | | | Move terminate_all_connections into setup Rake taskStan Hu2019-02-113-35/+21
| | | | | | | | | |