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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalbox	Phil Hughes	2018-03-22	217	-1250/+2795
\|\ \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/performance_bar/components/detailed_metric.vue
\| *	Merge branch 'move-email-footer-info-to-single-line' into 'master'	Filipa Lacerda	2018-03-22	2	-7/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Move email footer info to a single line See merge request gitlab-org/gitlab-ce!17916
\| \| *	Move email footer info to a single linemove-email-footer-info-to-single-line	Eric Eastwood	2018-03-21	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031#note_64372406
\| * \|	Merge branch 'performance-bar-position-fix' into 'master'	Filipa Lacerda	2018-03-22	8	-59/+61
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance bar spacing See merge request gitlab-org/gitlab-ce!17912
\| \| * \|	fixed karmaperformance-bar-position-fix	Phil Hughes	2018-03-21	1	-10/+2
\| \| \| \|
\| \| * \|	removed check for host	Phil Hughes	2018-03-21	4	-35/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed wrapper to container with correct widths
\| \| * \|	Fix performance bar spacing	Phil Hughes	2018-03-21	5	-16/+34
\| \| \| \|
\| * \| \|	Merge branch 'sh-fix-readonly-reload' into 'master'	Sean McGivern	2018-03-22	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module See merge request gitlab-org/gitlab-ce!17925
\| \| * \| \|	Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ↵	Stan Hu	2018-03-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tree but is still active" Similar to #34047 and #29327
\| * \| \| \|	Merge branch 'jej/omniauth-initializer-refactor' into 'master'	Douwe Maan	2018-03-22	3	-45/+141
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OmniauthInitializer created to allow testing/refactoring of code from devise.rb See merge request gitlab-org/gitlab-ce!17881
\| \| * \| \| \|	OmniauthInitializer refactoringjej/omniauth-initializer-refactor	James Edwards-Jones	2018-03-22	1	-33/+31
\| \| \| \| \| \|
\| \| * \| \| \|	Omniauth callbacks moved to methods	James Edwards-Jones	2018-03-20	1	-26/+38
\| \| \| \| \| \|
\| \| * \| \| \|	OmniauthInitializer created to improve devise.rb	James Edwards-Jones	2018-03-20	3	-45/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should simplify refactoring and allow testing
\| * \| \| \| \|	Update VERSION to 10.7.0-prev10.7.0.pre	James Lopez	2018-03-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Update CHANGELOG.md for 10.6.0	James Lopez	2018-03-22	151	-749/+184
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Merge branch 'add-query-counts-to-profiler-output' into 'master'	Stan Hu	2018-03-22	3	-6/+35
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query counts by model to profiler output See merge request gitlab-org/gitlab-ce!17910
\| \| * \| \| \|	Add query counts by model to profiler outputadd-query-counts-to-profiler-output	Sean McGivern	2018-03-21	3	-6/+35
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'dev/master'	Robert Speicher	2018-03-21	1	-0/+25
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Update CHANGELOG.md for 10.5.6	Mark Fletcher	2018-03-16	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	Update CHANGELOG.md for 10.4.6	Mark Fletcher	2018-03-16	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	Update CHANGELOG.md for 10.3.9	Mark Fletcher	2018-03-16	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Merge branch 'disable-btn-mr-when-posting-comment' into 'master'	Fatih Acet	2018-03-21	2	-2/+17
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables the button when submitting comment. Closes #39661 See merge request gitlab-org/gitlab-ce!17918
\| \| * \| \| \| \| \|	Adds tests	Jacob Schatz	2018-03-21	1	-0/+14
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Disables the button when submitting comment.	Jacob Schatz	2018-03-21	1	-2/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'docs/ci-caching' into 'master'	Marcia Ramos	2018-03-21	4	-86/+569
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on CI caching Closes #32515, #18945, and gitlab-runner#1621 See merge request gitlab-org/gitlab-ce!12183
\| \| * \| \| \| \| \| \|	Gather info on CI/CD caching	Achilleas Pipinellis	2018-03-21	4	-86/+569
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- New cache page - Move manual cache clearing to the new page - Add all directives of cache in the yaml reference
\| * \| \| \| \| \| \| \|	Merge branch 'refactor/move-time-tracking-vue-components' into 'master'	Filipa Lacerda	2018-03-21	4	-98/+109
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move TimeTrackingCollapsedState vue component See merge request gitlab-org/gitlab-ce!17399
\| \| * \| \| \| \| \| \| \|	Move TimeTrackingCollapsedState vue component	George Tsiolis	2018-03-21	4	-98/+109
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'	Sean McGivern	2018-03-21	2	-9/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify location of Procfile for mail_room See merge request gitlab-org/gitlab-ce!17896
\| \| * \| \| \| \| \| \| \| \|	Launch mail_room manually and remove foreman reference	Eric Eastwood	2018-03-21	2	-9/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'update-omniauth' into 'master'	Robert Speicher	2018-03-21	2	-4/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update omniauth 1.4.2 -> 1.8 See merge request gitlab-org/gitlab-ce!17763
\| \| * \| \| \| \| \| \| \| \|	Update omniauth 1.4.2 -> 1.8	Pirate Praveen	2018-03-21	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'ee-5063-to-ce-backport' into 'master'	Douwe Maan	2018-03-21	3	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE See merge request gitlab-org/gitlab-ce!17909
\| \| * \| \| \| \| \| \| \| \| \|	Backports changes made in ↵ee-5063-to-ce-backport	Tiago Botelho	2018-03-21	3	-5/+5
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'	Robert Speicher	2018-03-21	3	-5/+1255
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Add `Gemfile.rails5` See merge request gitlab-org/gitlab-ce!17761
\| \| * \| \| \| \| \| \| \| \|	[Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfile	blackst0ne	2018-03-15	3	-5/+1255
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '43786-on-the-issuable-list-add-tooltips-to-icons' into 'master'	Clement Ho	2018-03-21	5	-11/+25
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuable list: add tooltips to icons Closes #43786 See merge request gitlab-org/gitlab-ce!17700
\| \| * \| \| \| \| \| \| \| \| \|	Issuable list: add tooltips to icons	Lukas Eipert	2018-03-21	5	-11/+25
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'ide-folder-button-path' into 'master'	Tim Zallmann	2018-03-21	7	-46/+95
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the web IDE link in tree list opening the wrong URL Closes #44477 See merge request gitlab-org/gitlab-ce!17900
\| \| * \| \| \| \| \| \| \| \| \|	Fixes the web IDE link in tree list opening the wrong URL	Phil Hughes	2018-03-21	7	-46/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44477
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'	Robert Speicher	2018-03-21	1	-37/+35
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Update ar5_batching initializer See merge request gitlab-org/gitlab-ce!17825
\| \| * \| \| \| \| \| \| \| \| \| \|	[Rails5] Update ar5_batching initializerblackst0ne-rails5-update-ar5-batching-initializer	blackst0ne	2018-03-21	1	-37/+35
\| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into ↵	Robert Speicher	2018-03-21	1	-3/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [Rails5] Update ar5_pg_10_support initializer See merge request gitlab-org/gitlab-ce!17826
\| \| * \| \| \| \| \| \| \| \| \| \|	[Rails5] Update ar5_pg_10_support initializerblackst0ne-rails5-update-ar5-pg-10-support-initializer	blackst0ne	2018-03-21	1	-3/+2
\| \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-parser-warnings-workaround' into 'master'	Robert Speicher	2018-03-21	1	-9/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove parser warnings workaround See merge request gitlab-org/gitlab-ce!17901
\| \| * \| \| \| \| \| \| \| \| \|	It's now updated so we could remove it	Lin Jen-Shin	2018-03-21	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17673
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-upload-archive' into 'master'	Sean McGivern	2018-03-21	3	-2/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send Gitaly payload for git-upload-archive SSH commands Closes gitaly#1092 See merge request gitlab-org/gitlab-ce!17903
\| \| * \| \| \| \| \| \| \| \| \| \|	Send Gitaly payload for git-upload-archive SSH commands	Alejandro Rodríguez	2018-03-21	3	-2/+8
\| \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'	Yorick Peterse	2018-03-21	3	-1/+48
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add indexes for user activity queries. Closes #44446 See merge request gitlab-org/gitlab-ce!17890
\| \| * \| \| \| \| \| \| \| \| \| \|	Guard creation/removal with existence checks.	Andreas Brandl	2018-03-21	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|