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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rails5-fix-46276' into 'master'	Rémy Coutable	2018-06-19	1	-0/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix format in uploads actions Closes #46276 See merge request gitlab-org/gitlab-ce!19907
\| *	Rails5 fix format in uploads actions	Jasper Maes	2018-06-18	1	-0/+13
\| \|
* \|	Remove top margin from checkboxes in integrations page	Jose	2018-06-18	1	-7/+0
\| \|
* \|	Resolve "BS4: Labels in issues system notes are misaligned again"	Clement Ho	2018-06-18	1	-1/+4
\| \|
* \|	Merge branch '48050-add-full-commit-sha' into 'master'	Tim Zallmann	2018-06-18	2	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	button
* \| \|	Merge branch '46861-issuable-title-with-longer-username' into 'master'	Clement Ho	2018-06-18	3	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+5
\| \| \| \|
* \| \| \|	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	1	-3/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates to `.po` & `.pot` linting Closes #46096 et #39292 See merge request gitlab-org/gitlab-ce!18779
\| * \| \| \|	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.
* \| \| \| \|	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 'rails5-fix-48012' into 'master'	Yorick Peterse	2018-06-18	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	milestone scope
* \| \| \| \| \| \|	Resolve "Creating a deploy token doesn't bring back to the creation page"	Sam Beckham	2018-06-18	4	-18/+31
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '47672-set_inline_content_type_for_ics' into 'master'	Douwe Maan	2018-06-18	3	-18/+28
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-18/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-0/+9
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'blackst0ne-rails5-fix-blob-requests-format' into 'master'	Rémy Coutable	2018-06-18	1	-0/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \|	Merge branch '47933-MR-invisible-milestone' into 'master'	Douwe Maan	2018-06-18	3	-4/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Milestone not updating in MR sidebar after selection" Closes #47933 See merge request gitlab-org/gitlab-ce!19870
\| * \| \| \| \| \| \| \|	Fix milestones disappearing when changed on MR47933-MR-invisible-milestone	Mario de la Ossa	2018-06-15	3	-4/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove the ci_job_request_with_tags_matcherremove-ci_job_request_with_tags_matcher	Kamil Trzciński	2018-06-17	1	-7/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-nav-theme-previews' into 'master'	Dmitriy Zaporozhets	2018-06-16	2	-7/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Harmonize theme preferences previews See merge request gitlab-org/gitlab-ce!19916
\| * \| \| \| \| \| \| \|	Harmonize theme preferences previewsupdate-nav-theme-previews	Andreas Kämmerle	2018-06-16	2	-7/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into ↵	Annabel Gray	2018-06-16	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "BS4: Mini graph dropdown sometimes open on the top" Closes #47610 See merge request gitlab-org/gitlab-ce!19912
\| * \| \| \| \| \| \| \| \|	Fix ci mini graph dropdown alignment and positioning47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top	Clement Ho	2018-06-15	2	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes' ↵	Annabel Gray	2018-06-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Pipeline dropdown shifts around at smaller screen sizes" Closes #47068 See merge request gitlab-org/gitlab-ce!19910
\| * \| \| \| \| \| \| \| \| \|	Enable display static for ci job dropdowns so that they dont move when ↵47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes	Clement Ho	2018-06-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	window resizes
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-small-container-width' into 'master'	Annabel Gray	2018-06-16	6	-10/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove small container width Closes #36439 See merge request gitlab-org/gitlab-ce!19893
\| * \| \| \| \| \| \| \| \| \|	Add container width for project empty placeholder	George Tsiolis	2018-06-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove small container width	George Tsiolis	2018-06-15	6	-10/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Resolve "Wiki git clone holder and dropdown is broken"	Annabel Gray	2018-06-15	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'enable-no-multi-assign' into 'master'	Mike Greiling	2018-06-15	12	-7/+30
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable no-multi-assignment in JS files See merge request gitlab-org/gitlab-ce!19808
\| * \| \| \| \| \| \| \| \| \| \|	Enable no-multi-assignment in JS files	gfyoung	2018-06-15	12	-7/+30
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47006.
* \| \| \| \| \| \| \| \| \| \|	Resolve "Update link in GitLab cluster setup form to say "see pricing""	Taurie Davis	2018-06-15	1	-7/+16
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Resolve "Misalignment in rows on comparison page"	Clement Ho	2018-06-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Resolve "Stop horizontal scrolling when clicking on board issue"	Constance Okoghenun	2018-06-15	1	-35/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Annabel Gray	2018-06-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47975-project-select-dropdown-is-broken-for-group-issues-and-merge-requests' into 'master' Resolve "Project select dropdown is broken for group issues and merge requests" Closes #47975 See merge request gitlab-org/gitlab-ce!19906
\| * \| \| \| \| \| \| \| \| \| \|	Fix project select dropdown in group issues and mr empty state47975-project-select-dropdown-is-broken-for-group-issues-and-merge-requests	Clement Ho	2018-06-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-remove-additional-border-users-no-group' into 'master'	Clement Ho	2018-06-15	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove additional border from the create project page Closes #47356 See merge request gitlab-org/gitlab-ce!19899
\| * \| \| \| \| \| \| \| \| \| \|	Remove additional border from the create project page	Jose	2018-06-15	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix alert colors	Clement Ho	2018-06-15	2	-3/+22
\| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-dropdown-going-out-of-screen' into 'master'	Clement Ho	2018-06-15	8	-10/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dropdown from the project welcome page moving out of the screen Closes #47966 See merge request gitlab-org/gitlab-ce!19903
\| * \| \| \| \| \| \| \| \| \| \|	Fix dropdown from project welcome page moving out of the screenjivl-fix-dropdown-going-out-of-screen	Jose	2018-06-15	8	-10/+10
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-web-ide-disable-markdown-autocomplete' into 'master'	Phil Hughes	2018-06-15	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Web IDE autocomplete should be disabled in markdown files" Closes #47796 See merge request gitlab-org/gitlab-ce!19760
\| * \| \| \| \| \| \| \| \| \| \|	Fix #47796 "Web IDE autocomplete should be disabled in markdown files"	Isaac Smith	2018-06-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Remove pointer events in favor of boundary viewport	Clement Ho	2018-06-15	2	-5/+1
\| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|