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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update nfs.mdpatch-36	Xiaogang Wen	2018-12-19	1	-1/+1
\|
*	Merge branch '54146-fix-calendar-query' into 'master'	Grzegorz Bizon	2018-12-19	3	-1/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix calendar feed when sorted by priority Closes #54146 See merge request gitlab-org/gitlab-ce!23870
\| *	Fix calendar feed when sorted by priority	Heinrich Lee Yu	2018-12-17	3	-1/+15
\| \|
* \|	Merge branch 'issue-55534' into 'master'	Achilleas Pipinellis	2018-12-19	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Close #55534: link OTP auth less strictly to Google Closes #55534 See merge request gitlab-org/gitlab-ce!23921
\| * \|	Fix typo: aunthenticator->authenticator	Erik Huelsmann	2018-12-18	1	-1/+1
\| \| \|
\| * \|	Close #55534: link OTP auth less strictly to Google	Erik Huelsmann	2018-12-18	1	-1/+2
\| \| \|
* \| \|	Merge branch 'use-policy-sync-for-external-dns-in-review-apps' into 'master'	Lin Jen-Shin	2018-12-19	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specify the 'sync' policy for the external-dns deployments See merge request gitlab-org/gitlab-ce!23912
\| * \| \|	Specify the 'sync' policy for the external-dns deployments	Rémy Coutable	2018-12-18	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'ce-8810-fix-weight-sort' into 'master'	Sean McGivern	2018-12-19	2	-9/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of 8810-fix-weight-sort See merge request gitlab-org/gitlab-ce!23786
\| * \| \| \|	Backport of 8810-fix-weight-sort	Mario de la Ossa	2018-12-18	2	-9/+11
\| \| \| \| \|
* \| \| \| \|	Merge branch 'blackst0ne-convert-specs-rails5-style' into 'master'	Jan Provaznik	2018-12-19	214	-2692/+3249
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5.1] Update functional specs to use new keyword format Closes #54062 See merge request gitlab-org/gitlab-ce!23095
\| * \| \| \| \|	Update specs to rails5 formatblackst0ne-convert-specs-rails5-style	blackst0ne	2018-12-19	214	-2692/+3249
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates specs to use new rails5 format. The old format: `get :show, { some: params }, { some: headers }` The new format: `get :show, params: { some: params }, headers: { some: headers }`
* \| \| \| \| \|	Merge branch 'docs-juangascon/gitlab-ce-doc/ci/sort-predefined-variables' ↵	Evan Read	2018-12-19	1	-17/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sort list of predefined variables in alphabetical order See merge request gitlab-org/gitlab-ce!23834
\| * \| \| \| \| \|	Sort list of predefined variables in alphabetical order	Achilleas Pipinellis	2018-12-19	1	-17/+17
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-12-19	10	-208/+423
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54781-backfill-project-repositories-for-projects-on-legacy-storage' into 'master' Backfill project_repositories for legacy storage projects See merge request gitlab-org/gitlab-ce!23920
\| * \| \| \| \| \|	Extract a shared example for legacy and hashed storage migrations tests	Douglas Barbosa Alexandre	2018-12-18	3	-78/+46
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backfill project_repositories for legacy storage projects	Douglas Barbosa Alexandre	2018-12-18	9	-176/+423
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a background migration that will ensure all projects that are on legacy storage have a row in `project_repositories`.
* \| \| \| \| \|	Merge branch 'docs/compress-images' into 'master'	Evan Read	2018-12-18	63	-0/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Compress images See merge request gitlab-org/gitlab-ce!23902
\| * \| \| \| \|	Compress all images under doc/	Achilleas Pipinellis	2018-12-18	63	-0/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'port-missing-code-from-ee-in-group_policy' into 'master'	Douglas Barbosa Alexandre	2018-12-18	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a missing policy allowance in GroupPolicy See merge request gitlab-org/gitlab-ce!23906
\| * \| \| \| \|	Add a missing policy allowance in GroupPolicy	Rémy Coutable	2018-12-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'bvl-fix-start-with-metrics-enabled' into 'master'	Sean McGivern	2018-12-18	1	-0/+0
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load the devise initializer before metrics Closes #55513 See merge request gitlab-org/gitlab-ce!23907
\| * \| \| \| \|	Load the devise initializer before metrics	Bob Van Landuyt	2018-12-18	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Metrics tries to initialize the `EventsFinder` to instrumnt it. The `EventsFinder` tries to load the `Event` model, which in turn loads the `User` model. Loading the `User` model requires Devise to be initialized. So to avoid problems around this, we load devise before loading metrics.
* \| \| \| \| \|	Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master'	Douwe Maan	2018-12-18	3	-2/+10
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce diff with EE in ProtectedRefsController See merge request gitlab-org/gitlab-ce!23885
\| * \| \| \| \|	Reduce diff with EE in ProtectedRefsController	Rémy Coutable	2018-12-17	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'update/secpick' into 'master'	Robert Speicher	2018-12-18	1	-1/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update/secpick See merge request gitlab-org/gitlab-ce!23900
\| * \| \| \| \| \|	Update secpick script	James Lopez	2018-12-18	1	-1/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'osw-revert-suggestions-ff' into 'master'	Douwe Maan	2018-12-18	5	-20/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove feature flag for suggest changes feature See merge request gitlab-org/gitlab-ce!23892
\| * \| \| \| \| \| \|	Remove feature flag for suggest changes feature	Oswaldo Ferreira	2018-12-18	5	-20/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'force-reload-arguments-2' into 'master'	Rémy Coutable	2018-12-18	3	-7/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Passing an argument to force an association to reload is now deprecated See merge request gitlab-org/gitlab-ce!23894
\| * \| \| \| \| \| \| \|	Passing an argument to force an association to reload is now deprecated	Jasper Maes	2018-12-18	3	-7/+8
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Kushal Pandya	2018-12-18	8	-31/+77
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53020-user-specific-profile-page-settings-fields-don-t-have-help-text-placeholders' into 'master' Add explanatory help text to text inputs on user profile settings page Closes #53020 See merge request gitlab-org/gitlab-ce!23673
\| * \| \| \| \| \| \| \|	Add explanatory help text to text inputs on user profile settings page	Martin Wortschack	2018-12-18	8	-31/+77
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fj-remove-forced-disposition-attachment-ssh-keys' into 'master'	Douwe Maan	2018-12-18	2	-7/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove content disposition attachment displaying all ssh keys See merge request gitlab-org/gitlab-ce!23882
\| * \| \| \| \| \| \|	Remove content disposition attachment displaying all ssh keys	Francisco Javier López	2018-12-18	2	-7/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'zj-upgrade-gitaly-version' into 'master'	Douwe Maan	2018-12-18	3	-25/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to 1.9.0 See merge request gitlab-org/gitlab-ce!23865
\| * \| \| \| \| \| \|	Upgrade Gitaly to 1.9.0	Zeger-Jan van de Weg	2018-12-17	3	-25/+8
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This upgrade moves logic from gitlab-rails to Gitaly, which allowed code removal too.
* \| \| \| \| \| \|	Merge branch '54719-enable-hashed-storage-by-default-in-development-mode' ↵	Douglas Barbosa Alexandre	2018-12-18	1	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Enable Hashed Storage by default in development mode" Closes #54719 See merge request gitlab-org/gitlab-ce!23889
\| * \| \| \| \| \| \|	Enable Hashed Storage by default in development mode via seed_fu54719-enable-hashed-storage-by-default-in-development-mode	Gabriel Mazetto	2018-12-18	1	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Lin Jen-Shin	2018-12-18	1	-1/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6635-extract-ee-specific-files-lines-for-app-controllers-admin-health_check_controller-rb' into 'master' Make Admin::HealthCheckController EE-compatible See merge request gitlab-org/gitlab-ce!23879
\| * \| \| \| \| \| \|	Make Admin::HealthCheckController EE-compatible	Rémy Coutable	2018-12-17	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '41766-create-releases-page' into 'master'	Kamil Trzciński	2018-12-18	14	-68/+195
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates index page for releases behind a feature flag See merge request gitlab-org/gitlab-ce!23687
\| * \| \| \| \| \| \|	Move Projects::ReleasesController under Tags	Alessio Caiazza	2018-12-18	7	-71/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Projects::ReleasesController to Projects::Tags::ReleasesController
\| * \| \| \| \| \| \|	Adds releases index route	Filipa Lacerda	2018-12-18	8	-6/+57
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders empty index page Adds Releases entry to the navigation bar behind a feature flag Renders 404 when feature flag for releases is not enabled
* \| \| \| \| \| \|	Merge branch 'reduce-imports_controller-diff-with-ce' into 'master'	Lin Jen-Shin	2018-12-18	1	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Projects::ImportsController EE-compatible See merge request gitlab-org/gitlab-ce!23883
\| * \| \| \| \| \| \|	Make Projects::ImportsController EE-compatible	Rémy Coutable	2018-12-17	1	-5/+5
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '51226-check-yarn-lock' into 'master'	Rémy Coutable	2018-12-18	4	-131/+67
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add danger check for duplicate yarn dependencies Closes #51226 See merge request gitlab-org/gitlab-ce!21591
\| * \| \| \| \| \| \|	Deduplicate yarn dependencies	Lukas Eipert	2018-12-17	1	-129/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add danger check for duplicate yarn dependencies	Lukas Eipert	2018-12-17	4	-2/+45
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This danger check utilises `yarn-deduplicate` in order to show duplicate dependencies in the yarn.lock dependency tree. Often when introducing new dependencies or updating existing ones, yarn does not seem to build the most optimal dependency tree. In order to prevent those unnecessary dependency updates we are nudging developers and maintainers to resolve these issues in MRs. Automating this with danger especially helps, as yarn.lock files are not that easy to review.
* \| \| \| \| \| \|	Merge branch 'deprecated-directly-inheriting-migration' into 'master'	Rémy Coutable	2018-12-18	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated. See merge request gitlab-org/gitlab-ce!23884