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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \| \| \| \| \|	Allow registration when LDAP is enabledml-qa-register-ldap	Mark Lapierre	2018-09-24	5	-8/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the login page object and related code so that a user can be registered when LDAP is enabled
* \| \| \| \| \| \| \| \|	Merge branch 'enable-force-write-auth-keys-restore' into 'master'	Nick Thomas	2018-09-25	3	-3/+50
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the ability to use the force env for rebuilding authorized_keys during a restore See merge request gitlab-org/gitlab-ce!21896
\| * \| \| \| \| \| \| \| \|	Enable write to auth_keys file during restore	Cindy Pallares	2018-09-25	3	-3/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fast lookup of authorized SSH keys in the database was ported to CE in v10.4. This change adds the option to enable the setting via the restore rake task and assumes yes if the force env variable is set.
* \| \| \| \| \| \| \| \| \|	Merge branch 'ide-remove-stage-buttons' into 'master'	Filipa Lacerda	2018-09-25	6	-69/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove stage/unstage buttons from IDE commit list items Closes #51695 See merge request gitlab-org/gitlab-ce!21845
\| * \| \| \| \| \| \| \| \| \|	Fixed alignment of changed icon in commit headide-remove-stage-buttons	Phil Hughes	2018-09-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Updated specs to account for removed buttons	Phil Hughes	2018-09-21	4	-65/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove stage/unstage buttons from IDE commit list items	Phil Hughes	2018-09-20	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51695
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-destroy-mr-widget-polling' into 'master'	Phil Hughes	2018-09-25	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup polling of merge request widget in tests Closes gitlab-ee#7728 See merge request gitlab-org/gitlab-ce!21906
\| * \| \| \| \| \| \| \| \| \|	Cleanup polling of merge request widget in tests	Winnie Hellmann	2018-09-25	2	-0/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-7013-add-epics-close-support' into 'master'	Douglas Barbosa Alexandre	2018-09-25	8	-7/+58
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of Adding state to epics See merge request gitlab-org/gitlab-ce!21771
\| * \| \| \| \| \| \| \| \| \|	Bacport FE changes from Closing Epicsce-7013-add-epics-close-support	Jarka Košanová	2018-09-24	6	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of js and vue files from closing epics
\| * \| \| \| \| \| \| \| \| \|	Add name definition for table method	Jarka Košanová	2018-09-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add specs for closing and reopening issue	Jarka Košanová	2018-09-24	1	-6/+23
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douglas Barbosa Alexandre	2018-09-25	5	-4/+29
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'51747-gitlab-com-unable-to-import-a-project-that-was-just-exported' into 'master' Resolve "gitlab.com: Unable to import a project that was just exported" Closes #43840, #43896, and #51747 See merge request gitlab-org/gitlab-ce!21875
\| * \| \| \| \| \| \| \| \| \| \|	Add changelog. Add more specs.51747-gitlab-com-unable-to-import-a-project-that-was-just-exported	James Lopez	2018-09-24	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix null pipeline problem	James Lopez	2018-09-24	4	-4/+19
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/version-and-tiers-guidance' into 'master'	Marcia Ramos	2018-09-25	1	-3/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clarity to EE feature styles for features introduced before and after 9.2 See merge request gitlab-org/gitlab-ce!21874
\| * \| \| \| \| \| \| \| \| \| \|	Add clarity to EE feature styles for features introduced before and after 9.2	Evan Read	2018-09-25	1	-3/+15
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mk/improve-usage-of-request-store' into 'master'	Yorick Peterse	2018-09-25	37	-155/+485
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Provide NullStore for RequestStore" Closes #51718 See merge request gitlab-org/gitlab-ce!21848
\| * \| \| \| \| \| \| \| \| \| \|	Refactor Feature.flipper methodmk/improve-usage-of-request-store	Michael Kozono	2018-09-24	2	-14/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix typo in context 'when request store is active' * Rearrange test since the instance variable always gets set now, even if RequestStore is active
\| * \| \| \| \| \| \| \| \| \| \|	Use `Gitlab::SafeRequestStore` in more places	Michael Kozono	2018-09-24	20	-81/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Even if it doesn’t save lines of code, since people will tend to use code they’ve seen. And `SafeRequestStore` is safer since you don’t have to remember to check `RequestStore.active?`.
\| * \| \| \| \| \| \| \| \| \| \|	Add note to docs about `Gitlab::SafeRequestStore`	Michael Kozono	2018-09-24	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Simplify by using Gitlab::SafeRequestStore	Michael Kozono	2018-09-24	11	-60/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are clear wins.
\| * \| \| \| \| \| \| \| \| \| \|	Use a null object with RequestStore	Michael Kozono	2018-09-24	4	-0/+384
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes it easier and safer to use RequestStore because you don't need to check `RequestStore.active?` before using it. You just have to use `Gitlab::SafeRequestStore` instead.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'nik-doc-postgres-alignment' into 'master'	Yorick Peterse	2018-09-25	1	-28/+45
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres alignment padding – logic fixed See merge request gitlab-org/gitlab-ce!21764