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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Do not attach runner to a non-exsiting network in QAqa/gb/do-not-require-test-network-in-pipeline-tests	Grzegorz Bizon	2018-02-09	2	-2/+12
\|
*	Merge branch 'sh-ldap-set-first-password-qa' into 'master'	Grzegorz Bizon	2018-02-09	1	-9/+16
\|\ \| \| \| \| \| \| \| \|	Set initial password for instance in LDAP QA test See merge request gitlab-org/gitlab-ce!17024
\| *	Set initial password for instance in LDAP QA testsh-ldap-set-first-password-qa	Stan Hu	2018-02-08	1	-9/+16
\| \| \| \| \| \| \| \| \| \|	For a new instance, the root password needs to be set, regardless of whether LDAP is enabled.
* \|	Merge branch '42896-hashed-storage-beta-docs' into 'master'	Stan Hu	2018-02-09	1	-39/+52
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Resolve "Hashed storage is now beta" Closes #42896 See merge request gitlab-org/gitlab-ce!17015
\| *	Backport EE changes to some hashed storage documentation to CE	Nick Thomas	2018-02-08	1	-39/+52
\| \|
* \|	Merge branch 'fix/remove-n-plus-one-from-branches-filter' into 'master'	Robert Speicher	2018-02-08	1	-11/+8
\|\ \ \| \|/ \|/\| \| \| \| \|	Remove allow_n_plus_1 from Git::Repository#branches_filter See merge request gitlab-org/gitlab-ce!17012
\| *	Remove allow_n_plus_1 from Git::Repository#branches_filter	Ahmad Sherif	2018-02-08	1	-11/+8
\|/
*	Merge branch '40744-hashed-storage-specs' into 'master'	Sean McGivern	2018-02-08	36	-254/+349
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use hashed storage in the specs Closes #40744 See merge request gitlab-org/gitlab-ce!15681
\| *	Use hashed storage in the specs40744-hashed-storage-specs	Nick Thomas	2018-02-07	36	-254/+349
\| \|
* \|	Merge branch '4852-migration-specs-fail-locally-if-no-geo-db-is-configured' ↵	Nick Thomas	2018-02-08	1	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Make resetting column information overridable in EE See merge request gitlab-org/gitlab-ce!17007
\| * \|	Make resetting column information overridable in EE	Sean McGivern	2018-02-08	1	-2/+7
\| \| \|
* \| \|	Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master'	Marin Jankovski	2018-02-08	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Bumps Gitlab Shell version to 6.0.3 See merge request gitlab-org/gitlab-ce!17008
\| * \|	Bumps Gitlab Shell version to 6.0.3bump-gitlab-shell-version-to-6-0-3	Tiago Botelho	2018-02-08	1	-1/+1
\|/ /
* \|	Merge branch 'feature/26598-clear-button-ci-lint' into 'master'	Clement Ho	2018-02-08	4	-8/+39
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added 'clear' button to ci lint editor Closes #26598 and #41209 See merge request gitlab-org/gitlab-ce!16970
\| * \|	Added 'clear' button to ci lint editor	Lin Jen-Shin	2018-02-08	4	-8/+39
\|/ /
* \|	Merge branch 'docs-for-commits-linking-to-mrs' into 'master'	Sean McGivern	2018-02-08	1	-1/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for MR link in commit page See merge request gitlab-org/gitlab-ce!16994
\| * \|	Add docs for MR link in commit pagedocs-for-commits-linking-to-mrs	Sean McGivern	2018-02-08	1	-1/+14
\| \| \|
* \| \|	Merge branch '180-qa-fix-api-spec' into 'master'	Grzegorz Bizon	2018-02-08	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve 10.5.0 RC1 QA Failure with failing API specs Closes gitlab-qa#180 See merge request gitlab-org/gitlab-ce!16999
\| * \| \|	don't check against a hardcoded user name180-qa-fix-api-spec	Brett Walker	2018-02-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and use an invalid user name that is random so we know it's invalid
* \| \| \|	Merge branch 'issues-in-subgroups' into 'master'	Sean McGivern	2018-02-08	2	-6/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues and merge requests in subgroups docs See merge request gitlab-org/gitlab-ce!16978
\| * \| \| \|	Issues and merge requests in subgroups docs	Victor Wu 🌴Vacation Feb 10-18🌴	2018-02-08	2	-6/+4
\|/ / / /
* \| \| \|	Merge branch 'update-docs-labels-ce' into 'master'	Marcia Ramos	2018-02-08	25	-119/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs labels CE See merge request gitlab-org/gitlab-ce!16974
\| * \| \| \|	Update docs labels CE	Victor Wu 🌴Vacation Feb 10-18🌴	2018-02-08	25	-119/+70
\| \| \| \| \|
* \| \| \| \|	Merge branch '10-5-update-dependencies-license-list' into 'master'	Marin Jankovski	2018-02-08	1	-9/+1259
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.5 Update the dependencies license list See merge request gitlab-org/gitlab-ce!16998
\| * \| \| \| \|	10.5 Update the dependencies license list10-5-update-dependencies-license-list	Mark Fletcher	2018-02-08	1	-9/+1259
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'new-list-dropdown-ajax-refactor' into 'master'	Filipa Lacerda	2018-02-08	1	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced $.get with axois.get See merge request gitlab-org/gitlab-ce!16992
\| * \| \| \| \| \|	Replaced $.get with axois.getnew-list-dropdown-ajax-refactor	Constance Okoghenun	2018-02-08	1	-3/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-pages-https' into 'master'	Achilleas Pipinellis	2018-02-08	2	-5/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: bring important info from blog post to doc See merge request gitlab-org/gitlab-ce!16837
\| * \| \| \| \| \| \|	wording	Marcia Ramos	2018-02-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	un-index old blog post from doc, add the important content from the post to ↵docs-pages-https	Marcia Ramos	2018-01-31	2	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the docs
* \| \| \| \| \| \| \|	Merge branch 'feature/oidc-groups-claim' into 'master'	Douwe Maan	2018-02-08	7	-7/+57
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add groups to OpenID Connect claims See merge request gitlab-org/gitlab-ce!16929
\| * \| \| \| \| \| \| \|	Add groups to OpenID Connect claims	Hassan Zamani	2018-02-08	7	-7/+57
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mr-show-dispatcher-refactor' into 'master'	Jacob Schatz	2018-02-08	4	-33/+35
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored merge_requests/show path in dispatcher.js See merge request gitlab-org/gitlab-ce!16853
\| * \| \| \| \| \| \| \| \|	Refactored merge_requests/show path in dispatcher.js	Constance Okoghenun	2018-02-08	4	-33/+35
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '10-5-update-templates' into 'master'	Marin Jankovski	2018-02-08	8	-6/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.5 Update the `.gitignore`, `.gitlab-ci.yml`, and `Dockerfile` templates See merge request gitlab-org/gitlab-ce!16997
\| * \| \| \| \| \| \| \| \|	10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates10-5-update-templates	Mark Fletcher	2018-02-08	8	-6/+42
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '10-5-ce-update-guides' into 'master'	Marin Jankovski	2018-02-08	1	-0/+361
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.5 Create the "Update" guides See merge request gitlab-org/gitlab-ce!16996
\| * \| \| \| \| \| \| \| \|	Create update guide for 10.510-5-ce-update-guides	Mark Fletcher	2018-02-08	1	-0/+361
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '10-5-update-source-install-guide' into 'master'	Marin Jankovski	2018-02-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	10.5 Update the "Installation from Source" guide See merge request gitlab-org/gitlab-ce!16995
\| * \| \| \| \| \| \| \|	Update 10.5 source install guide	Mark Fletcher	2018-02-08	1	-2/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'osw-wip-commit-docs' into 'master'	Achilleas Pipinellis	2018-02-08	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add blurb about changing MRs to WIP through commits See merge request gitlab-org/gitlab-ce!16920
\| * \| \| \| \| \| \| \|	Add blurb about changing MRs to WIP through commitsosw-wip-commit-docs	Oswaldo Ferreira	2018-02-04	1	-1/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'	Achilleas Pipinellis	2018-02-08	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note about merge conflicts in `gitlab.pot` See merge request gitlab-org/gitlab-ce!16971
\| * \| \| \| \| \| \| \| \|	Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docs	Bob Van Landuyt	2018-02-07	1	-0/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ce	Yorick Peterse	2018-02-08	5	-34/+30
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988
\| * \| \| \| \| \| \| \| \|	[docs] Info rescheduling background migrationsbvl-fix-concurrent-fork-network-migrations	Bob Van Landuyt	2018-02-08	1	-0/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Handle uniqueness on fork_network_member creation	Bob Van Landuyt	2018-02-08	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the migration might be queued already and be rescheduled when it fails on a uniqueness error, this should help clearing the background migration queue faster.
\| * \| \| \| \| \| \| \| \|	Early migrations populating fork-networks: no-op	Bob Van Landuyt	2018-02-08	3	-30/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since populating the fork networks was scheduled multiple times because of bugs that needed to be fixed: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15595/ Creating fork networks for projects that were missing the root of the fork network. - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15709 The API allowed creating forked_project_links without fork_network_members. Scheduling this migration multiple times would case it to run concurrently. Which in turn would try to insert the same data into `fork_network_members` causing duplicate key errors. This avoids running the migration multiple times.
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'	Marin Jankovski	2018-02-08	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly Closes gitlab-ee#4857 See merge request gitlab-org/gitlab-ce!16990
\| * \| \| \| \| \| \| \| \| \|	Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-one	Stan Hu	2018-02-08	1	-3/+5
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequest#rebase_in_progress? and MergeRequest#rebase_path were called twice each time per request. This memoization helps reduce the overall number of queries. See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51616319 as a failing job. Closes gitlab-org/gitlab-ee#4857