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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bvl-add-galician' into 'master'	Grzegorz Bizon	2018-08-27	2	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add Galician as an available language Closes #43227 See merge request gitlab-org/gitlab-ce!21202
\| *	Add Galician as an available languagebvl-add-galician	Bob Van Landuyt	2018-08-14	2	-0/+6
\| \|
* \|	Merge branch ↵	Grzegorz Bizon	2018-08-27	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'50746-qa-test-instance-doesn-t-use-the-correct-path-to-spec-files' into 'master' Resolve "[QA] `Test::Instance` doesn't use the correct path to spec files" Closes #50746 See merge request gitlab-org/gitlab-ce!21394
\| * \|	[QA] Fix wrong spec files path in QA::Scenario::Test::Instance	Rémy Coutable	2018-08-27	1	-1/+1
\|/ / \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'docs/compress-images' into 'master'	Marcia Ramos	2018-08-27	504	-0/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Compress all PNG images under doc/ See merge request gitlab-org/gitlab-ce!21329
\| * \|	Compress all PNG images under doc/	Achilleas Pipinellis	2018-08-27	504	-0/+0
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The pngquant tool was used https://pngquant.org, and particularly, the following command: /usr/bin/pngquant -f --skip-if-larger --ext .png --speed 1 image.png Before: 47584K After : 34924K
* \|	Merge branch ↵	Clement Ho	2018-08-27	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'50526-flash-hideflash-sets-transition-style-test-fails-on-master-in-local-environment' into 'master' Resolve ""Flash hideFlash sets transition style" test fails on master in local environment" Closes #50526 See merge request gitlab-org/gitlab-ce!21376
\| * \|	correct transtition style test to allow chrome v68 compatibility	Adriel Santiago	2018-08-24	1	-2/+5
\| \| \|
* \| \|	Merge branch 'bvl-correct-interpolation-i18n' into 'master'	Sean McGivern	2018-08-27	9	-7/+185
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use ruby interpolation in externalized strings Closes #50333 See merge request gitlab-org/gitlab-ce!21247
\| * \| \|	Reject ruby interpolation in externalized stringsbvl-correct-interpolation-i18n	Bob Van Landuyt	2018-08-25	9	-7/+185
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using ruby interpolation in externalized strings, they can't be detected. Which means they will never be presented to be translated. To mix variables into translations we need to use `sprintf` instead. Instead of: _("Hello #{subject}") Use: _("Hello %{subject}) % { subject: 'world' }
* \| \| \|	Merge branch '49292-add-group-name-badge-under-milestone' into 'master'	Sean McGivern	2018-08-27	3	-0/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add group name badge under group milestone Closes #49292 See merge request gitlab-org/gitlab-ce!21384
\| * \| \| \|	Add changelog entry	Kushal Pandya	2018-08-26	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Add group name badge under group milestone	Kushal Pandya	2018-08-26	2	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-28' into 'master'	Sean McGivern	2018-08-27	3	-11/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fallback logic for automatic MR title assignment See merge request gitlab-org/gitlab-ce!20930
\| * \| \| \| \|	REFACTOR: Clarify assignment fallback chain	Franz Liedke	2018-08-25	1	-6/+4
\| \| \| \| \| \|
\| * \| \| \| \|	REFACTOR: Use early return to flatten code	Franz Liedke	2018-08-25	1	-6/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix fallback logic for automatic MR title assignment	Franz Liedke	2018-08-25	2	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Add regression test for MR title fallback	Franz Liedke	2018-08-25	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rails5-update-gemfile-lock' into 'master'	Rémy Coutable	2018-08-26	2	-10/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 update Gemfile.rails5.lock See merge request gitlab-org/gitlab-ce!21388
\| * \| \| \| \| \|	Rails5 update Gemfile.rails5.lock	Jasper Maes	2018-08-26	2	-10/+13
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'sh-insert-git-data-in-separate-transaction' into 'master'	Yorick Peterse	2018-08-26	4	-8/+98
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bitbucket Server importer: Eliminate most idle-in-transaction issues See merge request gitlab-org/gitlab-ce!21173
\| * \| \| \| \| \|	Bitbucket Server importer: Eliminate most idle-in-transaction issues	Stan Hu	2018-08-26	4	-8/+98
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just like with the GitHub importer, the Bitbucket Server importer can hit the default 60 s idle-in-transaction timeouts if it takes too long to create the merge request. We solve this by using the same approach as the GitHub importer: 1. Bypass all validation and hooks in creating a merge request 2. Insert the Git data in a separate transaction Part of #50021
* \| \| \| \| \|	Merge branch 'sh-sanitize-project-import-names' into 'master'	Rémy Coutable	2018-08-26	7	-4/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use slugs for default project path and sanitize names before import See merge request gitlab-org/gitlab-ce!21367
\| * \| \| \| \| \|	Use slugs for default project path and sanitize names before import	Stan Hu	2018-08-24	7	-4/+23
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users importing from Bitbucket Cloud, Bitbucket Server, or GitHub often complained about getting failed imports due to 422 errors. This change ensures that project names are imported with names that are guaranteed to pass the regular expression validation. Part of #50021
* \| \| \| \| \|	Merge branch '6028-show-generic-percent-stacked-progress-bar' into 'master'	Filipa Lacerda	2018-08-26	3	-2/+16
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show `< 1%` when percent value evaluated is less than 1 on Stacked Progress Bar Closes gitlab-ee#6028 See merge request gitlab-org/gitlab-ce!21306
\| * \| \| \| \|	Add changelog entry6028-show-generic-percent-stacked-progress-bar	Kushal Pandya	2018-08-20	1	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Show `< 1%` when percent value evaluated is less than 1	Kushal Pandya	2018-08-20	2	-2/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'make-qa-scenario-test-instance-back-compatible' into 'master'	Grzegorz Bizon	2018-08-26	2	-0/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Re-add Test::Instance for back-compatibility with GitLab < 11.3 See merge request gitlab-org/gitlab-ce!21339
\| * \| \| \| \| \|	[QA] Re-add Test::Instance for back-compatibility with GitLab < 11.3	Rémy Coutable	2018-08-22	2	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'ml-test-plan-issue-template' into 'master'	Mek Stittri	2018-08-26	1	-0/+96
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Test plan issue template See merge request gitlab-org/gitlab-ce!21227
\| * \| \| \| \| \| \|	Add Test plan issue templateml-test-plan-issue-template	Mark Lapierre	2018-08-17	1	-0/+96
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '49110-update-mr-widget-styles' into 'master'	Filipa Lacerda	2018-08-26	11	-75/+324
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Follow up to "Styling of the MR widget's info and pipeline sections"" Closes #49110 See merge request gitlab-org/gitlab-ce!21206
\| * \| \| \| \| \| \|	Add changelog49110-update-mr-widget-styles	Paul Slaughter	2018-08-21	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Generate a fresh pot	Paul Slaughter	2018-08-21	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update mr_widget_header to not show branch names in 'commits behind' text	Paul Slaughter	2018-08-21	3	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: - Increased presence of 'commits behind' text - Added link to target branch in 'commits behind' text
\| * \| \| \| \| \| \|	Update MR deployment to use .label-truncate with .deploy-link	Paul Slaughter	2018-08-21	2	-7/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update MR header and pipeline to use .label-truncate with .label-branch	Paul Slaughter	2018-08-21	4	-55/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: - Renamed .label-truncated to .label-truncate - Removed length checking in JS to let the CSS handle this - Improve IE11 compatibility of MR headers
\| * \| \| \| \| \| \|	Create TooltipOnTruncate component to show tooltip only when needed	Paul Slaughter	2018-08-21	2	-0/+229
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Create 'mountComponentWithRender' for testing with slots	Paul Slaughter	2018-08-21	1	-0/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'api-protected-tags' into 'master'	Nick Thomas	2018-08-25	12	-4/+531
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Protected tags Closes #39144 See merge request gitlab-org/gitlab-ce!14986
\| * \| \| \| \| \| \| \|	API: Protected tags	Robert Schilling	2018-08-25	12	-4/+531
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '50345-hashed-storage-feature-flag' into 'master'	Nick Thomas	2018-08-25	8	-3/+125
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature flag to disable Hashed Storage migration when renaming a repository Closes #50345 See merge request gitlab-org/gitlab-ce!21291
\| * \| \| \| \| \| \| \|	Rename feature flag to skip_hashed_storage_upgrade to be less confusing50345-hashed-storage-feature-flag	Gabriel Mazetto	2018-08-22	3	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed `stub_feature_flag behavior` for `disabled?` flags.	Gabriel Mazetto	2018-08-22	7	-2/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previous code would not work with `disabled?` because that method would send two parameters (second always `nil`) which we are not mocking. Instead of mock yet another state, I decide to fix it where it belongs.
\| * \| \| \| \| \| \| \|	Add FeatureFlag to disable hashed storage migration when renaming	Gabriel Mazetto	2018-08-22	2	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We usually want a feature flag to be disabled by default and hide the feature until it's enabled. This is an unconventional use: when the flag is enabled, it will "DISABLE" the behavior.
* \| \| \| \| \| \| \| \|	Merge branch 'winh-danger-changelog-drop-wip' into 'master'	Rémy Coutable	2018-08-24	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop WIP from changelog command in Danger comment See merge request gitlab-org/gitlab-ce!21374
\| * \| \| \| \| \| \| \| \|	Drop WIP from changelog command in Danger comment	Winnie Hellmann	2018-08-24	1	-2/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'dz-refactor-project-permissions-helper-method' into 'master'	Rémy Coutable	2018-08-24	2	-3/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor project_permissions_panel_data so it can be extended in EE easily See merge request gitlab-org/gitlab-ce!21370
\| * \| \| \| \| \| \| \|	Refactor project_permissions_panel_data so it can be extended in EE easily	Dmitriy Zaporozhets	2018-08-24	2	-3/+5
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'sh-simplify-github-importer-refactor' into 'master'	Yorick Peterse	2018-08-24	9	-133/+173
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor GitHub Importer database helpers into helper methods See merge request gitlab-org/gitlab-ce!21357