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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix redis_cacheable deserialization47959-rails5-redis-timewithzone	Mario de la Ossa	2018-06-19	1	-1/+1
\|
*	Merge branch '48050-add-full-commit-sha' into 'master'	Tim Zallmann	2018-06-18	4	-3/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Use long sha version in MR widget copy to clipboard button" Closes #48050 See merge request gitlab-org/gitlab-ce!19955
\| *	Uses long sha version of the merged commit in MR widget copy to clipboard ↵48050-add-full-commit-sha	Filipa Lacerda	2018-06-18	4	-3/+10
\| \| \| \| \| \| \| \|	button
* \|	Merge branch '46861-issuable-title-with-longer-username' into 'master'	Clement Ho	2018-06-18	4	-2/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Buttons disappear on merge request page in some case Closes #46861 and #14348 See merge request gitlab-org/gitlab-ce!19176
\| * \|	Fix CSS for buttons not to be hidden on issues/MR title	Takuya Noguchi	2018-06-03	4	-2/+10
\| \| \|
* \| \|	Merge branch 'ce-4966-persistent-flash-banner-styles' into 'master'	Annabel Gray	2018-06-18	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Add styles for persistent notice banner See merge request gitlab-org/gitlab-ce!19968
\| * \| \|	Add styles for persistent notice banner	Kushal Pandya	2018-06-18	1	-0/+14
\|/ / /
* \| \|	Merge branch 'bvl-i18n-validation' into 'master'	Rémy Coutable	2018-06-18	11	-105/+311
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates to `.po` & `.pot` linting Closes #46096 et #39292 See merge request gitlab-org/gitlab-ce!18779
\| * \| \|	Correctly translate all forms in testsbvl-i18n-validation	Bob Van Landuyt	2018-06-15	7	-44/+125
\| \| \| \|
\| * \| \|	Add Polish as a supported language	Bob Van Landuyt	2018-06-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We already had some Polish translations, that were currently not available to users. Adding it here because it helps me debug some issues regarding language with more than one form.
\| * \| \|	Validate if changed translations are checked in	Bob Van Landuyt	2018-06-15	3	-6/+42
\| \| \| \|
\| * \| \|	Interpolate named counts in JS	Bob Van Landuyt	2018-06-15	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Even though JS does the `%d` interpolation in `n__` using a string replacement. This would not be compatible with the ruby implementation. Therefore using named variables instead.
\| * \| \|	Validate PO-variable usage in message ids	Bob Van Landuyt	2018-06-15	2	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That way we can detect incorrect usage before the strings are added to Crowdin for translation
\| * \| \|	Forbids combining named and unnamed variables in `gitlab.pot`	Bob Van Landuyt	2018-06-15	3	-81/+140
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would break with an argument error when interpolating using `sprintf` in ruby.
* \| \| \|	Merge branch '5956-auto-devops-multi-cluster-help-text' into 'master'	Clement Ho	2018-06-18	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	port 5956-auto-devops-multi-cluster-help-text to CE See merge request gitlab-org/gitlab-ce!19680
\| * \| \| \|	fix links when splitting sentences5956-auto-devops-multi-cluster-help-text	Dennis Tang	2018-06-11	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-blockquote-trailing-whitespace' into 'master'	Sean McGivern	2018-06-18	3	-6/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow trailing whitespace on blockquote fence lines See merge request gitlab-org/gitlab-ce!19960
\| * \| \| \| \|	Allow trailing whitespace on blockquote fence lines	Douwe Maan	2018-06-18	3	-6/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-favicon-redirect' into 'master'	Sean McGivern	2018-06-18	4	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect favicon.(png\|ico) to actual favicon asset or upload Closes #47840 See merge request gitlab-org/gitlab-ce!19956
\| * \| \| \| \| \|	Redirect favicon.(png\|ico) to actual favicon asset or uploaddm-favicon-redirect	Douwe Maan	2018-06-18	4	-0/+8
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Achilleas Pipinellis	2018-06-18	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md to clarify EFS is slow and not to use this guide. See merge request gitlab-org/gitlab-ce!19852
\| * \| \| \| \| \|	Update README.md to clarify EFS is slow and not to use this guide.	Lee Matos	2018-06-18	1	-0/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'rails5-fix-db-check' into 'master'	Yorick Peterse	2018-06-18	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix db check: connection execute returns integer instead of string See merge request gitlab-org/gitlab-ce!19901
\| * \| \| \| \| \|	Rails5 fix connection execute return integer instead of string	Jasper Maes	2018-06-15	2	-1/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Yorick Peterse	2018-06-18	2	-0/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace' into 'master' Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Namespace" Closes #48014 See merge request gitlab-org/gitlab-ce!19918
\| * \| \| \| \| \| \|	[Rails5] Disable inheritance_column for ↵blackst0ne-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-namespace	blackst0ne	2018-06-16	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Database::RenameReservedPathsMigration::V1::MigrationClasses::Namespace
* \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48012' into 'master'	Yorick Peterse	2018-06-18	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix passing Group objects array into for_projects_and_groups milestone scope Closes #48012 See merge request gitlab-org/gitlab-ce!19920
\| * \| \| \| \| \| \| \|	Rails5 fix passing Group objects array into for_projects_and_groups ↵	Jasper Maes	2018-06-16	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	milestone scope
* \| \| \| \| \| \| \| \|	Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'	Achilleas Pipinellis	2018-06-18	1	-0/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document Custom build directories Closes gitlab-runner#2211 See merge request gitlab-org/gitlab-ce!19664
\| * \| \| \| \| \| \| \| \|	Document custom build directories	Steve Azzopardi	2018-06-16	1	-0/+38
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update all references to version to include `v` for consistency. Closes gitlab-org/gitlab-runner#2211
* \| \| \| \| \| \| \| \|	Merge branch 'docs-coached-20180614-1' into 'master'	Achilleas Pipinellis	2018-06-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed broken link to git cheat sheet See merge request gitlab-org/gitlab-ce!19879
\| * \| \| \| \| \| \| \| \|	WIP: fixed broken link to git cheat sheet	Edwin Torres	2018-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2018-06-18	5	-18/+36
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46429-creating-a-deploy-token-doesn-t-bring-back-to-the-creation-page' into 'master' Resolve "Creating a deploy token doesn't bring back to the creation page" Closes #46429 See merge request gitlab-org/gitlab-ce!19639
\| * \| \| \| \| \| \| \| \| \|	Resolve "Creating a deploy token doesn't bring back to the creation page"	Sam Beckham	2018-06-18	5	-18/+36
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '47672-set_inline_content_type_for_ics' into 'master'	Douwe Maan	2018-06-18	7	-42/+87
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render calendar feed inline when accessed from GitLab Closes #47672 See merge request gitlab-org/gitlab-ce!19698
\| * \| \| \| \| \| \| \| \| \|	Render calendar feed inline when accessed from GitLab	Imre Farkas	2018-06-18	7	-42/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With text/calendar as Content-Type, the browser always downloads the content as a file (even ignoring the Content-Disposition header). We want to display the content inline when accessed from GitLab, similarly to the RSS feed.
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-06-18	2	-0/+14
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master' Resolve "[Rails5] expected the response to have status code :ok but it was 404" Closes #48008 See merge request gitlab-org/gitlab-ce!19937
\| * \| \| \| \| \| \| \| \| \| \|	[Rails5] Set request.format for artifacts_controllerblackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404	blackst0ne	2018-06-16	2	-0/+14
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5 request.format gets set by extension if it's not explicitly set. That means artifacts_controller#file no longer works as expected. This commit explicitly sets request.format for artifacts_controller#file.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48009' into 'master'	Rémy Coutable	2018-06-18	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 update Gemfile.rails5.lock Closes #48009 See merge request gitlab-org/gitlab-ce!19921
\| * \| \| \| \| \| \| \| \| \| \|	Rails5 update Gemfile.rails5.lock	Jasper Maes	2018-06-16	2	-2/+7
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' ↵	Rémy Coutable	2018-06-18	2	-5/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "[Rails5] expected: "/search?search=seed_project" got: nil" Closes #48013 See merge request gitlab-org/gitlab-ce!19936
\| * \| \| \| \| \| \| \| \| \| \|	[Rails5] Fix sessions_controller_specblackst0ne-rails5-expected-search-search-seed_project-got-nil	blackst0ne	2018-06-16	2	-5/+10
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor sessions_controller_spec to work both in rails4 and rails5. Remove the stubbed `request.referer` method, set real header instead.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into ↵	Rémy Coutable	2018-06-18	2	-3/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [Rails5] Fix pipeline_schedules_controller_spec Closes #48011 See merge request gitlab-org/gitlab-ce!19919
\| * \| \| \| \| \| \| \| \| \|	[Rails5] Fix pipeline_schedules_controller_specblackst0ne-rails5-fix-pipeline-schedules-controller-spec	blackst0ne	2018-06-16	2	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5.0 there's a bug [1] in controller tests that doesn't parse nested parameters correctly. This commit brings a workaround to make specs work again both in rails4 and rails5. [1]: https://github.com/rails/rails/issues/23997
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'	Rémy Coutable	2018-06-18	2	-5/+53
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose a clean_backtrace method from Gitlab::Profiler See merge request gitlab-org/gitlab-ce!19894
\| * \| \| \| \| \| \| \| \| \|	Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profiler	Sean McGivern	2018-06-15	2	-5/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method makes it easier for other parts of the app to get clean backtraces, as well as console users.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-47960' into 'master'	Rémy Coutable	2018-06-18	2	-4/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix update_attribute usage not causing a save Closes #47960 See merge request gitlab-org/gitlab-ce!19881
\| * \| \| \| \| \| \| \| \| \| \|	Rails5 fix update_attribute usage not causing a save	Jasper Maes	2018-06-15	2	-4/+9
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'	Rémy Coutable	2018-06-18	2	-0/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Explicitly set request.format for blob_controller Closes #47921 See merge request gitlab-org/gitlab-ce!19876
\| * \| \| \| \| \| \| \| \| \| \|	[Rails5] Explicitly set request.format for blob_controllerblackst0ne-rails5-fix-blob-requests-format	blackst0ne	2018-06-15	2	-0/+18
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 4.2 if params[:format] is empty, Rails set it to :html But since Rails 5.0 the framework now looks for an extension. E.g. for `blob/master/CHANGELOG.md` in Rails 4 the format would be `:html`, but in Rails 5 on it'd be `:md` This commit explicitly sets the `:html` format for all requests unless `:format` is set by a client e.g. by JS for XHR requests.