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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'acet-mr-diffs-autosave' into 'master'	Tim Zallmann	2018-06-26	1	-1/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Implement MR diff notes autosave feature Closes #48300 See merge request gitlab-org/gitlab-ce!20114
\| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2018-06-26	46	-612/+1179
\| \|\ \| \| \| \| \| \| \| \| \|	acet-mr-diffs-autosave
\| * \|	Implement MR diff notes autosave feature.acet-mr-diffs-autosave	Fatih Acet	2018-06-22	1	-1/+18
\| \| \|
* \| \|	Added Diff Viewer to new VUE based MR page	Tim Zallmann	2018-06-26	4	-10/+109
\| \| \|
* \| \|	Fixed eslint failure in IDE spec helpers	Phil Hughes	2018-06-26	1	-2/+2
\| \| \|
* \| \|	Show file in tree on WebIDE open	Paul Slaughter	2018-06-26	2	-3/+59
\| \| \|
* \| \|	Merge branch 'prefer-destructuring-fix' into 'master'	Mike Greiling	2018-06-26	19	-28/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable "prefer-destructuring" in JS files See merge request gitlab-org/gitlab-ce!19943
\| * \| \|	Enable "prefer-destructuring" in JS files	gfyoung	2018-06-25	19	-28/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47006.
* \| \| \|	Merge branch 'dm-branch-api-can-push-fix' into 'master'	Robert Speicher	2018-06-26	1	-0/+29
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Fix branch API can_push attribute and add specs See merge request gitlab-org/gitlab-ce!20156
\| * \| \|	Remove duplicate spec	Douwe Maan	2018-06-26	1	-6/+0
\| \| \| \|
\| * \| \|	Fix branch API can_push attribute and add specsdm-branch-api-can-push-fix	Douwe Maan	2018-06-25	1	-0/+35
\| \| \| \|
* \| \| \|	Merge branch 'ce-gitlab-elt' into 'master'	Stan Hu	2018-06-26	1	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port gitlab-ee!5532 to CE See merge request gitlab-org/gitlab-ce!20100
\| * \| \| \|	port stub_object_storage changesce-gitlab-elt	Micaël Bergeron	2018-06-22	1	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-rename-column-background-helper' into 'master'	Yorick Peterse	2018-06-26	1	-0/+55
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a helper to rename a column using a background migration Closes #47591 See merge request gitlab-org/gitlab-ce!20180
\| * \| \| \| \|	Add a helper to rename a column using a background migration	Sean McGivern	2018-06-26	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This works the same way as change_column_type_using_background_migration, but for renaming a column. It takes a table, not a relation, to match its concurrent counterpart. Also, generalise the cleanup migrations to reduce code duplication.
* \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-06-26	2	-9/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46783-removed-omniauth-provider-causing-invalid-application-setting' into 'master' Resolve "Removed omniauth provider causing invalid application setting" Closes #46783 See merge request gitlab-org/gitlab-ce!20129
\| * \| \| \| \| \|	Ignore unknown OAuth sources in ApplicationSetting46783-removed-omniauth-provider-causing-invalid-application-setting	Rémy Coutable	2018-06-26	2	-9/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'issue_47729' into 'master'	Sean McGivern	2018-06-26	2	-0/+89
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix refresh cache for open issues count service Closes #47945 See merge request gitlab-org/gitlab-ce!19904
\| * \| \| \| \| \|	BatchOpenIssuesCount only updates public issues countissue_47729	Felipe Artur	2018-06-25	1	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix refresh cache for open issues count service	Felipe Artur	2018-06-21	2	-0/+87
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'unify-some-models' into 'master'	Douwe Maan	2018-06-26	1	-0/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Move some EE only codes in models to their EE modules See merge request gitlab-org/gitlab-ce!20160
\| * \| \| \| \| \| \|	Port Namespace#root_ancestor to CE	Lin Jen-Shin	2018-06-26	1	-0/+13
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update_project_flash_error_message' into 'master'	Rémy Coutable	2018-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set flash error message only for current request when updating project Closes #43772 See merge request gitlab-org/gitlab-ce!20126
\| * \| \| \| \| \|	Set flash error message only for current request when updating project	Aram Visser	2018-06-25	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Robert Speicher	2018-06-25	1	-4/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master' Resolve "Sorting by name on explore projects page renders a 500 error when logged in" Closes #48339 See merge request gitlab-org/gitlab-ce!20162
\| * \| \| \| \| \|	Fix sorting by name on explore projects page	Douglas Barbosa Alexandre	2018-06-25	1	-4/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Improve shelling out in bin/changelog	Jacob Vosmaer (GitLab)	2018-06-25	1	-5/+6
\|/ / / / / /
* \| \| \| \| \|	Bring changes from EE	Lin Jen-Shin	2018-06-26	1	-1/+0
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'fix-inconsistent-cancel-button' into 'master'	Clement Ho	2018-06-25	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change button text to more specific "Discard draft" Closes #47475 See merge request gitlab-org/gitlab-ce!20140
\| * \| \| \| \|	Change button text to more specific Discard draftfix-inconsistent-cancel-button	Andreas Kämmerle	2018-06-25	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'dev/master'	Alessio Caiazza	2018-06-25	5	-16/+79
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'security-html_escape_branch_name' into 'master'	Alessio Caiazza	2018-06-25	1	-1/+19
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] HTML escape branch name in project graphs page See merge request gitlab/gitlabhq!2408
\| \| * \| \| \| \| \|	HTML escape branch name in project graphs page	Imre Farkas	2018-06-19	1	-1/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into ↵	Alessio Caiazza	2018-06-25	1	-13/+32
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [master] Don't show internal info in public feed See merge request gitlab/gitlabhq!2395
\| \| * \| \| \| \| \| \|	Hide events from internal projects in public feed for anonymous users	Rubén Dávila	2018-06-12	1	-13/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change fixes a bug where an anonymous user was able to see the activity related to internal projects when visiting the public profile of a user of the GitLab instance.
\| * \| \| \| \| \| \| \|	Merge branch 'security-html_escape_usernames' into 'master'	Alessio Caiazza	2018-06-25	1	-1/+8
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] HTML escape the name of the user in ProjectsHelper#link_to_member See merge request gitlab/gitlabhq!2401
\| \| * \| \| \| \| \| \| \|	HTML escape the name of the user in ProjectsHelper#link_to_member	Imre Farkas	2018-06-15	1	-1/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'	Alessio Caiazza	2018-06-25	1	-0/+9
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2400
\| \| * \| \| \| \| \| \| \| \|	Fix xss for Markdown elements where [[_TOC_]] is enabled	Mark Chao	2018-06-16	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'security-fj-bumping-sanitize-gem' into 'master'	Alessio Caiazza	2018-06-25	1	-1/+11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into 'security-fj-bumping-sanitize-gem'	Douwe Maan	2018-06-18	38	-233/+318
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.rails5.lock
\| \| * \| \| \| \| \| \| \| \| \| \|	Whitelist text-align property for th and td	Douwe Maan	2018-06-18	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Honor saml assurance level to allow 2FA bypassing	Roger Rüttimann	2018-06-25	8	-92/+332
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-create-from-bundle-mandatory' into 'master'	Douwe Maan	2018-06-25	2	-30/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves CreateFromBundle RPC to mandatory Closes gitaly#944 See merge request gitlab-org/gitlab-ce!20144
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Moves another RPC to mandatory	Zeger-Jan van de Weg	2018-06-25	2	-30/+20
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This specific one isn't used on most machines, therefor low risk. Closes https://gitlab.com/gitlab-org/gitaly/issues/944
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-is-anchestor' into 'master'	Douwe Maan	2018-06-25	1	-278/+27
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ancestor check is Gitaly only now Closes gitaly#789 and gitaly#308 See merge request gitlab-org/gitlab-ce!20095
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update remote happens through Gitaly only	Zeger-Jan van de Weg	2018-06-25	1	-278/+27
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change makes closes another migration! And remotes tests around it, mostly due to stubbing this was needed. Also, these are tested on the Gitaly side too: - https://gitlab.com/gitlab-org/gitaly/issues/791 - https://gitlab.com/gitlab-org/gitaly/blob/6dd74543f6af8ebcf22aa10e39da004f388fdda5/internal/service/repository/fetch_remote_test.go Closes https://gitlab.com/gitlab-org/gitaly/issues/789
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-write-config' into 'master'	Douwe Maan	2018-06-25	1	-31/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Write Config is mandatory Closes gitaly#879 See merge request gitlab-org/gitlab-ce!20146
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Write Config is mandatory	Zeger-Jan van de Weg	2018-06-25	1	-31/+21
\| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/879
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'unify-delete_user_worker_spec.rb' into 'master'	Douwe Maan	2018-06-25	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer `expect_next_instance_of` over `expect_any_instance_of` See merge request gitlab-org/gitlab-ce!20141