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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'update-omniauth-twitter' into 'master'	Douwe Maan	2018-03-26	2	-5/+5
\|\ \| \| \| \| \| \| \| \|	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	2	-5/+5
\| \|
* \|	Merge branch '43552-user-owned-projects-query-performance-improvement' into ↵	Douwe Maan	2018-03-26	2	-3/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Slow SQL running in production queryid 3257994922" Closes #43552 See merge request gitlab-org/gitlab-ce!17934
\| * \|	Improves User#owned_projects query performance	Tiago Botelho	2018-03-26	2	-3/+15
\| \| \|
* \| \|	Merge branch ↵	Grzegorz Bizon	2018-03-26	15	-10/+154
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request' into 'master' Send notification emails when push to a merge request Closes #23460 See merge request gitlab-org/gitlab-ce!17865
\| * \| \|	Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request	YarNayar	2018-03-26	15	-10/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23460
* \| \| \|	Merge branch 'blackst0ne-rails5-update-state_machines-activerecord-gem' into ↵	Douwe Maan	2018-03-26	4	-77/+71
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Bump `state_machines-activerecord` to `0.5.1` See merge request gitlab-org/gitlab-ce!17924
\| * \| \| \|	Bump `state_machines-activerecord` to `0.5.1`	blackst0ne	2018-03-26	4	-77/+71
\|/ / / /
* \| \| \|	Merge branch 'jej/fix-grape-protected-branch-fallback-removal' into 'master'	Marin Jankovski	2018-03-26	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] ProtectedBranch API omits empty declared params See merge request gitlab-org/gitlab-ce!17993
\| * \| \| \|	ProtectedBranch API omits empty declared params	James Edwards-Jones	2018-03-26	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-organize-by-category' into 'master'	🚄 Job van der Voort 🚀	2018-03-26	2	-51/+115
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs organize main page by product category See merge request gitlab-org/gitlab-ce!17429
\| * \| \| \| \|	Docs organize main page by product category	Marcia Ramos	2018-03-26	2	-51/+115
\|/ / / / /
* \| \| \| \|	Merge branch 'bug/44103-ie11-compatibility' into 'master'	Fatih Acet	2018-03-26	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Array.fill polyfill for IE 11 compatibility. Closes #44103 See merge request gitlab-org/gitlab-ce!17897
\| * \| \| \|	Add Array.fill for IE 11 compatibility.	Pei-Tang Huang	2018-03-22	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ide-diff-cursor' into 'master'	Tim Zallmann	2018-03-26	3	-0/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable cursor for review mode in the IDE Closes #44307 See merge request gitlab-org/gitlab-ce!17955
\| * \| \| \| \|	Disable cursor for review mode in the IDEide-diff-cursor	Phil Hughes	2018-03-23	3	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also disables occurrences highlights & the line highlight for the review mode. Closes #44307
* \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-03-26	13	-22/+35
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master' Resolve "Controller parameters handling sensitive information should use a more specific name" Closes #43316 See merge request gitlab-org/gitlab-ce!17796
\| * \| \| \| \| \|	Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name	Matija Čupić	2018-03-22	12	-24/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert "Filter secret CI variable values from logs"	Matija Čupić	2018-03-19	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ddeefbdd24119fff5bb3c770f9a285f28ca31914.
\| * \| \| \| \| \|	Check for secret_key and secret_value in CI Variable native list js spec	Matija Čupić	2018-03-17	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use secret_key and secret_value in Pipeline Schedule variables	Matija Čupić	2018-03-17	4	-13/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add CHANGELOG	Matija Čupić	2018-03-17	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Filter secret CI variable values from logs	Matija Čupić	2018-03-17	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use secret_key and secret_value in CI variable frontend	Matija Čupić	2018-03-17	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Alias secret_key and secret_value to key and value	Matija Čupić	2018-03-17	4	-12/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use secret_key and secret_value in variable form field names	Matija Čupić	2018-03-16	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use secret_key and secret_value in Variables controller	Matija Čupić	2018-03-16	3	-12/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-19' into 'master'	Achilleas Pipinellis	2018-03-26	1	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add SHA1 fingerprint requirement See merge request gitlab-org/gitlab-ce!17976
\| * \| \| \| \| \| \|	add SHA1 fingerprint requirement	Ben Bodenmiller	2018-03-26	1	-2/+4
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'ab-43150-users-controller-show-query-limit' into 'master'	Yorick Peterse	2018-03-26	2	-5/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 query for Noteable association. Closes #43150 See merge request gitlab-org/gitlab-ce!17956
\| * \| \| \| \| \| \|	Remove N+1 query for Noteable association.ab-43150-users-controller-show-query-limit	Andreas Brandl	2018-03-23	2	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each event with `Event#target_type` of "Note", we had a query to load the associated instance `noteable`. For example, if `Note` was related to an issue, we'd load each `Issue` with its own query (N+1 problem). Closes #43150.
* \| \| \| \| \| \| \|	Merge branch 'fix-40798-namespace-forking' into 'master'	Douwe Maan	2018-03-26	4	-10/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Forking with namespace doesn't work (API)" Closes #40798 See merge request gitlab-org/gitlab-ce!17815
\| * \| \| \| \| \| \| \|	Resolve "Forking with namespace doesn't work (API)"	Jan	2018-03-26	4	-10/+22
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '40843-update-grape-to-v1-0-2-when-it-is-released' into 'master'	Douwe Maan	2018-03-26	2	-8/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update grape to v1.0.2 when it is released" Closes #40843 See merge request gitlab-org/gitlab-ce!17983
\| * \| \| \| \| \| \| \|	Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-released	James Edwards-Jones	2018-03-26	2	-8/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/rs-update-changelog' into 'master'	Douwe Maan	2018-03-26	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing changelog entries for 10.6.0 See merge request gitlab-org/gitlab-ce!17973 [ci skip]
\| * \| \| \| \| \| \| \| \|	Add missing changelog entries for 10.6.0docs/rs-update-changelog	Robert Speicher	2018-03-23	1	-1/+5
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '44581-meta-use-prettier-ignore-file-in-our-save-script' into ↵	Phil Hughes	2018-03-26	3	-1/+24
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Make use of the prettier ignore file during our save script Closes #44581 See merge request gitlab-org/gitlab-ce!17960
\| * \| \| \| \| \| \| \|	Make use of the prettier ignore file during our save script	Lukas Eipert	2018-03-26	3	-1/+24
\|/ / / / / / / /
* \| \| \| \| \| \| \|	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	11	-24/+163
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	11	-24/+163
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28857-followup-fix-pages-test' into 'master'	Robert Speicher	2018-03-23	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a test that is going to break, that has not broken yet See merge request gitlab-org/gitlab-ce!17966
\| * \| \| \| \| \| \| \| \|	Fix a spec that will break in EE	Nick Thomas	2018-03-23	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-cleanup-comment-submit-test' into 'master'	Clement Ho	2018-03-23	2	-95/+228
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup test for disabling comment submit button See merge request gitlab-org/gitlab-ce!17930
\| * \| \| \| \| \| \| \| \| \|	Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-test	Winnie Hellmann	2018-03-22	2	-95/+228
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-03-23	7	-17/+73
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master' Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error" Closes #44564 See merge request gitlab-org/gitlab-ce!17962
\| * \| \| \| \| \| \| \| \| \| \|	Fix 500 error when trying to resolve non-ASCII conflicts in editor	Sean McGivern	2018-03-23	7	-17/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't always call `lines`, which meant that we didn't get the benefit of the side-effect from that, where it forced the conflict data itself to UTF-8. To fix that, make this explicit by separating the `raw_content` (any encoding) from the `content` (which is either UTF-8, or an exception is raised).
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-03-23	3	-41/+83
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master' Resolve "Add internationalization support for the Prometheus Merge Request widget" Closes #44218 See merge request gitlab-org/gitlab-ce!17753
\| * \| \| \| \| \| \| \| \| \| \| \|	Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widget	Jose Ivan Vargas	2018-03-23	3	-41/+83
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into ↵	Filipa Lacerda	2018-03-23	8	-87/+88
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Problem with prettier setting trailingComma: all" Closes #44589 See merge request gitlab-org/gitlab-ce!17967