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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'osw-merge-request-metrics-population-scheduler-improvement' ↵10-4-stable-prepare-rc2	Stan Hu	2018-01-08	1	-31/+1
\| \| \| \| \| \| \| \| \|	into 'master' Remove unnecessary queries on Merge Request Metrics population scheduler Closes gitlab-org/release/tasks#13 See merge request gitlab-org/gitlab-ce!16292
*	Merge branch 'sh-fix-issue-41735' into 'master'	Marin Jankovski	2018-01-08	2	-1/+15
\| \| \| \| \| \| \|	Fix error 500 when viewing commit and merge request diffs Closes #41735 See merge request gitlab-org/gitlab-ce!16272
*	Update VERSION to 10.4.0-rc1v10.4.0-rc1	Luke Bennett	2018-01-07	1	-1/+1
\|
*	Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'	Fatih Acet	2018-01-05	1	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix custom name in branch creation for issue in Firefox Closes #41563 See merge request gitlab-org/gitlab-ce!16244
\| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2018-01-05	60	-349/+696
\| \|\ \| \| \| \| \| \| \| \| \|	41563-fix-branch-creation-from-issue-in-firefox
\| * \|	Fix custom name in branch creation for issue in Firefox41563-fix-branch-creation-from-issue-in-firefox	Eric Eastwood	2018-01-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41563 `event.srcElement` is non-standard, https://developer.mozilla.org/en-US/docs/Web/API/Event/srcElement
* \| \|	Merge branch 'issues/40986/get-participants-from-issues-mr-api' into 'master'	Rémy Coutable	2018-01-05	8	-0/+149
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: get participants from merge_requests & issues Closes #40986 See merge request gitlab-org/gitlab-ce!16187
\| * \| \|	API: get participants from merge_requests & issues	Brent Greeff	2018-01-05	8	-0/+149
\| \| \| \|
* \| \| \|	Merge branch 'ac-autodevopfix-kubectl-version' into 'master'	Kamil Trzciński	2018-01-05	2	-4/+13
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Create secrets failed for Auto DevOps with latest stable of kubectl" Closes #41376 See merge request gitlab-org/gitlab-ce!16218
\| * \| \|	Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-version	Alessio Caiazza	2018-01-04	2	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit extracts `kubectl`, `helm` and `codeclimate` versions as CI variables. `kubectl` changes from latest stable version to `1.8.6`, the other two are just extracted in order to be easily updated; now we can also test tool upgrades overriding CI secret variables.
* \| \| \|	Merge branch 'jprovazn-rebase' into 'master'	Filipa Lacerda	2018-01-05	39	-13/+820
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
\| * \| \| \|	Backport 'Rebase' feature from EE to CEjprovazn-rebase	Jan Provaznik	2018-01-05	40	-13/+825
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* \| \| \| \|	Merge branch 'remove-project-repo' into 'master'	Sean McGivern	2018-01-05	7	-17/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
\| * \| \| \| \|	Fix specsremove-project-repo	Jacob Vosmaer	2018-01-05	5	-11/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Remove the Project#repo method	Jacob Vosmaer	2018-01-04	2	-6/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/qa/gb/document-integration-tests-in-merge-requests' into ↵	Rémy Coutable	2018-01-05	3	-0/+91
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add docs about end-to-end testing / GitLab QA tests Closes #39637 See merge request gitlab-org/gitlab-ce!16043
\| * \| \| \| \| \|	Rephrase paragraph about e2e tests in merge requests in docs	Grzegorz Bizon	2018-01-05	1	-8/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Copy-edit end-to-end testing guide documentationdocs/qa/gb/document-integration-tests-in-merge-requests	Grzegorz Bizon	2018-01-04	1	-16/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix link to end-to-end testing docs from test pyramid	Grzegorz Bizon	2018-01-02	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Copy-edit end-to-end testing guidelines	Grzegorz Bizon	2018-01-02	1	-13/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Link to end to end test guideline from test pyramid	Grzegorz Bizon	2018-01-02	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Extend documentation on end-to-end integration tests	Grzegorz Bizon	2018-01-02	2	-9/+42
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add docs about end-to-end testing / GitLab QA tests	Grzegorz Bizon	2018-01-02	2	-0/+50
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'api-domains-expose-project_id' into 'master'	Dmitriy Zaporozhets	2018-01-05	5	-1/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
\| * \| \| \| \| \| \|	Expose project_id on /api/v4/pages/domains	Luc Didry	2018-01-03	5	-1/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ban-disk-import' into 'master'	Sean McGivern	2018-01-05	3	-1/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use Gitlab::Shell#import_repository on local paths See merge request gitlab-org/gitlab-ce!16228
\| * \| \| \| \| \| \| \|	rubocopban-disk-import	Jacob Vosmaer	2018-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Hide hooks stuff	Jacob Vosmaer	2018-01-04	2	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	get it working	Jacob Vosmaer	2018-01-04	3	-1/+11
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'backport-issue_3413' into 'master'	Sean McGivern	2018-01-05	16	-248/+516
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
\| * \| \| \| \| \| \| \|	Remove EE only sections from docsbackport-issue_3413	Felipe Artur	2018-01-05	1	-85/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	EE-BACKPORT group boards	Felipe Artur	2018-01-04	16	-248/+601
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master'	Tim Zallmann	2018-01-05	4	-0/+97
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of methods and components added in EE See merge request gitlab-org/gitlab-ce!16208
\| * \| \| \| \| \| \| \|	Use computed prop in expand buttonce-4348-show-dast-results-in-the-mr-widget	Filipa Lacerda	2018-01-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Backport of methods and components added in EBackport of methods and ↵	Filipa Lacerda	2018-01-03	4	-0/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	components added in EEE
* \| \| \| \| \| \| \| \|	Merge branch 'update-redis-rack' into 'master'	Rémy Coutable	2018-01-05	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update redis-rack to 2.0.4 See merge request gitlab-org/gitlab-ce!16251
\| * \| \| \| \| \| \| \| \|	Update redis-rack to 2.0.4update-redis-rack	Yorick Peterse	2018-01-05	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Up until version 2.0.3 redis-rack included a "rake" binary that would overwrite/hijack the one provided by Rake itself. Unfortunately the binary provided by redis-rack would produce errors in many cases. See https://github.com/redis-store/redis-rack/pull/34 for more info.
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2018-01-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update settings.md See merge request gitlab-org/gitlab-ce!16233
\| * \| \| \| \| \| \| \| \|	Update settings.md	Gauthier Wallet	2018-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-import-project-url-bug' into 'master'	Tim Zallmann	2018-01-05	3	-17/+27
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import project url not updating project name Closes #40607 See merge request gitlab-org/gitlab-ce!16120
\| * \| \| \| \| \| \| \| \| \|	Fix import project url not updating project namejivl-fix-import-project-url-bug	Jose Ivan Vargas	2018-01-03	3	-17/+27
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-modal-target-id' into 'master'	Filipa Lacerda	2018-01-05	15	-115/+168
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
\| * \| \| \| \| \| \| \| \|	Add id to modal.vue to support data-toggle="modal"	Winnie Hellmann	2018-01-05	15	-115/+168
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-cluster-show-page-conservative' into 'master'	Filipa Lacerda	2018-01-05	11	-49/+50
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor cluster show page Closes #41335 See merge request gitlab-org/gitlab-ce!16089
\| * \| \| \| \| \| \| \| \| \|	Add back bottom margins for integration formrefactor-cluster-show-page-conservative	Matija Čupić	2018-01-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Remove cluster subtitle and alert	Matija Čupić	2018-01-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Advanced cluster settings subtitle	Matija Čupić	2018-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rename enabled partial to integration_form	Matija Čupić	2017-12-21	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Environment pattern -> Environment scope	Matija Čupić	2017-12-21	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Match updated clusters/show in feature specs	Matija Čupić	2017-12-21	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \|