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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bvl-fix-openid-redirect' into 'master'	Douwe Maan	2018-05-02	2	-1/+1
\| \| \| \| \| \| \|	Skip `authenticate_user!` for Doorkeeper controllers Closes #44639 See merge request gitlab-org/gitlab-ce!18599
*	Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'	Douwe Maan	2018-05-02	1	-0/+1
\| \| \| \| \|	Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
*	[Rails5] Update `type_cast_*_database` methods	blackst0ne	2018-04-06	1	-14/+17
\|
*	Merge branch 'direct-upload-of-artifacts' into 'master'	Grzegorz Bizon	2018-04-05	2	-0/+8
\|\ \| \| \| \| \| \| \| \|	Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160
\| *	Add `direct_upload` setting for artifactsdirect-upload-of-artifacts	Kamil Trzciński	2018-04-05	2	-0/+8
\| \|
* \|	Merge branch 'direct-upload-of-uploads' into 'master'	Grzegorz Bizon	2018-04-05	1	-0/+1
\|\ \ \| \|/ \| \| \| \| \| \|	Allow to store uploads by default on Object Storage See merge request gitlab-org/gitlab-ce!18156
\| *	Allow to store uploads by default on Object Storagedirect-upload-of-uploads	Kamil Trzciński	2018-04-04	1	-0/+1
\| \| \| \| \| \| \| \|	Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
* \|	Add support for Sidekiq JSON logging	Stan Hu	2018-04-04	2	-1/+14
\|/ \| \| \|	Closes #20060
*	Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce	Alessio Caiazza	2018-03-27	2	-12/+1
\|
*	Merge branch '40781-os-to-ce' into 'master'	Sean McGivern	2018-03-27	2	-0/+41
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358
\| *	Merge remote-tracking branch 'origin/master' into 40781-os-to-ce	Micaël Bergeron	2018-03-22	8	-146/+127
\| \|\
\| * \|	apply feedback	Micaël Bergeron	2018-03-22	1	-7/+0
\| \| \|
\| * \|	Add proxy_download to perform proxied sending of all files	Micaël Bergeron	2018-03-09	1	-0/+3
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into 40781-os-to-ce	Micaël Bergeron	2018-03-08	6	-12/+33
\| \|\ \
\| * \| \|	port the object storage to CE	Micaël Bergeron	2018-03-01	1	-0/+6
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport	Kamil Trzciński	2018-02-28	6	-3/+38
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \| \| \|	Merge branch '4915-background-upload-option-is-not-effective' into 'master'	Kamil Trzciński	2018-02-28	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Background upload option is not effective" Closes #4915 See merge request gitlab-org/gitlab-ee!4507
\| * \| \| \|	Merge branch '4879-support-private-https-urls-for-object-storage' into 'master'	Sean McGivern	2018-02-28	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""Support private HTTPS urls for object storage"" Closes #4879 See merge request gitlab-org/gitlab-ee!4475
\| * \| \| \|	Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵	Kamil Trzciński	2018-02-28	4	-1/+93
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \	Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport	Kamil Trzciński	2018-02-28	11	-39/+121
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Revert "Merge branch '3867-port-to-ce' into 'master'"	Kamil Trzciński	2018-02-28	1	-11/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
\| * \| \| \| \| \|	Merge branch '4163-move-uploads-to-object-storage' into 'master'	Sean McGivern	2018-02-28	1	-9/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
\| * \| \| \| \| \|	Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵	Kamil Trzciński	2018-02-28	10	-29/+72
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \	Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵	Kamil Trzciński	2018-02-28	14	-35/+121
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \	Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵	Kamil Trzciński	2018-02-28	4	-25/+27
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \ \	Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵	Kamil Trzciński	2018-02-28	11	-23/+54
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'jej/lfs-object-storage' into 'master'	Douwe Maan	2018-02-28	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Can migrate LFS objects to S3 style object storage Closes #2841 See merge request !2760
\| * \| \| \| \| \| \| \| \| \|	Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into ↵	Kamil Trzciński	2018-02-28	16	-45/+114
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \ \ \ \ \ \ \ \ \ \	Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into ↵	Kamil Trzciński	2018-02-28	16	-44/+204
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object-storage-ee-to-ce-backport
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-object-store-artifacts' into 'master'	Grzegorz Bizon	2018-02-28	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Object store for artifacts Closes gitlab-ce#29203 See merge request !1762
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries	Robert Speicher	2018-03-23	2	-0/+41
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Update files by `rails app:update` See merge request gitlab-org/gitlab-ce!17828
\| * \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-update	blackst0ne	2018-03-22	2	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mark-legacy-git-access' into 'master'	Sean McGivern	2018-03-23	2	-10/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Route path lookups through legacy_disk_pathmark-legacy-git-access	Jacob Vosmaer	2018-03-21	2	-10/+5
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jej/omniauth-initializer-refactor' into 'master'	Douwe Maan	2018-03-22	1	-45/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	OmniauthInitializer created to allow testing/refactoring of code from devise.rb See merge request gitlab-org/gitlab-ce!17881
\| * \| \| \| \| \| \| \| \| \| \| \| \|	OmniauthInitializer created to improve devise.rb	James Edwards-Jones	2018-03-20	1	-45/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should simplify refactoring and allow testing
* \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip any query string parameters from Location headers from lograge	Stan Hu	2018-03-20	1	-0/+18
\| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of https://github.com/roidrage/lograge/pull/241
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-update-active-record-locking-initializer' ↵	Robert Speicher	2018-03-19	1	-52/+56
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Update active_record_locking initializer See merge request gitlab-org/gitlab-ce!17824
\| * \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Update active_record_locking initializerblackst0ne-rails5-update-active-record-locking-initializer	blackst0ne	2018-03-18	1	-52/+56
\| \|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Address review comments.	Andreas Brandl	2018-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Add bigserial as a native database type for MySQL adapter	Douglas Barbosa Alexandre	2018-03-16	1	-0/+11
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Make Gitaly more prominent in the performance bar	Sean McGivern	2018-03-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is as important as SQL timings, and much more important most of the time than GC, Redis, or Sidekiq.
* \| \| \| \| \| \| \| \| \| \| \|	Include the ee/ directory in backtracesallow-ee-in-backtraces	Sean McGivern	2018-03-12	1	-7/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_redcarpet_with_cmark' into 'master'	Sean McGivern	2018-03-07	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835
\| * \| \| \| \| \| \| \| \| \| \|	Add CommonMark markdown enginereplace_redcarpet_with_cmark	blackst0ne	2018-03-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CEbackport-ee-5049-to-ce	Tiago Botelho	2018-03-05	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \|