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

	Commit message (Collapse)	Author	Age	Files	Lines
*	don't show "Someone edited the issue" warning when saving issue33904-edit-issue-warning	Simon Knox	2017-06-22	2	-10/+6
\| \| \| \|	don't need to check for form visible because error message isn't rendered otherwise
*	Merge branch 'zj-environment-creation-regex-fix' into 'master'	Grzegorz Bizon	2017-06-21	3	-2/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Replace invalid chars while seeding environments Closes #30855 See merge request !12267
\| *	Replace invalid chars while seeding environments	Zeger-Jan van de Weg	2017-06-21	3	-2/+14
\|/
*	Merge branch '33878-fix-edit-deploy-key' into 'master'	Rémy Coutable	2017-06-21	5	-3/+34
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix edit button for deploy keys available from other projects Closes #33878 See merge request !12301
\| *	Fix edit button for deploy keys available from other projects	Alexander Randa	2017-06-20	5	-3/+34
\| \|
* \|	Merge branch 'docs/fix-broken-links' into 'master'	Rémy Coutable	2017-06-21	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken relative URL in prometheus docs Closes #34050 See merge request !12340
\| * \|	Fix broken relative URL in prometheus docs	Achilleas Pipinellis	2017-06-21	1	-1/+1
\|/ /
* \|	Update CHANGELOG.md for 9.2.7	Timothy Andrew	2017-06-21	2	-4/+4
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch '34017-common-vue' into 'master'	Tim Zallmann	2017-06-21	2	-3/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove vue from main.bundle.js Closes #34017 See merge request !12327
\| * \|	Remove vue from main.bundle.js file being loaded through ↵34017-common-vue	Filipa Lacerda	2017-06-21	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \|	`app/assets/javascripts/merge_request_tabs.js`
* \| \|	Merge branch 'dt/printing-to-api' into 'master'	Rémy Coutable	2017-06-21	4	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add printing_merge_request_link_enabled to API See merge request !12240
\| * \| \|	add printing_merge_request_link_enabled to API	David Turner	2017-06-19	4	-0/+10
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-auth-token' into 'master'	Sean McGivern	2017-06-21	12	-43/+77
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass Gitaly token on Ruby gRPC requests See merge request !12228
\| * \| \| \|	Enable gitaly token auth when testing	Jacob Vosmaer	2017-06-20	3	-2/+5
\| \| \| \| \|
\| * \| \| \|	Rubocop and comment fixes	Jacob Vosmaer	2017-06-20	3	-5/+7
\| \| \| \| \|
\| * \| \| \|	Send gitaly token to workhorse when needed	Jacob Vosmaer	2017-06-20	2	-4/+13
\| \| \| \| \|
\| * \| \| \|	Pass Gitaly token on Ruby gRPC requests	Jacob Vosmaer	2017-06-19	8	-37/+57
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-git-commit-attribute' into 'master'	Sean McGivern	2017-06-21	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused attr_accessor from Gitlab::Git::Commit See merge request !12311
\| * \| \| \| \|	Remove unused attr_accessor from Gitlab::Git::Commit	Jacob Vosmaer	2017-06-20	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-06-21	2	-1/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33502-make-gitlab-project-issue-description-templates-less-specific-with-the-project-they-reference' into 'master' Mention both CE and EE issue trackers in description templates Closes #33502 See merge request !12326
\| * \| \| \| \|	Mention both CE and EE issue trackers in description templates	Mark Fletcher	2017-06-21	2	-1/+14
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \|	Merge branch 'sh-current-settings-autoload-fix' into 'master'	Rémy Coutable	2017-06-21	1	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change references from ApplicationSetting to ::ApplicationSetting to make autoload happier Closes #34047 See merge request !12331
\| * \| \| \| \|	Change references from ApplicationSetting to ::ApplicationSetting to make ↵sh-current-settings-autoload-fix	Stan Hu	2017-06-20	1	-5/+5
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	autoload happier Closes #34047
* \| \| \| \|	Merge branch ↵	Phil Hughes	2017-06-21	0	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33942-cross-reference-icon-no-longer-visible-in-normal-sidebar' into 'master' Resolve "Cross-reference icon no longer visible in normal sidebar" Closes #33942 See merge request !12299
\| * \| \| \| \|	Fixes scrolling + improves Performance through assigning found $ elements to ↵33942-cross-reference-icon-no-longer-visible-in-normal-sidebar	Tim Zallmann	2017-06-20	2	-7/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables
* \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-06-21	2	-4/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33693-protected-branch-dropdowns-cut-off-in-repository-settings-page' into 'master' Resolve "Protected branch dropdowns cut-off in Repository Settings page" Closes #33693 See merge request !12247
\| * \| \| \| \| \|	Resolve "Protected branch dropdowns cut-off in Repository Settings page"	Luke "Jared" Bennett	2017-06-21	2	-4/+25
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Tim Zallmann	2017-06-21	97	-832/+1296
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'bulk-edit-scroll-fix' into 'master'	Phil Hughes	2017-06-21	4	-5/+29
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bulk edit scroll fix Closes #33870 See merge request !12219
\| \| * \| \| \| \|	Bulk edit scroll fix	Bryce Johnson	2017-06-21	4	-5/+29
\| \|/ / / / /
\| * \| \| \| \|	Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-bar	Jacob Schatz	2017-06-20	3	-33/+78
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note Closes #33868 See merge request !12297
\| \| * \| \| \| \|	Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editing	Eric Eastwood	2017-06-20	3	-33/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868 While in a MR "Changes" tab looking at some diff note discussions. Clicking reply and pressing the up-arrow should edit your last comment in that discussion. I suspect this regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178 where we changed the selector
\| * \| \| \| \| \|	Merge branch '30213-project-transfer-move-rollback' into 'master'	Douwe Maan	2017-06-20	3	-40/+139
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rollback project folder move after error in Projects::TransferService Closes #30213 See merge request !11877
\| \| * \| \| \| \| \|	Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollback	James Edwards-Jones	2017-06-20	3	-40/+139
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '33344-add-rails-i18n' into 'master'	Douwe Maan	2017-06-20	2	-0/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rails-i18n for some common translations Closes #33344 See merge request !12094
\| \| * \| \| \| \| \| \|	Add rails-i18n for some common translations33344-add-rails-i18n	Lin Jen-Shin	2017-06-20	2	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'delete-fix-missing-function-changelog' into 'master'	Stan Hu	2017-06-20	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deleted "fix-missing-function-dropzone-input.yml" from the changelog See merge request !12316
\| \| * \| \| \| \| \| \| \|	Deleted "fix-missing-function-dropzone-input.yml" from the changelog	Jose Ivan Vargas	2017-06-20	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'bugfix/html-email-brackets' into 'master'	Douwe Maan	2017-06-20	4	-0/+41
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unwrap links without an href Closes #27645 See merge request !9045
\| \| * \| \| \| \| \| \| \| \|	add a changelog for the email parsing bugbugfix/html-email-brackets	http://jneen.net/	2017-06-19	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	unwrap all links with no href	http://jneen.net/	2017-06-19	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	add a spec for no-href link parsing	http://jneen.net/	2017-06-19	2	-0/+30
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '28517-discover-by-userid' into 'master'	Douwe Maan	2017-06-20	1	-3/+8
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow discover by userid - issue 28517 Closes #28517 See merge request !12314
\| \| * \| \| \| \| \| \| \| \|	Allow discover by userid - issue 28517	Matt Walsh	2017-06-20	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-email-avatars' into 'master'	Douwe Maan	2017-06-20	4	-39/+68
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix avatar images in pipeline emails Closes gitlab-ee#2696 See merge request !12310
\| \| * \| \| \| \| \| \| \| \| \|	Fix avatar images in pipeline emailsfix-email-avatars	Sean McGivern	2017-06-20	4	-39/+68
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch '33922-add-ruby-metrics-documentation' into 'master'	Achilleas Pipinellis	2017-06-20	3	-2/+57
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for GitLab ruby monitoring See merge request !12295
\| \| * \| \| \| \| \| \| \| \| \|	Add Prometheus metrics documentation33922-add-ruby-metrics-documentation	Joshua Lambert	2017-06-19	3	-2/+57
\| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'	Douwe Maan	2017-06-20	4	-31/+67
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096
\| \| * \| \| \| \| \| \| \| \| \|	Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionally	Luke "Jared" Bennett	2017-06-20	2	-40/+8
\| \| \| \| \| \| \| \| \| \| \| \|