delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'qa/testing/cng/189' into 'master'	Rémy Coutable	2019-01-24	3	-10/+9
\|\ \| \| \| \| \| \| \| \|	Improve the handling of tags and branches which contains a `/` when triggering CNG pipelines See merge request gitlab-org/gitlab-ce!24465
\| *	Use $CI_COMMIT_REF_NAME for tags in trigger-build	Rémy Coutable	2019-01-24	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, pass GITLAB_VERSION and GITLAB_ASSETS_TAG to CNG triggered pipelines. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Use $CI_COMMIT_REF_SLUG in review-apps.sh	Rémy Coutable	2019-01-24	1	-5/+5
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '54385-board-policy-ce' into 'master'	Rémy Coutable	2019-01-24	4	-19/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of 54385-board-policy Closes #54385 See merge request gitlab-org/gitlab-ce!24475
\| * \|	Backport of 54385-board-policy	Mario de la Ossa	2019-01-18	4	-19/+22
\| \| \|
* \| \|	Merge branch '56556-fix-markdown-table-border' into 'master'	Kushal Pandya	2019-01-24	2	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix markdown table border Closes #56556 See merge request gitlab-org/gitlab-ce!24601
\| * \| \|	Fix markdown table border	Jacques Erasmus	2019-01-24	2	-0/+6
\|/ / /
* \| \|	Merge branch '8621-new-feature-flag-vue-ce-backport' into 'master'	Phil Hughes	2019-01-24	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds extra sizes in responsive tables See merge request gitlab-org/gitlab-ce!24605
\| * \| \|	Adds extra sizes in responsive tables	Filipa Lacerda	2019-01-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds two extra column sizes in the responsive tables css
* \| \| \|	Merge branch ↵	Rémy Coutable	2019-01-24	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'56763-docs-lint-passes-if-a-relative-link-starts-with-doc-docs' into 'master' Resolve "Docs lint passes if a relative link starts with /doc" Closes #56763 See merge request gitlab-org/gitlab-ce!24613
\| * \| \|	Use the same path of the docs site as in production	Achilleas Pipinellis	2019-01-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This started with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24339 where a broken link was introduced, but the lint checker never caught it. The docs-lint job does the following: ```yaml script: - mv doc/ /tmp/gitlab-docs/content/ - cd /tmp/gitlab-docs # Build HTML from Markdown - bundle exec nanoc # Check the internal links - bundle exec nanoc check internal_links ``` It moves the `doc/` dir inside `content` where Nanoc is expecting the markdown files to be. It then builds the site and finally checks for the links. If the built website was deployed to production, that would be under `docs.gitlab.com/doc`. The interesting part here is that `[the logs](/doc/administration/logs.md#productionlog)` translates to `<a href="/doc/administration/logs.html#productionlog>`, so, Nanoc correctly sees this as an existing file! This MR changes the path of the docs content to be equal to $DOCS_GITLAB_REPO_SUFFIX which is defined as an environment variable and takes the value of the slug of each project: 'ce', 'ee', 'omnibus', 'runner'.
* \| \| \|	Merge branch 'qa-quarantine-auto-dev-ops-tests' into 'master'	Rémy Coutable	2019-01-24	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quarantine Auto DevOps tests See merge request gitlab-org/gitlab-ce!24623
\| * \| \| \|	Quarantine auto devops tests	Sanad Liaquat	2019-01-24	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/document-built-in-templates' into 'master'	Achilleas Pipinellis	2019-01-24	5	-47/+102
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restructure projects template topics Closes #55834 See merge request gitlab-org/gitlab-ce!24448
\| * \| \| \| \|	Restructure projects template topics	Evan Read	2019-01-24	5	-47/+102
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/fix-bare-urls' into 'master'	Achilleas Pipinellis	2019-01-24	67	-152/+151
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix most instances of bare URLs in markdown See merge request gitlab-org/gitlab-ce!24519
\| * \| \| \| \|	Fix most instances of bare URLs in markdown	Evan Read	2019-01-24	67	-152/+151
\|/ / / / /
* \| \| \| \|	Merge branch 'if-log_user_admin_status' into 'master'	Stan Hu	2019-01-24	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log admin status of user when OAuth::User is saved See merge request gitlab-org/gitlab-ce!24602
\| * \| \| \|	Log admin status of user when OAuth::User is saved	Imre Farkas	2019-01-23	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-40' into 'master'	Evan Read	2019-01-24	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update repository_mirroring.md See merge request gitlab-org/gitlab-ce!24586
\| * \| \| \| \|	Update repository_mirroring.md	Robert Devitt	2019-01-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSH Auth "Introduced" section had push/pull support versions labeled incorrectly.
* \| \| \| \| \|	Merge branch 'docs-push-mirror-GitLab-GitHub' into 'master'	Evan Read	2019-01-24	2	-3/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(docs) Updated fields information for push mirror from GitLab to GitHub See merge request gitlab-org/gitlab-ce!24566
\| * \| \| \| \| \|	Amended with suggestions by @eread	Joseph Yu	2019-01-23	1	-5/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added changelog	Joseph Yu	2019-01-22	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updated fields information for push mirror from GitLab to GitHub	Joseph Yu	2019-01-22	1	-3/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-loose-typo' into 'master'	Nick Thomas	2019-01-24	3	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'loose' typo Closes #56248 See merge request gitlab-org/gitlab-ce!24330
\| * \| \| \| \| \| \|	Revert changes to *.po files	Max Raab	2019-01-23	37	-74/+74
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix 'loose' typo	Max Raab	2019-01-11	40	-78/+78
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-upload-snippets-with-relative-url-root' into 'master'	Nick Thomas	2019-01-24	3	-0/+61
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 404s for snippet uploads when relative URL root used Closes #56280 See merge request gitlab-org/gitlab-ce!24588
\| * \| \| \| \| \| \| \|	Fix 404s for snippet uploads when relative URL root used	Stan Hu	2019-01-22	3	-0/+61
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Personal snippet uploads have neither a group nor a project. If a GitLab instance were configured with a relative URL root (e.g. `/gitlab`), then the Markdown filter would not include this root in the generated path. We fix this by adding this root if there is no group or project. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56280
* \| \| \| \| \| \| \|	Merge branch 'sh-remove-bitbucket-mirror-constant' into 'master'	Robert Speicher	2019-01-23	3	-6/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import handling errors in Bitbucket Server importer See merge request gitlab-org/gitlab-ce!24499
\| * \| \| \| \| \| \| \|	Fix import handling errors in Bitbucket Server importer	Stan Hu	2019-01-18	3	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20724 removed `Gitlab::Git::RepositoryMirroring::RemoteError`, but this was still being handled in the Bitbucket Server importer and only encountered if some exception other than `Gitlab::Shell::Error` were thrown.
* \| \| \| \| \| \| \| \|	Merge branch 'custom-gitaly-url' into 'master'	Stan Hu	2019-01-23	2	-1/+25
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Gitaly to be built from a custom URL See merge request gitlab-org/gitlab-ce!24616
\| * \| \| \| \| \| \| \| \|	Allow Gitaly to be built from a custom URL	Nick Thomas	2019-01-23	2	-1/+25
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-9357' into 'master'	Douglas Barbosa Alexandre	2019-01-23	3	-1/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 errors with legacy appearance logos Closes gitlab-ee#9357 See merge request gitlab-org/gitlab-ce!24615
\| * \| \| \| \| \| \| \| \| \|	Fix 500 errors with legacy appearance logos	Stan Hu	2019-01-23	3	-1/+17
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to GitLab 9.0, attachments were not tracked the `uploads` table, so it was possible that the appearance logos were just stored in the database as a string and mounted via CarrierWave. https://gitlab.com/gitlab-org/gitlab-ce/issues/29240 implemented in GitLab 10.3 was supposed to cover populating the `uploads` table for all attachments, including all the logos from appearances. However, it's possible that didn't work for logos or the `uploads` entry was orphaned. GitLab instances that had a customized logo with no associated `uploads` entry would see Error 500s. The only way to fix this is to delete the `logo` column from the `appearances` table and re-upload the attachment. This change makes things more robust by falling back to the original behavior if the upload is not available. This is a CE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9277. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9357
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Nick Thomas	2019-01-23	5	-18/+150
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'52674-api-v4-projects-project_id-jobs-endpoint-hits-statement-timeout' into 'master' [API] Omit `X-Total` and `X-Total-Pages` headers when items count is more than 10,000 Closes #42194 and #52674 See merge request gitlab-org/gitlab-ce!23931
\| * \| \| \| \| \| \| \| \| \|	[API] Omit X-Total{,-Pages} when count > 10k	Rémy Coutable	2019-01-22	5	-18/+150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Marcia Ramos	2019-01-23	1	-0/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'56514-docs-feedback-add-git-clone-to-list-of-basic-git-commands' into 'master' documentation: Add `git clone` to list of basic git commands Closes #56514 See merge request gitlab-org/gitlab-ce!24474
\| * \| \| \| \| \| \| \| \| \|	Add brief description, fix typo, comply with docs style guide	Marcia Ramos	2019-01-23	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Address Feedback from Docs Team	Andrew Fontaine	2019-01-23	1	-6/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify `ssh` and `https` cloning, as well as where to find the `url`s to those repositories.
\| * \| \| \| \| \| \| \| \| \|	Add `git clone` to List of Basic Git Commands	Andrew Fontaine	2019-01-17	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`git clone` is a common entry point to collaborators on an existing project, and should be near the top, as it would be one of the first commands run when getting set up.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'improve-review-apps-docs' into 'master'	Rémy Coutable	2019-01-23	2	-35/+76
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Review Apps documentation See merge request gitlab-org/gitlab-ce!24597
\| * \| \| \| \| \| \| \| \| \| \|	Improve Review Apps documentation	Rémy Coutable	2019-01-23	2	-35/+76
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'qa-staging-27' into 'master'	Mark Lapierre	2019-01-23	4	-4/+134
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Use public_email instead of email since it's available Closes gitlab-org/quality/staging#27 See merge request gitlab-org/gitlab-ce!24533
\| * \| \| \| \| \| \| \| \| \| \|	[QA] Use public_email instead of email since it's available	Rémy Coutable	2019-01-23	4	-4/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-broken-link' into 'master'	Marcia Ramos	2019-01-23	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken docs link Closes #56754 See merge request gitlab-org/gitlab-ce!24611
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken docs link	Achilleas Pipinellis	2019-01-23	1	-3/+3
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/55956-oversized-dropdown-button-custom-notifications' into ↵	Phil Hughes	2019-01-23	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Added `btn_class` to the dropdown for custom notifications See merge request gitlab-org/gitlab-ce!24557
\| * \| \| \| \| \| \| \| \| \|	Added `btn_class` to the dropdown for custom notifications	Ezekiel Kigbo	2019-01-23	2	-2/+7
\|/ / / / / / / / / /