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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes not working dropdowns in pipelines page55893-artifacts-download	Filipa Lacerda	2019-02-13	4	-16/+27
\| \| \| \| \| \|	glbutton is not meant to work with old dropdowns This commit reverts the update to use gl button and adds i18n to some missing strings
*	Merge branch '57564-contributing-button-border' into 'master'	Filipa Lacerda	2019-02-12	2	-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 exists	Takuya Noguchi	2019-02-12	2	-1/+7
\| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \|	Merge branch 'docs-issues-functionalities' into 'master'	Achilleas Pipinellis	2019-02-12	1	-37/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Clean up issues functionalities doc See merge request gitlab-org/gitlab-ce!24931
\| * \|	Clean up issues functionalities doc	Marcel Amirault	2019-02-05	1	-37/+37
\| \| \|
* \| \|	Merge branch 'docs-misc' into 'master'	Achilleas Pipinellis	2019-02-12	7	-19/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Misc small fixes to docs See merge request gitlab-org/gitlab-ce!24952
\| * \| \|	Docs: Misc small fixes to docs	Marcel Amirault	2019-02-12	7	-19/+25
\|/ / /
* \| \|	Merge branch 'docs-realignment-ce-2' into 'master'	Achilleas Pipinellis	2019-02-12	13	-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 Amirault	2019-02-12	13	-17/+87
\|/ / /
* \| \|	Merge branch 'docs-realignment-ce' into 'master'	Achilleas Pipinellis	2019-02-12	4	-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 unnecessarily	Marcel Amirault	2019-02-12	4	-8/+58
\|/ / /
* \| \|	Merge branch 'patch-32' into 'master'	Achilleas Pipinellis	2019-02-12	1	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added example for get file archive See merge request gitlab-org/gitlab-ce!23432
\| * \| \|	Added example for get file archive	Arihant	2019-02-12	1	-1/+5
\|/ / /
* \| \|	Merge branch ↵	Grzegorz Bizon	2019-02-12	3	-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 settings	Vladimir Shushlin	2019-02-12	3	-2/+22
\|/ / /
* \| \|	Merge branch 'bl-forward-gitlab-svg' into 'master'	Filipa Lacerda	2019-02-12	2	-5/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-svg to 1.52 See merge request gitlab-org/gitlab-ce!25145
\| * \| \|	Update gitlab-svg to 1.52	Brandon Labuschagne	2019-02-12	2	-5/+5
\| \| \| \|
* \| \| \|	Merge branch '55209-tool-tip-hides-menu-item' into 'master'	Phil Hughes	2019-02-12	3	-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-item	Simon Knox	2019-02-12	3	-8/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'Doc-project-cicd-timeout-settings-location' into 'master'	Achilleas Pipinellis	2019-02-12	1	-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 project	Andrew Winata	2019-02-12	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-32' into 'master'	Achilleas Pipinellis	2019-02-12	1	-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 ↵	Roland	2019-02-12	1	-1/+5
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	required
* \| \| \| \| \|	Merge branch 'sh-import-source-branch-github-forks' into 'master'	Yorick Peterse	2019-02-12	5	-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 import	Stan Hu	2019-02-11	5	-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 Coutable	2019-02-12	1	-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 task	Stan Hu	2019-02-11	3	-35/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Kill all PostgreSQL connections for rake dev:setup	Stan Hu	2019-02-11	3	-0/+39
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If there are any clients connected to the DB, PostgreSQL won't let you drop the database. It's possible that Sidekiq, Unicorn, or some other client will be hanging onto a connection, preventing the DROP DATABASE from working. To workaround this problem, this method cancels all the connections so that the db:reset command will work. Note that there's still a slight possibility a client connects after its connection is terminated. If this is an issue, we could solve it by revoking CONNECT access, but for now it seems this works. Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/450
* \| \| \| \| \|	Merge branch '47150-update-sshkey' into 'master'	Rémy Coutable	2019-02-12	3	-3/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sshkey to v2.0.0 Closes #47150 See merge request gitlab-org/gitlab-ce!25115
\| * \| \| \| \| \|	Update sshkey to v2.0.0	Nick Thomas	2019-02-11	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This release fixes a bug in handling certain ed25519 keys. For more details, see this GitHub issue: https://github.com/bensie/sshkey/issues/34
* \| \| \| \| \| \|	Merge branch 'qa-nightly-72-stablize-select-kind' into 'master'	Dan Davison	2019-02-12	5	-11/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stablize select_kind using retry_on_exception Closes gitlab-org/quality/nightly#72 See merge request gitlab-org/gitlab-ce!25027
\| * \| \| \| \| \| \|	Add back the :quarantine tag	Sanad Liaquat	2019-02-12	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Stablize select kind using retry_on_exceptionqa-nightly-72-stablize-select-kind	Sanad Liaquat	2019-02-08	6	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduces retry_on_exception and renames with_retry to retry_unti so its purpose is clear in presense of retry_on_exception.
* \| \| \| \| \| \| \|	Merge branch 'add-client-for-count-diverging-commits' into 'master'	Grzegorz Bizon	2019-02-12	10	-16/+155
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add client support for CountDivergingCommits rpc See merge request gitlab-org/gitlab-ce!24287
\| * \| \| \| \| \| \|	Adapt that diverging commits could be just one baradd-client-for-count-diverging-commits	Lin Jen-Shin	2019-02-11	7	-18/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactors the ui for diverging commits so that it's only a single bar instead of two separate bars
\| * \| \| \| \| \| \|	Add client support for count diverging commits	John Cai	2019-02-06	6	-4/+116
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the client call for the gitaly rpc CountDivergingCommits fixing signature simplifying commit logic adding test for max-count refactoring tests
* \| \| \| \| \| \|	Merge branch 'jc-add-has-repository' into 'master'	Douglas Barbosa Alexandre	2019-02-12	2	-0/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding convenience method to project model See merge request gitlab-org/gitlab-ce!25108
\| * \| \| \| \| \| \|	Adding convenience method to project model	John Cai	2019-02-11	2	-0/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Evan Read	2019-02-12	1	-0/+43
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57287-documentation-for-handling-more-complex-only-merge_requests-scenarios-is-sparse' into 'master' Docs for MR pipeline rule interactions Closes #57287 See merge request gitlab-org/gitlab-ce!24929
\| * \| \| \| \| \| \| \|	Small grammar fix	Evan Read	2019-02-12	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md57287-documentation-for-handling-more-complex-only-merge_requests-scenarios-is-sparse	Jason Lenny	2019-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply suggestion to doc/ci/merge_request_pipelines/index.md	Jason Lenny	2019-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename section header to be more clear	Jason Lenny	2019-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add new section describing usage in exclusion scenario	Jason Lenny	2019-02-05	1	-0/+43
\| \| \| \| \| \| \| \| \|