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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' ↵	Rémy Coutable	2018-06-21	1	-0/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Set request.format in commits_controller Closes #48144 et #48143 See merge request gitlab-org/gitlab-ce!20023
\| *	[Rails5] Set request.format in commits_controllerblackst0ne-rails5-set-request-format-in--commits-controller	blackst0ne	2018-06-20	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5.0 `request.format` is being set depending on the route extension. In commits pages we pass a ref as a URL parameter. If the ref is an extension-like, Rails converts it and sets to `request.format`. E.g. if the ref is `some_branch.atom`, Rails starts responding with `atom` format, but it should response with `html` because `.atom` is the part of ref name, not the format. This commit explicitly sets `request.format` to `:html` when needed.
* \|	Merge branch 'dm-label-reference-period' into 'master'	Sean McGivern	2018-06-21	1	-5/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Properly detect label reference if followed by period or question mark See merge request gitlab-org/gitlab-ce!19965
\| * \|	Properly detect label reference if followed by period or question mark	Douwe Maan	2018-06-18	1	-5/+10
\| \| \|
* \| \|	Merge branch 'bvl-finder-methods-cop' into 'master'	Douwe Maan	2018-06-21	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a cop for `FinderMethods` Closes #42705 See merge request gitlab-org/gitlab-ce!19951
\| * \| \|	Add a cop for `FinderMethods`bvl-finder-methods-cop	Bob Van Landuyt	2018-06-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This notifies developers when calling `find(_by!)` chained on `execute`. And suggests using the methods from `FinderMethods`. These will perform the correct authorization checks on the resource when it is found.
* \| \| \|	Merge branch 'sh-fallback-to-first-tab-signin' into 'master'	Clement Ho	2018-06-20	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to the first sign-in tab if the local storage value is bad See merge request gitlab-org/gitlab-ce!20050
\| * \| \| \|	Fall back to the first sign-in tab if the local storage value is bad	Stan Hu	2018-06-20	1	-0/+5
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If `current_signin_tab` is `#crowd`, then no tab will be active. Fix this by using the first available tab. Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20049#note_82996324
* \| \| \|	Merge branch 'jr-48133-web-ide-commit-ellipsis' into 'master'	Tim Zallmann	2018-06-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Web IDE "Commit" button should indicate when there's a subsequent step" Closes #48133 See merge request gitlab-org/gitlab-ce!20030
\| * \| \| \|	Add ellipsis to Web IDE commit buttonjr-48133-web-ide-commit-ellipsis	James Ramsay	2018-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The blue shortcut commit button opens the commit interface to actually perform the commit. The ellipsis indicates the button doesn't immediately perform the commit.
* \| \| \| \|	Merge branch '47488-remove-unmergeable-notification-for-no-commits' into ↵	Robert Speicher	2018-06-20	5	-24/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!19548
\| * \| \| \| \|	Notify only when unmergeable due to conflict	Mark Chao	2018-06-20	5	-24/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is still the edge case when 'no commits' changes to 'conflict' would not trigger notification, which we ignore for now. Calling can_be_merged? can cause exception (e.g. non-UTF8) Ignore those by rescueing. Remove unmergeable_reason as now only conflict is notified Update spec
* \| \| \| \| \|	Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into ↵	Mike Greiling	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Custom logo rendering improperly on sign-in page" Closes #47964 See merge request gitlab-org/gitlab-ce!20037
\| * \| \| \| \| \|	Fix navigation bar center logo for custom logos	Clement Ho	2018-06-20	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Backport code from gitlab-ee!6182	Lukas Eipert	2018-06-20	2	-10/+55
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'highlight-cluster-settings-message' into 'master'	Rémy Coutable	2018-06-20	1	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Highlight cluster settings message Closes #41274 See merge request gitlab-org/gitlab-ce!19996
\| * \| \| \| \| \|	Highlight cluster settings message	George Tsiolis	2018-06-19	1	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-06-20	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48153-date-selection-dialog-broken-when-creating-a-new-milestone' into 'master' Resolve "Date selection dialog broken when creating a new milestone" Closes #48153 See merge request gitlab-org/gitlab-ce!20033
\| * \| \| \| \| \| \|	Prevent browser autocomplete for milestone date fields	Mark Fletcher	2018-06-20	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'leipert-eslint-report-unused-directives' into 'master'	Mike Greiling	2018-06-20	74	-97/+83
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use eslint to find unused directives See merge request gitlab-org/gitlab-ce!19940
\| * \| \| \| \| \| \| \|	remove all unused eslint-disable rules	Lukas Eipert	2018-06-20	74	-97/+83
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'"	Clement Ho	2018-06-20	2	-6/+0
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !19873
* \| \| \| \| \| \|	Merge branch 'zj-can-be-merged' into 'master'	Douwe Maan	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move mergablility check to Gitaly Closes gitaly#889 See merge request gitlab-org/gitlab-ce!20019
\| * \| \| \| \| \| \|	Move mergablility check to Gitalyzj-can-be-merged	Zeger-Jan van de Weg	2018-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/889
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-06-20	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled' into 'master' Operations and Kubernetes option should be omitted when repository or builds are disabled Closes #47631 See merge request gitlab-org/gitlab-ce!19835
\| * \| \| \| \| \| \|	Operations and Kubernetes items are now omitted in the sidebar when ↵47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled	Tiago Botelho	2018-06-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository or builds are disabled
* \| \| \| \| \| \| \|	Resolve "Unable to install Prometheus on Clusters: 'Error: Chart ↵	Mayra Cabrera	2018-06-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	incompatible with Tiller v2.7.0'"
* \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48142' into 'master'	Rémy Coutable	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix Admin::HooksController Closes #48142 See merge request gitlab-org/gitlab-ce!20017
\| * \| \| \| \| \| \| \|	Rails5 fix Admin::HooksController	Jasper Maes	2018-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '48100-fix-branch-not-shown' into 'master'	Rémy Coutable	2018-06-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Set the language setting to something other than English, the branch of Merge Request will not be visible." Closes #48100 See merge request gitlab-org/gitlab-ce!20016
\| * \| \| \| \| \| \| \| \|	The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shown	Hiroyuki Sato	2018-06-20	1	-2/+2
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48141' into 'master'	Rémy Coutable	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix expected: 0 times with any arguments received: 1 time with… Closes #48141 See merge request gitlab-org/gitlab-ce!20018
\| * \| \| \| \| \| \| \|	Rails5 fix expected: 0 times with any arguments received: 1 time with ↵	Jasper Maes	2018-06-20	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arguments: DashboardController
* \| \| \| \| \| \| \|	More gitaly disk access blocks	Jacob Vosmaer (GitLab)	2018-06-20	2	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '47959-rails5-redis-timewithzone' into 'master'	Sean McGivern	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Rails5] expected "2018-05-07 13:53:08 UTC" to be an instance of ActiveSupport::TimeWithZone" Closes #47959 See merge request gitlab-org/gitlab-ce!20000
\| * \| \| \| \| \| \|	Fix redis_cacheable deserialization47959-rails5-redis-timewithzone	Mario de la Ossa	2018-06-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Updated horizontal ellipsis icon for text-expander	Constance Okoghenun	2018-06-20	4	-6/+22
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "Branch name status color is not correct anymore"	Clement Ho	2018-06-19	3	-5/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "Remove “commented” from comment system notes"	Constance Okoghenun	2018-06-19	2	-3/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'	Clement Ho	2018-06-19	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cancel automatic merge button height Closes #48052 See merge request gitlab-org/gitlab-ce!19977
\| * \| \| \| \| \| \|	Fix cancel automatic merge button height	Jose	2018-06-19	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'	Tim Zallmann	2018-06-19	2	-0/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing underline on focus states for anchor tags Closes #47748 See merge request gitlab-org/gitlab-ce!19873
\| * \| \| \| \| \| \|	Fix missing underline on focus states for anchor tagsjivl-fix-focused-links-missing-underline	Jose	2018-06-15	2	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '48047-project-integrations' into 'master'	Clement Ho	2018-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Frontend issues in integrations page" See merge request gitlab-org/gitlab-ce!19970
\| * \| \| \| \| \| \|	Fix integration table widths48047-project-integrations	Annabel Dunstone Gray	2018-06-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-fork-mandatory' into 'master'	Douwe Maan	2018-06-19	1	-21/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move forking to Gitaly Closes gitaly#817 and gitaly#1236 See merge request gitlab-org/gitlab-ce!19990
\| * \| \| \| \| \| \| \|	Move forking to Gitalyzj-fork-mandatory	Zeger-Jan van de Weg	2018-06-19	1	-21/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/817 Closes https://gitlab.com/gitlab-org/gitaly/issues/1236
* \| \| \| \| \| \| \| \|	Merge branch 'zj-counting-commits' into 'master'	Douwe Maan	2018-06-19	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Counting commits is done by Gitaly Closes gitaly#382 See merge request gitlab-org/gitlab-ce!19983
\| * \| \| \| \| \| \| \| \|	Counting commits is done by Gitalyzj-counting-commits	Zeger-Jan van de Weg	2018-06-19	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/382
* \| \| \| \| \| \| \| \| \|	Merge branch '45487-slack-tag-push-notifs' into 'master'	Sean McGivern	2018-06-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Slack Tag push notifications are not send (only default branch option)" Closes #45487 See merge request gitlab-org/gitlab-ce!19864