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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'	Douwe Maan	2018-03-28	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8 Closes #44712 See merge request gitlab-org/gitlab-ce!18022
\| *	Update asciidoctor-plantuml to 0.0.8	Takuya Noguchi	2018-03-28	1	-1/+1
\| \|
\| *	Update asciidoctor to 1.5.6.2	Takuya Noguchi	2018-03-28	1	-1/+1
\| \|
* \|	Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'	Kamil Trzciński	2018-03-28	1	-2/+2
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752
\| *	Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce	Alessio Caiazza	2018-03-27	1	-2/+2
\| \|
* \|	Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'	Douwe Maan	2018-03-27	1	-0/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774
\| *	Adds JWT omnianuth integration	Tiago Botelho	2018-03-20	1	-0/+1
\| \|
* \|	Merge branch 'update-omniauth-twitter' into 'master'	Douwe Maan	2018-03-26	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update omniauth-twitter 1.2.0 -> 1.4 See merge request gitlab-org/gitlab-ce!17876
\| * \|	Update omniauth-twitter 1.2.0 -> 1.4	Pirate Praveen	2018-03-20	1	-1/+1
\| \|/
* \|	Bump `state_machines-activerecord` to `0.5.1`	blackst0ne	2018-03-26	1	-1/+1
\| \|
* \|	Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofah	Stan Hu	2018-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	See: * https://github.com/rails/rails-html-sanitizer/releases * https://github.com/flavorjones/loofah/releases
* \|	Merge branch 'master' into 'latest-security-to-master-21-03-18'	James Lopez	2018-03-22	1	-6/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \	Merge branch 'update-omniauth' into 'master'	Robert Speicher	2018-03-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'	Robert Speicher	2018-03-21	1	-5/+18
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	[Rails5] Add `Gemfile.rails5` See merge request gitlab-org/gitlab-ce!17761
\| \| * \|	[Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfile	blackst0ne	2018-03-15	1	-5/+18
\| \| \| \|
* \| \| \|	Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'	James Lopez	2018-03-21	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
* \| \|	Merge branch 'update-licensee' into 'master'	Douwe Maan	2018-03-21	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update licensee 8.7.0 -> 8.9 Closes #18077 See merge request gitlab-org/gitlab-ce!17719
\| * \| \|	Update licensee 8.7.0 -> 8.9	Pirate Praveen	2018-03-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'update-gettext_i18n_rails_js' into 'master'	Douwe Maan	2018-03-21	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Update gettext_i18n_rails_js 1.2.0 -> 1.3 See merge request gitlab-org/gitlab-ce!17801
\| * \| \|	Update gettext_i18n_rails_js 1.2.0 -> 1.3	Pirate Praveen	2018-03-16	1	-1/+1
\| \| \| \|
* \| \| \|	Show Ajax requests in performance bar	Sean McGivern	2018-03-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* \| \| \|	Merge branch 'update-google-api-client' into 'master'	Robert Speicher	2018-03-19	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Update google-api-client 0.13.6 -. 0.19.8 See merge request gitlab-org/gitlab-ce!17790
\| * \| \|	Update google-api-client	Pirate Praveen	2018-03-16	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'update-doorkeeper-openid_connect' into 'master'	Douwe Maan	2018-03-19	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doorkeeper-openid_connect and doorkeeper See merge request gitlab-org/gitlab-ce!17797
\| * \| \| \|	Update doorkeeper-openid_connect and doorkeeper	Pirate Praveen	2018-03-16	1	-2/+2
\| \|/ / /
* \| \| \|	Merge branch 'remove-oj' into 'master'	Robert Speicher	2018-03-19	1	-3/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove oj as we're not using it See merge request gitlab-org/gitlab-ce!17863
\| * \| \| \|	Remove oj as we're not using it	Lin Jen-Shin	2018-03-19	1	-3/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update-omniauth-saml' into 'master'	Douwe Maan	2018-03-19	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relax omniauth-saml 1.0.0 -> 1.10 Closes #14292 See merge request gitlab-org/gitlab-ce!17764
\| * \| \| \|	Relax omniauth-saml	Pirate Praveen	2018-03-15	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'update-kubeclient'	Grzegorz Bizon	2018-03-17	1	-13/+12
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \|	Conflicts: Gemfile.lock
\| * \| \| \|	Merge branch 'update-flipper' into 'master'	Grzegorz Bizon	2018-03-16	1	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update flipper 0.11.0 -> 0.13.0 See merge request gitlab-org/gitlab-ce!17722
\| \| * \| \| \|	Update flipper 0.11.0 -> 0.13.0	Pirate Praveen	2018-03-13	1	-3/+3
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch '44235-update-knapsack-to-1.16.0' into 'master'	Grzegorz Bizon	2018-03-16	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update knapsack to 1.16.0 Closes #44235 See merge request gitlab-org/gitlab-ce!17735
\| \| * \| \|	Update knapsack to 1.16.0	Takuya Noguchi	2018-03-14	1	-1/+1
\| \| \|/ /
\| * \| \|	Revert "Merge branch 'update-httparty' into 'master'"	Stan Hu	2018-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !17737
\| * \| \|	Remove jquery-rails from Gemfile	Balasankar "Balu" C	2018-03-15	1	-1/+0
\| \| \|/ \| \|/\|
\| * \|	Merge branch 'update-net-ssh' into 'master'	Douwe Maan	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734) Closes #21734 See merge request gitlab-org/gitlab-ce!17688
\| \| * \|	Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)	Pirate Praveen	2018-03-14	1	-1/+1
\| \| \|/
\| * \|	Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'	Robert Speicher	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0 (CVE-2017-11428, CVE-2017-11430) Closes #43806 See merge request gitlab-org/gitlab-ce!17734
\| \| * \|	Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0	Takuya Noguchi	2018-03-14	1	-1/+1
\| \| \|/
\| * \|	Merge branch 'update-fog-aws' into 'master'	Robert Speicher	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update fog-aws 1.4 -> 2.0 See merge request gitlab-org/gitlab-ce!17708
\| \| * \|	update fog-aws 1.4 -> 2.0	Pirate Praveen	2018-03-13	1	-1/+1
\| \| \|/
\| * \|	Merge branch 'update-acts-as-taggable-on' into 'master'	Robert Speicher	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update acts-as-taggable-on to 5.0 See merge request gitlab-org/gitlab-ce!17689
\| \| * \|	Update acts-as-taggable-on to 5.0	Pirate Praveen	2018-03-12	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	- only older ruby and activerecord support dropped
\| * \|	Merge branch 'update-sentry-raven' into 'master'	Douwe Maan	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029) Closes #24029 See merge request gitlab-org/gitlab-ce!17709
\| \| * \|	Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029)	Pirate Praveen	2018-03-13	1	-1/+1
\| \| \|/
\| * \|	Merge branch 'update-octokit' into 'master'	Douwe Maan	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update octokit 4.6.2 -> 4.8 See merge request gitlab-org/gitlab-ce!17738
\| \| * \|	Update octokit 4.6.2 -> 4.8	Pirate Praveen	2018-03-14	1	-1/+1
\| \| \|/
\| * \|	Merge branch 'update-ruby-prof' into 'master'	Robert Speicher	2018-03-14	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ruby-prof 0.16.2 -> 0.17.0 See merge request gitlab-org/gitlab-ce!17710