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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 11.1.0-rc9v11.1.0-rc9	GitLab Release Tools Bot	2018-07-12	1	-1/+1
\|
*	Merge branch 'fix-mr-widget-border' into 'master'	Filipa Lacerda	2018-07-12	2	-7/+1
\| \| \| \| \|	Fix MR widget border See merge request gitlab-org/gitlab-ce!20562
*	Update VERSION to 11.1.0-rc8v11.1.0-rc8 11-1-stable-prepare-rc9	GitLab Release Tools Bot	2018-07-11	1	-1/+1
\|
*	Merge branch 'revert-todos-epic' into 'master'11-1-stable-prepare-rc8	Yorick Peterse	2018-07-11	30	-640/+184
\| \| \| \| \|	Revert "Merge branch 'ee-5481-epic-todos' into 'master'" See merge request gitlab-org/gitlab-ce!20560
*	Merge branch '48237-toggle-file-comments' into 'master'	Phil Hughes	2018-07-11	14	-92/+378
\| \| \| \| \| \| \|	Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
*	Merge branch 'docs/cluster-permissions' into 'master'	Marcia Ramos	2018-07-11	1	-2/+3
\| \| \| \| \| \| \|	Mention admin privileges for k8s token creation Closes #44457 See merge request gitlab-org/gitlab-ce!20517
*	Update VERSION to 11.1.0-rc7v11.1.0-rc7	GitLab Release Tools Bot	2018-07-11	1	-1/+1
\|
*	Merge branch 'fix-conflicts-exception-for-submodules' into 'master'11-1-stable-prepare-rc7	Rémy Coutable	2018-07-11	4	-15/+31
\| \| \| \| \|	Make sure ConflictsService does not raise for conflicting submodules See merge request gitlab-org/gitlab-ce!20528
*	Merge branch 'sh-fix-git-gc-error-handling' into 'master'	Robert Speicher	2018-07-11	2	-2/+8
\| \| \| \| \| \| \|	Fix ArgumentError in GitGarbageCollectWorker Sidekiq job Closes #49096 See merge request gitlab-org/gitlab-ce!20541
*	Merge branch '48960-namespace-diff-module' into 'master'	Tim Zallmann	2018-07-10	12	-13/+18
\| \| \| \| \| \| \|	Resolve "Use namespaped module for diffs" Closes #48960 See merge request gitlab-org/gitlab-ce!20442
*	Merge branch ↵	Sean McGivern	2018-07-10	1	-2/+2
\| \| \| \| \| \| \| \| \|	'48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master' Resolve "Markdown help incorrect in how wiki pages are rendered" Closes #48970 See merge request gitlab-org/gitlab-ce!20459
*	Merge branch '48982-mr-refactor-improve-performance-by-setting-v-once' into ↵	Fatih Acet	2018-07-10	5	-29/+20
\| \| \| \| \| \| \| \| \|	'master' Resolve "MR Refactor: Improve performance by setting v-once" Closes #48982 See merge request gitlab-org/gitlab-ce!20468
*	Merge branch '48951-clean-up' into 'master'	Phil Hughes	2018-07-10	5	-66/+56
\| \| \| \| \| \| \|	Resolve "MR refactor: All actions under diff module are being exported twice" Closes #48951 See merge request gitlab-org/gitlab-ce!20499
*	Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master'	Rémy Coutable	2018-07-10	2	-5/+31
\| \| \| \| \|	Document update for GitLab Pages users. See merge request gitlab-org/gitlab-ce!20412
*	Merge branch 'use-correct-script-location' into 'master'	Rémy Coutable	2018-07-10	1	-1/+1
\| \| \| \| \|	Use the correct script location for the build trigger script See merge request gitlab-org/gitlab-ce!20454
*	Merge branch 'revert-3755d828' into 'master'	Phil Hughes	2018-07-10	3	-3/+3
\| \| \| \| \|	Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'" See merge request gitlab-org/gitlab-ce!20525
*	Merge branch 'docs/codequality' into 'master'	Marcia Ramos	2018-07-10	5	-53/+59
\| \| \| \| \|	Rename code climate to code quality See merge request gitlab-org/gitlab-ce!20506
*	Update VERSION to 11.1.0-rc6v11.1.0-rc6	GitLab Release Tools Bot	2018-07-09	1	-1/+1
\|
*	Merge branch 'jprovazn-upload-symlink' into 'master'	Kamil Trzciński	2018-07-09	4	-3/+36
\| \| \| \| \| \| \|	Add FileUploader.root to allowed upload paths Closes gitlab-qa#291 See merge request gitlab-org/gitlab-ce!20472
*	Merge branch '48978-fix-helm-installation-on-cluster' into 'master'	Kamil Trzciński	2018-07-09	3	-2/+7
\| \| \| \| \| \| \|	Resolve "Installing Helm Tiller Failing" Closes #48978 See merge request gitlab-org/gitlab-ce!20471
*	Merge branch 'docs-update-version-for-variables' into 'master'	Marcia Ramos	2018-07-09	1	-2/+2
\| \| \| \| \|	updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1 See merge request gitlab-org/gitlab-ce!20450
*	Merge branch 'docs/kubernetes-tiller' into 'master'	Marcia Ramos	2018-07-09	1	-0/+7
\| \| \| \| \|	Add note about the k8s namespace of installed applications See merge request gitlab-org/gitlab-ce!20423
*	Merge branch ↵	Fatih Acet	2018-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \|	'48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-the-same-time' into 'master' Resolve "MR refactor: parallel and diff view are being rendered at the same time" Closes #48897 See merge request gitlab-org/gitlab-ce!20440
*	Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'	Fatih Acet	2018-07-09	3	-4/+12
\| \| \| \| \| \| \|	Resolve "Adding a diff line note freezes the browser" Closes #48906 See merge request gitlab-org/gitlab-ce!20476
*	Merge branch '19468-doc_add_readme_when_creating_project' into 'master'	Douwe Maan	2018-07-09	2	-0/+3
\| \| \| \| \| \| \|	Update doc on new option to add README when creating a project Closes #19468 See merge request gitlab-org/gitlab-ce!20438
*	Merge branch ↵	Tim Zallmann	2018-07-09	1	-2/+2
\| \| \| \| \| \| \| \| \|	'49007-sast-fails-with-syntaxerror-in-scripts-frontend-prettier-js-return-outside-of-function-52-4' into 'master' Remove return statements from prettier script Closes #49007 See merge request gitlab-org/gitlab-ce!20488
*	Merge branch '48898-mr-refactor-performance-costs-of-main-element-with-v-if' ↵	Filipa Lacerda	2018-07-09	7	-33/+61
\| \| \| \| \| \| \| \| \|	into 'master' Resolve "MR refactor: Performance costs of main element with `v-if`" Closes #48898 See merge request gitlab-org/gitlab-ce!20463
*	Merge branch '11-1-update-licenses' into 'master'	James Lopez	2018-07-09	1	-45/+39
\| \| \| \| \|	[11.1.0] Update the dependencies license list See merge request gitlab-org/gitlab-ce!20487
*	Merge branch '11-1-update-templates' into 'master'	James Lopez	2018-07-09	25	-37/+86
\| \| \| \| \|	[11.1.0] Update .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!20486
*	Merge commit '96eb6fd33b5dfc4910d8bd93e697d6b6eb70b991' into ↵	Alessio Caiazza	2018-07-09	261	-2831/+5939
\|\ \| \| \| \| \| \|	11-1-stable-prepare-rc6
\| *	Merge branch 'test-basic-import' into 'master'	Stan Hu	2018-07-07	1	-0/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add basic export to fix timeout problem on import_file_spec.rb See merge request gitlab-org/gitlab-ce!20469
\| \| *	add basic export to fix timeout problem on import_file_spec.rb	James Lopez	2018-07-07	1	-0/+0
\| \|/
\| *	Merge branch 'perf-wiki-pattern-once' into 'master'	Stan Hu	2018-07-07	2	-3/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improve render performance of large wiki pages See merge request gitlab-org/gitlab-ce!20465
\| \| *	Add changelog entry for !20465	Peter Leitzen	2018-07-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| *	Improve render performance of large wiki pages	Peter Leitzen	2018-07-07	1	-3/+8
\| \|/ \| \| \| \| \| \| \| \| \| \|	Compile often used regexps only once outside of the loop. This commit improves the performance of large wiki pages with many, many references.
\| *	Merge branch ↵	Tim Zallmann	2018-07-07	3	-4/+9
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade' into 'master' Resolve "Node 6 and 7 compatibility broken by recent Monaco editor upgrade" Closes #48661 See merge request gitlab-org/gitlab-ce!20461
\| \| *	add CHANGELOG.md entry for !20461	Mike Greiling	2018-07-06	1	-0/+5
\| \| \|
\| \| *	resolve node 6 compatibility issues	Mike Greiling	2018-07-06	2	-4/+4
\| \| \|
\| * \|	Merge branch 'sh-add-missing-foreign-key-import-export-uploads' into 'master'	James Lopez	2018-07-07	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing foreign key in import_export_uploads See merge request gitlab-org/gitlab-ce!20458
\| \| * \|	Add missing foreign key in import_export_uploads	Stan Hu	2018-07-06	1	-0/+1
\| \| \|/
\| * \|	Merge branch ↵	Stan Hu	2018-07-07	4	-7/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48670-application-settings-may-not-be-invalidated-if-migrations-are-run' into 'master' Resolve "Application settings may not be invalidated if migrations are run" Closes #48670 See merge request gitlab-org/gitlab-ce!20389
\| \| * \|	Stop relying on migrations in the CacheableAttributes cache key and cache ↵	Rémy Coutable	2018-07-05	4	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attributes for 1 minute instead Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Merge branch 'bw-move-readonly-logic' into 'master'	Stan Hu	2018-07-07	3	-33/+27
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor rspec matchers in read_only_spec.rb See merge request gitlab-org/gitlab-ce!20414
\| \| * \| \|	Refactor rspec matchers in read_only_spec.rb	Brett Walker	2018-07-07	3	-33/+27
\| \|/ / /
\| * \| \|	Merge branch 'redesign-mr-widget-info-pipeline' into 'master'	Filipa Lacerda	2018-07-06	13	-235/+449
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redesign for mr widget info and pipelines section Closes #46795 See merge request gitlab-org/gitlab-ce!20189
\| \| * \|	Redesign for mr widget info and pipelines section	Clement Ho	2018-07-06	13	-235/+449
\| \|/ /
\| * \|	Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵	Sean McGivern	2018-07-06	31	-46/+509
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
\| \| * \|	fix spec	James Lopez	2018-07-06	1	-1/+0
\| \| \| \|
\| \| * \|	fix permissions	James Lopez	2018-07-06	1	-1/+2
\| \| \| \|
\| \| * \|	Update Import/Export to use object storage (based on aa feature flag)	James Lopez	2018-07-06	31	-45/+508
\| \| \| \|