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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Dedupe vue versions in yarn.lockupdate-vuejs-dependencies	Mike Greiling	2018-09-26	1	-13/+2
\|
*	Upgrade vue-loader from 15.2.4 to 15.4.2	Mike Greiling	2018-09-26	2	-10/+14
\|
*	Upgrade vuejs from 2.5.16 to 2.5.17	Mike Greiling	2018-09-26	2	-3/+14
\| \| \| \| \| \| \|	https://github.com/vuejs/vue/releases most relevant release notes are in the 2.5.17 beta post: https://github.com/vuejs/vue/releases/tag/v2.5.17-beta.0
*	Merge branch 'mk/backport-fix-safe-request-store-test' into 'master'	Yorick Peterse	2018-09-26	1	-3/+3
\|\ \| \| \| \| \| \| \| \|	[CE backport] Fix RequestStore-related EE-only test failure See merge request gitlab-org/gitlab-ce!21915
\| *	Fix RequestStore-related test failuremk/backport-fix-safe-request-store-test	Michael Kozono	2018-09-25	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The test was failing https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/101444126 because https://gitlab.com/gitlab-org/gitlab-ee/blob/a04056efad6639420b469eced5130751a8cf2757/ee/spec/support/request_store.rb which is in EE only, clears the RequestStore before every test, regardless of whether RequestStore is active. This test is unusual because it sets up RequestStore without it being active, to make sure that the tested code doesn’t attempt to use RequestStore. These two unusual facts combined to cause the failure in EE only. The fix works because of the particular order of RSpec hooks in the test lifecycle.
* \|	Merge branch 'patch-28' into 'master'	Achilleas Pipinellis	2018-09-26	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	uploads.md: Fix incorrect path reference See merge request gitlab-org/gitlab-ce!21901
\| * \|	uploads.md: Fix incorrect path reference	Per Lundberg	2018-09-25	1	-1/+1
\| \| \|
* \| \|	Merge branch 'frozen-string-app-controllers-much-more' into 'master'	Rémy Coutable	2018-09-26	89	-12/+183
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable even more frozen string in app/controllers See merge request gitlab-org/gitlab-ce!21919
\| * \| \|	Enable even more frozen string in app/controllers	gfyoung	2018-09-25	89	-12/+183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables frozen string for some vestigial files as well as the following: * app/controllers/projects/*/.rb * app/controllers/sherlock/*/.rb * app/controllers/snippets/*/.rb * app/controllers/users/*/.rb Partially addresses #47424.
* \| \| \|	Merge branch 'patch-29' into 'master'	Rémy Coutable	2018-09-26	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update deploy token example to use https See merge request gitlab-org/gitlab-ce!21720
\| * \| \| \|	Update deploy token example to use https	Clayton Carter	2018-09-13	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2018-09-26	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: link to repo check failures See merge request gitlab-org/gitlab-ce!21829
\| * \| \| \| \|	docs: link to repo check failures	Ben Bodenmiller	2018-09-20	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '51839-remove-sorting-on-project-tags' into 'master'	Nick Thomas	2018-09-26	4	-10/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve order of project tags list Closes #51839 See merge request gitlab-org/gitlab-ce!21897
\| * \| \| \| \| \|	Preserve order of project tags list	Dennis Tang	2018-09-26	4	-10/+13
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-gitlab-capitalization-translations-ce' into 'master'	Rémy Coutable	2018-09-26	10	-33/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct GitLab capitalization in CE Translation files See merge request gitlab-org/gitlab-ce!21832
\| * \| \| \| \| \|	Correct GitLab capitalizations in translations	Marcel Amirault	2018-09-20	10	-33/+33
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '49329-mr-show-commit-details' into 'master'	Phil Hughes	2018-09-26	16	-10/+420
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Commit details are not displayed when reviewing an MR commit by commit" See merge request gitlab-org/gitlab-ce!21784
\| * \| \| \| \| \| \|	Resolve "Commit details are not displayed when reviewing an MR commit by commit"	Paul Slaughter	2018-09-26	16	-10/+420
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'merge-cpp-junit-documentation-update' into 'master'	Rémy Coutable	2018-09-26	1	-0/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added cpp documentation for junit integration. See merge request gitlab-org/gitlab-ce!21916
\| * \| \| \| \| \| \|	Added cpp documentation for junit integration.	Shaun Burns	2018-09-25	1	-0/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'tc-fix-rails5-subquery-selfjoin' into 'master'	Douwe Maan	2018-09-26	1	-1/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Work around a bug in Rails 5, where LIMIT causes trouble Closes #51729 See merge request gitlab-org/gitlab-ce!21879
\| * \| \| \| \| \| \| \|	Work around a bug in Rails 5, where LIMIT causes troubletc-fix-rails5-subquery-selfjoin	Toon Claes	2018-09-25	1	-1/+9
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The original code caused Rails to generate invalid SQL. The problem lays in the `.arel` method in `ActiveRecord::Relation`. When there was a `limit` on the relation, the `LIMIT` statement was taken over to Arel, but the value wasn't. ```ruby relation = Event.limit(2) relation.to_sql #=> "SELECT `events`.* FROM `events` LIMIT 2" relation.arel.to_sql #=> "SELECT `events`.* FROM `events` LIMIT ?" ``` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51729
* \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Phil Hughes	2018-09-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix board list vertical scroll bar always shows up See merge request gitlab-org/gitlab-ce!20481
\| * \| \| \| \| \| \|	fix board list vertical scroll bar always shows up	Emeryao	2018-07-09	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jivl-glui-link' into 'master'4037-add-group-level-wiki	Clement Ho	2018-09-25	2	-8/+17
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link component from gitlab-ui See merge request gitlab-org/gitlab-ce!21803
\| * \| \| \| \| \| \|	Add link component from gitlab-ui	Jose Ivan Vargas	2018-09-25	2	-8/+17
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'leipert-dedupe-dependencies-2018-09-25' into 'master'	Mike Greiling	2018-09-25	1	-346/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dedupe frontend dependencies See merge request gitlab-org/gitlab-ce!21908
\| * \| \| \| \| \| \|	Dedupe frontend dependenciesleipert-dedupe-dependencies-2018-09-25	Lukas Eipert	2018-09-25	1	-346/+34
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add-gitlab-ui-skeleton-loading' into 'master'	Mike Greiling	2018-09-25	12	-222/+31
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add gitlab-ui skeleton loading See merge request gitlab-org/gitlab-ce!21871
\| * \| \| \| \| \| \| \|	Add gitlab-ui skeleton loading	Clement Ho	2018-09-25	12	-222/+31
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs/zj-update-repository-lang' into 'master'	Achilleas Pipinellis	2018-09-25	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update doc/user/project/repository/index.md See merge request gitlab-org/gitlab-ce!21898
\| * \| \| \| \| \| \| \|	Update doc/user/project/repository/index.mddocs/zj-update-repository-lang	Zeger-Jan van de Weg	2018-09-25	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '51316-qa-fix-transient-fork-spec-failure' into 'master'	Rémy Coutable	2018-09-25	3	-4/+44
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Troubleshoot "Transient failure in qa/specs/features/project/fork_project_spec.rb" See merge request gitlab-org/gitlab-ce!21858
\| * \| \| \| \| \| \| \| \|	Assert successful sign in after registration51316-qa-fix-transient-fork-spec-failure	Mark Lapierre	2018-09-25	3	-4/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`.has_personal_area?` waits for sign in but does not ensure that it's successful. Raise an exception if not successful so we can capture a screenshot at the point of failure Adds a workaround and code to help troubleshoot why a new user doesn't stay signed in after loading a project page.
* \| \| \| \| \| \| \| \| \|	Merge branch 'frozen-string-app-controller-more' into 'master'	Stan Hu	2018-09-25	52	-1/+108
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable more frozen string in app/controllers/ See merge request gitlab-org/gitlab-ce!21873
\| * \| \| \| \| \| \| \| \| \|	Enable more frozen string in app/controllers/	gfyoung	2018-09-23	52	-1/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables frozen string for the following: * app/controllers/dashboard/*/.rb * app/controllers/explore/*/.rb * app/controllers/google_api/*/.rb * app/controllers/groups/*/.rb * app/controllers/import/*/.rb * app/controllers/instance_statistics/*/.rb * app/controllers/ldap/*/.rb * app/controllers/oauth/*/.rb * app/controllers/profiles/*/.rb Partially addresses #47424.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'follow-up-geo-sync-disabled-wikis' into 'master'	Douglas Barbosa Alexandre	2018-09-25	11	-99/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6906 See merge request gitlab-org/gitlab-ce!21903
\| * \| \| \| \| \| \| \| \| \| \|	Geo: sync disabled wikis. Stage 2follow-up-geo-sync-disabled-wikis	Valery Sizov	2018-09-25	11	-99/+11
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We started syncing all the wiki regardless of the fact it's disabled or not. We couldn't do that in one stage because of needing of smoth update and deprecating things. This is the second stage that finally removes unused columns in the geo_node_status table.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-committer-typo' into 'master'	Rémy Coutable	2018-09-25	5	-7/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix committer typo Closes #51808 See merge request gitlab-org/gitlab-ce!21899
\| * \| \| \| \| \| \| \| \| \| \|	Fix committer typo	George Tsiolis	2018-09-25	5	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'leipert-fix-mr-widget-header-margins' into 'master'	Annabel Dunstone Gray	2018-09-25	2	-25/+40
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix margins in merge request header Closes #51726 See merge request gitlab-org/gitlab-ce!21878
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix merge request header marginsleipert-fix-mr-widget-header-margins	Lukas Eipert	2018-09-25	2	-25/+40
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-improve-review-apps' into 'master'	Douglas Barbosa Alexandre	2018-09-25	6	-0/+459
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Improve review apps See merge request gitlab-org/gitlab-ce!21087
\| * \| \| \| \| \| \| \| \| \| \| \|	[CE] Port review apps file to CEce-improve-review-apps	Rémy Coutable	2018-09-25	6	-0/+459
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fa-handle_invalid_utf8_errors' into 'master'	Stan Hu	2018-09-25	5	-0/+73
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render 412 when invalid UTF-8 is passed as parameter See merge request gitlab-org/gitlab-ce!21774
\| * \| \| \| \| \| \| \| \| \| \| \|	Render 412 for invalid UTF-8 parametersfa-handle_invalid_utf8_errors	Felipe Artur	2018-09-22	5	-0/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders 412 error page when invalid UTF-8 is passed as parameters in controllers.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'osw-clean-up-phase-for-diff-files-removal' into 'master'	Yorick Peterse	2018-09-25	2	-0/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clean-up phase for ScheduleDiffFilesDeletion migration Closes #51469 See merge request gitlab-org/gitlab-ce!21734
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add clean-up phase for ScheduleDiffFilesDeletion	Oswaldo Ferreira	2018-09-25	2	-0/+28
\| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Process any remaining ScheduleDiffFilesDeletion workers and remove temporary added index.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ml-qa-register-ldap' into 'master'	Dan Davison	2018-09-25	5	-8/+62
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Allow registration when LDAP is enabled See merge request gitlab-org/gitlab-ce!21846