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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add tests for slash commands placeholder removal34470-fix-award-slash-command-placeholder	kushalpandya	2017-06-30	1	-0/+45
\|
*	Ensure any type of command leads to placeholder removal	kushalpandya	2017-06-30	1	-1/+2
\|
*	Remove placeholder note when award emoji slash command is applied	kushalpandya	2017-06-29	1	-0/+3
\|
*	Update CHANGELOG.md for 9.3.2	Clement Ho	2017-06-27	3	-9/+5
\| \| \|	[ci skip]
*	Update architecture.md	Sid Sijbrandij	2017-06-28	1	-0/+4
\|
*	Merge branch 'ignore-generated-i18n-json-files' into 'master'	Douwe Maan	2017-06-27	11	-9/+4
\|\ \| \| \| \| \| \| \| \|	Ignore JSON files generated from PO files See merge request !12329
\| *	updated gitlab-ci.yml to compile localeignore-generated-i18n-json-files	Phil Hughes	2017-06-27	1	-0/+3
\| \|
\| *	Ignore JSON files generated from PO files	Ruben Davila	2017-06-27	10	-9/+1
\| \|
* \|	Merge branch 'fix-head-pipeline-for-commit-status' into 'master'	Grzegorz Bizon	2017-06-27	3	-6/+28
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478
\| * \|	Fix changelog entry file extension	Grzegorz Bizon	2017-06-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-status	Kamil Trzcinski	2017-06-27	3	-6/+28
\| \| \|
* \| \|	Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master'	Douwe Maan	2017-06-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update mmap2 gem to fix missing symbol error that happens on some installations from source Closes #34221 See merge request !12492
\| * \| \|	Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses ↵34221-fix-missing-method-in-mmap2-gem	Pawel Chojnacki	2017-06-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	method that is no longer part of Ruby API
* \| \| \|	Merge branch 'backport-system-check-fix' into 'master'	Douwe Maan	2017-06-27	2	-0/+26
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Make the SimpleExecutor rescue exceptions in the executing Checks See merge request !12487
\| * \| \|	Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fix	Gabriel Mazetto	2017-06-27	1	-2/+11
\| \| \| \|
\| * \| \|	Make the SimpleExecutor rescue exceptions in the executing Checks	Gabriel Mazetto	2017-06-27	2	-2/+19
\| \| \| \|
* \| \| \|	Merge branch 'bugfix/ruby2.4-compat' into 'master'	Douwe Maan	2017-06-27	7	-27/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471
\| * \| \| \|	rubocop fix: don't use single line blocksbugfix/ruby2.4-compat	http://jneen.net/	2017-06-26	1	-2/+6
\| \| \| \| \|
\| * \| \| \|	rm use of deprecated webmock api in teamcity_service_spec	http://jneen.net/	2017-06-26	1	-2/+4
\| \| \| \| \|
\| * \| \| \|	rm use of deprecated webmock api in campfire_service_spec	http://jneen.net/	2017-06-26	1	-5/+6
\| \| \| \| \|
\| * \| \| \|	rm use of deprecated webmock api in jira model spec	http://jneen.net/	2017-06-26	1	-11/+11
\| \| \| \| \|
\| * \| \| \|	rm use of deprecated webmock api in bamboo_service_spec	http://jneen.net/	2017-06-26	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	remove use of deprecated webmock feature in jira specs	http://jneen.net/	2017-06-26	1	-7/+7
\| \| \| \| \|
\| * \| \| \|	ruby 2.4 compat: update to webmock 2.3.2	http://jneen.net/	2017-06-26	2	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'cherry-pick-ecd49e82' into 'master'	Clement Ho	2017-06-27	31	-34/+234
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates for 9.3 See merge request !12461
\| * \| \| \| \|	Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82	Clement Ho	2017-06-26	31	-34/+234
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates for 9.3 See merge request !12041
* \| \| \| \| \|	Merge branch 'cherry-pick-91c122d5' into 'master'	Clement Ho	2017-06-27	1	-49/+59
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependencies list for 9.3 See merge request !12462
\| * \| \| \| \| \|	Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5	Clement Ho	2017-06-26	1	-49/+59
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependencies list for 9.3 See merge request !12042
* \| \| \| \| \|	Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵	Robert Speicher	2017-06-27	3	-7/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443
\| * \| \| \| \| \|	Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nil	Ruben Davila	2017-06-26	3	-7/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bpj-pipeline-schedules-form-bundle-refactor' into 'master'	Phil Hughes	2017-06-27	4	-156/+176
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slightly refactor pipeline schedules form in preparation for additions See merge request !12134
\| * \| \| \| \| \| \|	Slightly refactor pipeline schedules form in preparation for additions	Bryce Johnson	2017-06-27	4	-156/+176
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'dz-refactor-group-members-tests' into 'master'	Douwe Maan	2017-06-27	10	-139/+146
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor group members tests See merge request !12465
\| * \| \| \| \| \| \|	Move another group member spec from spinachdz-refactor-group-members-tests	Dmitriy Zaporozhets	2017-06-26	2	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix leave_group_spec.rb	Dmitriy Zaporozhets	2017-06-26	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Move "remove group member" spec from spinach to rspec	Dmitriy Zaporozhets	2017-06-26	3	-75/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Rename group member specs for consistent naming	Dmitriy Zaporozhets	2017-06-26	5	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix wrong scenario title to owner_manages_access_requests_spec.rb	Dmitriy Zaporozhets	2017-06-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Merge group request access specs under one file	Dmitriy Zaporozhets	2017-06-26	2	-17/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Remove group members spinach tests that we already covered with rspec	Dmitriy Zaporozhets	2017-06-26	1	-40/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Combine group leave feature specs in one file	Dmitriy Zaporozhets	2017-06-26	3	-37/+62
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'dm-commit-row-browse-button' into 'master'	Robert Speicher	2017-06-27	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393
\| * \| \| \| \| \| \|	Update changelog itemdm-commit-row-browse-button	Douwe Maan	2017-06-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Adjust commit partial cache key to fix browse buttons	Douwe Maan	2017-06-22	2	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2017-06-27	2	-5/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34014-submitting-reply-to-existing-diff-discussion-using-cmd-ctrl-enter-submits-twice-and-refreshes-page' into 'master' Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" Closes #34014 See merge request !12352
\| * \| \| \| \| \| \| \|	Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵	Luke "Jared" Bennett	2017-06-27	2	-5/+18
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	submits twice and refreshes page"
* \| \| \| \| \| \| \|	Merge branch 'gitlab-git-find-commits' into 'master'	Sean McGivern	2017-06-27	5	-130/+98
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up Gitlab::Git::Commit.find_all See merge request !12476
\| * \| \| \| \| \| \| \|	Remove 'contains' option from Commit.find_all	Jacob Vosmaer	2017-06-27	2	-26/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove Gitlab::Git::Repository#find_all	Jacob Vosmaer	2017-06-27	5	-110/+103
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2017-06-27	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34115-unable-to-access-edit-comment-from-dropdown-menu-in-certain-screen-sizes' into 'master' Resolve "Unable to access edit comment from dropdown menu in certain screen sizes" Closes #34115 See merge request !12421