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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add link in K8s integration docs to RBAC rolesadd-rbac-link-in-k8s-docs	Dylan Griffith	2018-11-09	1	-3/+4
\|
*	Merge branch 'always-proxy-reports' into 'master'	Grzegorz Bizon	2018-11-09	4	-17/+51
\|\ \| \| \| \| \| \| \| \|	backport: Always proxy reports downloads See merge request gitlab-org/gitlab-ce!22889
\| *	backport: Always proxy reports downloadsalways-proxy-reports	Kamil Trzciński	2018-11-07	4	-17/+51
\| \| \| \| \| \| \| \|	This makes to always proxy reports
* \|	Merge branch 'revert_issue_board_entity' into 'master'	Stan Hu	2018-11-09	11	-118/+34
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Extract code into IssueBoardEntity" See merge request gitlab-org/gitlab-ce!22928
\| * \|	Revert "Extract code into IssueBoardEntity"revert_issue_board_entity	Thong Kuah	2018-11-09	11	-118/+34
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 8c126525faba40032244328187ba73a53b6eaf4c.
* \| \|	Merge branch 'patch-31' into 'master'	Evan Read	2018-11-09	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Parameter per_page added See merge request gitlab-org/gitlab-ce!22818
\| * \| \|	Parameter per_page added	Alvaro Junqueira	2018-11-09	1	-0/+1
\|/ / /
* \| \|	Merge branch 'patch-31' into 'master'	Evan Read	2018-11-09	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Typo fix stoping -> stopping in the CI README.md See merge request gitlab-org/gitlab-ce!22890
\| * \|	Typo fix stoping -> stopping in the CI README.md	Bryce Chidester	2018-11-07	1	-1/+1
\| \| \|
* \| \|	Merge branch 'support-gitlab-qa-post-status-to-upstream-commit' into 'master'	Robert Speicher	2018-11-08	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to override the gitlab-qa ref for the downstream trigger See merge request gitlab-org/gitlab-ce!22521
\| * \| \|	Allow to override the gitlab-qa ref for the downstream triggersupport-gitlab-qa-post-status-to-upstream-commit	Rémy Coutable	2018-11-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'docs/fix-dead-link' into 'master'	Achilleas Pipinellis	2018-11-08	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link See merge request gitlab-org/gitlab-ce!22917
\| * \| \| \|	Fix broken link	Brendan O'Leary 🐢	2018-11-08	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-duplicate-primary-button-in-dashboard-snippets' into ↵	Dmitriy Zaporozhets	2018-11-08	2	-5/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove duplicate primary button in dashboard snippets Closes #53706 See merge request gitlab-org/gitlab-ce!22902
\| * \| \| \|	Remove duplicate primary button in dashboard snippets	George Tsiolis	2018-11-08	2	-5/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '51259-ci-cd-tooltips' into 'master'	Clement Ho	2018-11-08	11	-53/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces tooltip directive with gl-tooltip directive See merge request gitlab-org/gitlab-ce!22769
\| * \| \| \| \|	Replaces tooltip directive with gl-tooltip directive	Filipa Lacerda	2018-11-08	11	-53/+41
\|/ / / / /
* \| \| \| \|	Merge branch 'notes-multiple-discussion-fetches' into 'master'	Filipa Lacerda	2018-11-08	1	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop multiple discussion requests See merge request gitlab-org/gitlab-ce!22908
\| * \| \| \| \|	Stop multiple discussion requestsnotes-multiple-discussion-fetches	Phil Hughes	2018-11-08	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With multiple discussion requests we loose the reactivity of the previously stored discussions state. This means that certain features, toggling line discussions for example, are no longer reactive.
* \| \| \| \| \|	Merge branch 'limit-parallel-to-100' into 'master'	Grzegorz Bizon	2018-11-08	3	-2/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit parallel to 50 Closes #53711 See merge request gitlab-org/gitlab-ce!22907
\| * \| \| \| \| \|	Limit parallel to 100limit-parallel-to-100	Kamil Trzciński	2018-11-08	3	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents some of the abusive behaviors, of someone putting 100000 and creating out of memory condition easily
* \| \| \| \| \| \|	Merge branch '53640-follow-up-from-resolve-redesign-activity-feed' into 'master'	Phil Hughes	2018-11-08	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Follow-up from "Resolve "Redesign activity feed""" Closes #53640 See merge request gitlab-org/gitlab-ce!22899
\| * \| \| \| \| \| \|	Resolve "Follow-up from "Resolve "Redesign activity feed"""	Martin Wortschack	2018-11-08	2	-1/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'update-dependencies-list-11-5' into 'master'	Sean McGivern	2018-11-08	1	-27/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update license list See merge request gitlab-org/gitlab-ce!22904
\| * \| \| \| \| \| \|	Update license listupdate-dependencies-list-11-5	Steve Azzopardi	2018-11-08	1	-27/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As of part 5 on feature freeze day, we update the license list https://gitlab.com/gitlab-org/release/docs/blob/7a3b6468aed8b254a26c202e98d8476ec3d6c046/general/release-candidates.md#step-5-update-the-dependencies-license-list-on-gitlab-ce
* \| \| \| \| \| \| \|	Merge branch 'upgrade-workhorse-7-1-0' into 'master'	Nick Thomas	2018-11-08	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab-Workhorse to 7.1.0 See merge request gitlab-org/gitlab-ce!22883
\| * \| \| \| \| \| \| \|	Update GitLab-Workhorse to 7.1.0upgrade-workhorse-7-1-0	Andrew Newdigate	2018-11-07	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-templates' into 'master'	Douwe Maan	2018-11-08	13	-12/+165
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run rake gitlab:update_templates See merge request gitlab-org/gitlab-ce!22903
\| * \| \| \| \| \| \| \| \|	Run rake gitlab:update_templates	Steve Azzopardi	2018-11-08	13	-12/+165
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As part of step 4 on feature freeze day, we need to update the templates. https://gitlab.com/gitlab-org/release/docs/blob/7a3b6468aed8b254a26c202e98d8476ec3d6c046/general/release-candidates.md#step-4-update-the-gitignore-and-dockerfile-templates-on-gitlab-ce
* \| \| \| \| \| \| \| \|	Merge branch 'zj-regenerate-gitaly-config-rspec' into 'master'	Douwe Maan	2018-11-08	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regenerate Gitaly's config.toml each rspec run See merge request gitlab-org/gitlab-ce!22562
\| * \| \| \| \| \| \| \|	Regenerate Gitaly's config.toml each rspec run	Zeger-Jan van de Weg	2018-10-26	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This behaviour I removed in 08cdf65b9e1f, but this reverts this specific line. In case storages, or other options changes which are set by the Rails environment, this will easier to migrate to. Storage paths is kept in plural, to support multiple storage in later release for just testing purposes. But its probable that multi Gitaly scenarios need to be tested.
* \| \| \| \| \| \| \| \|	Merge branch 'sh-strip-trailing-whitespace-job-app-vue' into 'master'	Filipa Lacerda	2018-11-08	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip trailing whitespace in job_app.vue See merge request gitlab-org/gitlab-ce!22897
\| * \| \| \| \| \| \| \|	Strip trailing whitespace in job_app.vuesh-strip-trailing-whitespace-job-app-vue	Stan Hu	2018-11-07	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caused unnecessary conflicts in EE.
* \| \| \| \| \| \| \| \|	Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'	Sean McGivern	2018-11-08	26	-1234/+89
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" See merge request gitlab-org/gitlab-ce!22891
\| * \| \| \| \| \| \| \|	Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line	Oswaldo Ferreira	2018-11-07	26	-1234/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-mysql-docs-links' into 'master'	Achilleas Pipinellis	2018-11-08	1	-21/+27
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken links and other minor improvements See merge request gitlab-org/gitlab-ce!22858
\| * \| \| \| \| \| \| \| \|	Fix broken links and other minor improvements	Evan Read	2018-11-08	1	-21/+27
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-version-number-ce-doc' into 'master'	Achilleas Pipinellis	2018-11-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature backported to CE in 11.5, not 10.7 Closes #53648 See merge request gitlab-org/gitlab-ce!22892
\| * \| \| \| \| \| \| \| \|	Feature backported to CE in 11.5, not 10.7docs/fix-version-number-ce-doc	Evan Read	2018-11-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-various-404s' into 'master'	Achilleas Pipinellis	2018-11-08	4	-9/+9
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown so renderer parses links correctly, fixing 404s See merge request gitlab-org/gitlab-ce!22895
\| * \| \| \| \| \| \| \| \|	Fix Markdown so renderer parses links correctly, fixing 404sdocs/fix-various-404s	Evan Read	2018-11-08	4	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also corrects capitalisation of Git.
* \| \| \| \| \| \| \| \| \|	Merge branch '_acet-discussion-redesign' into 'master'	Mike Greiling	2018-11-08	24	-276/+629
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussions redesign Closes #29294 See merge request gitlab-org/gitlab-ce!22333
\| * \| \| \| \| \| \| \| \| \|	Discussions redesign	Fatih Acet	2018-11-08	24	-276/+629
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'ee-backport-4753-tracing-mvc' into 'master'	Sean McGivern	2018-11-08	3	-5/+26
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backport changes from gitlab-ee!7903 See merge request gitlab-org/gitlab-ce!22767
\| * \| \| \| \| \| \| \| \| \|	backport changes from gitlab-ee!7903	Simon Knox	2018-11-08	3	-5/+26
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-issues-filter-history-only' into 'master'	Sanad Liaquat	2018-11-08	3	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for the filter spec failure Closes gitlab-org/quality/nightly#34 and gitlab-org/quality/nightly#30 See merge request gitlab-org/gitlab-ce!22862
\| * \| \| \| \| \| \| \| \|	Fix for the filter spec failure	Ramya Authappan	2018-11-08	3	-0/+11
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs-autodevops-rbac' into 'master'	Evan Read	2018-11-08	1	-56/+63
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds documentation for restricted project service account in deployment jobs Closes #51717 See merge request gitlab-org/gitlab-ce!22810
\| * \| \| \| \| \| \| \| \|	Adds documentation for restricted project service account in deployment jobs	Mayra Cabrera	2018-11-08	1	-56/+63
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'mk/import-bare-repo-from-hashed-storage-docs' into 'master'	Evan Read	2018-11-08	1	-1/+71
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that we do not support importing bare repositories from hashed storage in certain cases Closes #41423 See merge request gitlab-org/gitlab-ce!22783