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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Address review comments4826-github-import-wiki-fix-1	Valery Sizov	2018-02-19	1	-1/+1
\|
*	update changelog	Valery Sizov	2018-02-14	1	-0/+5
\|
*	[GH Import] Create an empty wiki if GH wiki import failed	Valery Sizov	2018-02-14	2	-2/+7
\|
*	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
* \| \| \| \|	Merge branch 'zj-namespace-gitaly-opt-out' into 'master'	Sean McGivern	2018-02-08	1	-4/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Namespace to Gitaly using OPT-OUT See merge request gitlab-org/gitlab-ce!15910
\| * \| \| \|	Move Namespace to Gitaly using OPT-OUT	Zeger-Jan van de Weg	2017-12-13	1	-4/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-n-1-root-show' into 'master'	Douwe Maan	2018-02-08	1	-4/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N + 1 block for Root#show Closes #37434 and gitaly#996 See merge request gitlab-org/gitlab-ce!16968
\| * \| \| \| \|	Don't allow N +1 calls from Root#show	Zeger-Jan van de Weg	2018-02-07	1	-4/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-nfs-ip-docs' into 'master'	Achilleas Pipinellis	2018-02-08	1	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sample fstab file in GitLab HA docs See merge request gitlab-org/gitlab-ce!16985
\| * \| \| \| \| \|	Fix sample fstab file in GitLab HA docssh-nfs-ip-docs	Stan Hu	2018-02-07	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The nobootwait option is no longer a valid option in Ubuntu 16.04. Use nofail instead: https://askubuntu.com/questions/786928/ubuntu-16-04-fstab-fails-with-nobootwait
* \| \| \| \| \| \|	Merge branch 'snake-case' into 'master'	Filipa Lacerda	2018-02-08	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update style_guide_scss.md See merge request gitlab-org/gitlab-ce!16651
\| * \| \| \| \| \| \|	Update style_guide_scss.md	Simon Knox	2018-02-08	1	-0/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'	Kamil Trzciński	2018-02-08	4	-0/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Expose GitLab license/plan as a CI/CD variable" Closes #40994 See merge request gitlab-org/gitlab-ce!16936
\| * \| \| \| \| \|	Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variable	Dylan Griffith	2018-02-07	4	-0/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'internationalize-charts-page' into 'master'2018-02-08-ce-cut-off-to-10-5-stable	Clement Ho	2018-02-08	3	-13/+50
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Annotate charts page for internationalization See merge request gitlab-org/gitlab-ce!16687
\| * \| \| \| \| \| \|	Annotate charts page for internationalization	Shah El-Rahman	2018-02-08	3	-13/+50
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '41301-new-design-for-user-deletion-confirmation-in-admin-area' ↵42867-rsa-secureid-app-doesn-t-understand-gitlab-qr-code	Clement Ho	2018-02-08	9	-17/+288
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "New design for user deletion confirmation in admin area" Closes #41301 See merge request gitlab-org/gitlab-ce!16811
\| * \| \| \| \| \| \|	Resolve "New design for user deletion confirmation in admin area"	Shah El-Rahman	2018-02-08	9	-17/+288
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into ↵	Clement Ho	2018-02-08	9	-25/+167
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "New design for cancel / stop pipeline confirmation" Closes #41297 See merge request gitlab-org/gitlab-ce!16813
\| * \| \| \| \| \| \|	Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmation	Shah El-Rahman	2018-02-07	9	-25/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests Address code review feedback Fix tests
* \| \| \| \| \| \| \|	Merge branch 'internationalize-graph-page' into 'master'	Clement Ho	2018-02-08	4	-5/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Annotate graph page for internationalization See merge request gitlab-org/gitlab-ce!16688
\| * \| \| \| \| \| \| \|	Annotate graph page for internationalization	Shah El-Rahman	2018-02-08	4	-5/+19
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '41300-new-design-for-project-deletion-confirmation' into 'master'	Clement Ho	2018-02-08	4	-1/+175
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "New design for project deletion confirmation" Closes #41300 See merge request gitlab-org/gitlab-ce!16812
\| * \| \| \| \| \| \| \|	Resolve "New design for project deletion confirmation"	Shah El-Rahman	2018-02-08	4	-1/+175
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'pawel/use-released-prometheus-version' into 'master'	Stan Hu	2018-02-08	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use prometheus-client-mmap released, final version See merge request gitlab-org/gitlab-ce!16984
\| * \| \| \| \| \| \| \|	Use prometheus-client-mmap released, final versionpawel/use-released-prometheus-version	Pawel Chojnacki	2018-02-07	2	-3/+3
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-02-08	1	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42864-update-vendored-autodevops-yml-for-latest-browser-performance-testing-changes' into 'master' Update vendored AutoDevOps YML for latest Browser Performance Testing changes Closes #42864 See merge request gitlab-org/gitlab-ce!16982
\| * \| \| \| \| \| \| \|	Update AutoDevOps template for latest Browser Performance Testing changes	Joshua Lambert	2018-02-07	1	-3/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'feature/migrate-blob-batch-to-gitaly' into 'master'	Robert Speicher	2018-02-08	7	-50/+165
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Git::Blob.batch to Gitaly Closes #37445 and gitaly#985 See merge request gitlab-org/gitlab-ce!16928
\| * \| \| \| \| \| \| \|	Migrate Git::Blob.batch to Gitaly	Ahmad Sherif	2018-02-08	7	-50/+165
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#985
* \| \| \| \| \| \| \|	Merge branch 'patch-11' into 'master'	Stan Hu	2018-02-08	1	-124/+140
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add instructions for source installation to mysql_to_postgresql.md See merge request gitlab-org/gitlab-ce!16983
\| * \| \| \| \| \| \|	Add instructions for source installation to mysql_to_postgresql.md	Dark Dragon	2018-02-07	1	-124/+140
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '42462-edit-note' into 'master'	Fatih Acet	2018-02-07	4	-47/+72
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Cancelling a second comment edit doesn't return its state to before the edit" Closes #42462 See merge request gitlab-org/gitlab-ce!16869
\| * \| \| \| \| \| \|	Resolve "Cancelling a second comment edit doesn't return its state to before ↵	Simon Knox	2018-02-07	4	-47/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the edit"
* \| \| \| \| \| \| \|	Merge branch 'axios-profile' into 'master'	Fatih Acet	2018-02-07	2	-17/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.ajax in profile.js with axios See merge request gitlab-org/gitlab-ce!16895
\| * \| \| \| \| \| \| \|	Replace $.ajax in profile.js with axios	Clement Ho	2018-02-07	2	-17/+25
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'dev/master'	Stan Hu	2018-02-07	1	-0/+10
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update CHANGELOG.md for 10.2.8	Robert Speicher	2018-02-07	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'prometheus-gem-update-to-version-0.9.1.pre.rc.1' into 'master'	Stan Hu	2018-02-07	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening on metrics deletion See merge request gitlab-org/gitlab-ce!16964
\| * \| \| \| \| \| \| \|	Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening ↵prometheus-gem-update-to-version-0.9.1.pre.rc.1	Pawel Chojnacki	2018-02-07	2	-3/+3
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on metrics deletion
* \| \| \| \| \| \| \|	Merge branch 'axios-diff-file-editor' into 'master'	Fatih Acet	2018-02-07	1	-10/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.get in diff file editor with axios See merge request gitlab-org/gitlab-ce!16896