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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-build	Rémy Coutable	2018-06-20	1	-0/+4
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'docs/48075-milestone-labels-can-be-confusing' into 'master'47964-custom-logo-rendering-improperly-on-sign-in-page	Mek Stittri	2018-06-20	1	-5/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Milestone labels can be confusing" Closes #48075 See merge request gitlab-org/gitlab-ce!19980
\| *	Resolve conflicts with latest workflow label changes	Mek Stittri	2018-06-20	138	-804/+1210
\| \|\ \| \|/ \|/\|
* \|	Merge branch 'bvl-errors-in-static-analysis' into 'master'	Sean McGivern	2018-06-20	2	-13/+30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates to the `gettext:updated_check` Closes #48113 See merge request gitlab-org/gitlab-ce!20002
\| * \|	More verbose errors in static-analysis	Bob Van Landuyt	2018-06-20	2	-13/+30
\| \| \| \| \| \| \| \| \| \| \| \|	This makes the output in static analysis a bit more verbose.
* \| \|	Merge branch 'zj-can-be-merged' into 'master'	Douwe Maan	2018-06-20	3	-44/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-44/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/889
* \| \| \|	Merge branch 'fix/favicon-cross-origin' into 'master'	Douwe Maan	2018-06-20	3	-5/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Serve favicon image always from the main GitLab domain to avoid issues with CORS Closes #47802 See merge request gitlab-org/gitlab-ce!19810
\| * \| \| \|	Fix: Serve favicon image always from the main GitLab domain to avoid issues ↵	Alexis Reigel	2018-06-20	3	-5/+35
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	with CORS
* \| \| \|	Merge branch ↵	Rémy Coutable	2018-06-20	3	-0/+44
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	3	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository or builds are disabled
* \| \| \| \|	Merge branch 'sh-bump-rugged-0.27.2' into 'master'	Rémy Coutable	2018-06-20	2	-1/+6
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rugged to 0.27.2 See merge request gitlab-org/gitlab-ce!20026
\| * \| \| \|	Bump rugged to 0.27.2sh-bump-rugged-0.27.2	Stan Hu	2018-06-20	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.2
* \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-06-20	2	-0/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes' into 'master' Resolve "[Rails5] Found new routes that could cause conflicts with existing namespaced routes" Closes #48010 See merge request gitlab-org/gitlab-ce!20015
\| * \| \| \| \|	[Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes	blackst0ne	2018-06-20	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5.0 the new framework has been added. It's called ActionCable. It brings WebSockets support to rails applications. By default the mountpoint of WebSocket requests is `/cable` [1]. GitLab allows using top level names as namespaces or usernames. For example, `gitlab.com/cable` at this moment leads to a user with the nickname `cable`. This commit changes ActionCable's mountpoint to a reserved top level word `-`. This is just a stub and should not be be used in real work. Please set correct mountpoints for each environments when configuring ActionCable for real using. [1]: https://github.com/rails/rails/blob/5-0-stable/actioncable/lib/action_cable.rb#L38
* \| \| \| \| \|	Merge branch 'docs/profile-preferences' into 'master'	Marcia Ramos	2018-06-20	1	-17/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the profile preferences docs See merge request gitlab-org/gitlab-ce!20031
\| * \| \| \| \| \|	Refactor the profile preferences docs	Achilleas Pipinellis	2018-06-20	1	-17/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-clarify-API-share-project-to-group' into 'master'	Achilleas Pipinellis	2018-06-20	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs clarify API to share project to a group See merge request gitlab-org/gitlab-ce!19301
\| * \| \| \| \| \| \|	Docs clarify API to share project to a groupdocs-clarify-API-share-project-to-group	Andrew Winata	2018-06-01	2	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '48126-fix-prometheus-installation' into 'master'	Kamil Trzciński (Conference till 20th)	2018-06-20	9	-34/+59
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible with Tiller v2.7.0'" Closes #48126 See merge request gitlab-org/gitlab-ce!20010
\| * \| \| \| \| \| \|	Resolve "Unable to install Prometheus on Clusters: 'Error: Chart ↵	Mayra Cabrera	2018-06-20	9	-34/+59
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	incompatible with Tiller v2.7.0'"
* \| \| \| \| \| \|	Merge branch 'docs/master-maintainer-note' into 'master'	Marcia Ramos	2018-06-20	1	-1/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about Master/Maintainer role See merge request gitlab-org/gitlab-ce!20028
\| * \| \| \| \| \| \|	Add note about Master/Maintainer role	Achilleas Pipinellis	2018-06-20	1	-1/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48142' into 'master'	Rémy Coutable	2018-06-20	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix Admin::HooksController Closes #48142 See merge request gitlab-org/gitlab-ce!20017
\| * \| \| \| \| \| \| \|	Rails5 fix Admin::HooksController	Jasper Maes	2018-06-20	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '48100-fix-branch-not-shown' into 'master'	Rémy Coutable	2018-06-20	3	-2/+24
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+24
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'clear-up-background-type-change-docs' into 'master'	Yorick Peterse	2018-06-20	1	-0/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for the cleanup step of a background column type change See merge request gitlab-org/gitlab-ce!20020
\| * \| \| \| \| \| \| \|	Add docs for the cleanup step of a background column type changeclear-up-background-type-change-docs	Sean McGivern	2018-06-19	1	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A background column type change needs a cleanup step, like any background migration. We should call that out explicitly in the documentation.
* \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48141' into 'master'	Rémy Coutable	2018-06-20	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+7
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	arguments: DashboardController
* \| \| \| \| \| \| \| \|	Merge branch 'go-1.10-source-installs' into 'master'	Nick Thomas	2018-06-20	2	-11/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Go 1.10 for source installations Closes gitaly#1231 See merge request gitlab-org/gitlab-ce!19989
\| * \| \| \| \| \| \| \| \|	Use Go 1.10 for source installationsgo-1.10-source-installs	Jacob Vosmaer	2018-06-19	2	-11/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'use-backup-custom-hooks-gitaly' into 'master'	Douwe Maan	2018-06-20	7	-70/+119
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly for backup rake task See merge request gitlab-org/gitlab-ce!19742
\| * \| \| \| \| \| \| \| \|	Move backup custom hooks up a leveluse-backup-custom-hooks-gitaly	Ahmad Hassan	2018-06-20	1	-4/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Output done for wiki and repo	Ahmad Hassan	2018-06-19	1	-14/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Migrate repo backup to gitaly	Ahmad Hassan	2018-06-15	7	-60/+122
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48104' into 'master'	Rémy Coutable	2018-06-20	2	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix expected: 1 time with arguments: (97, anything, {"squash"=>false}) received: 0 times Closes #48104 See merge request gitlab-org/gitlab-ce!20004
\| * \| \| \| \| \| \| \| \| \|	Rails5 fix expected: 1 time with arguments: (97, anything, ↵	Jasper Maes	2018-06-19	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	{"squash"=>false}) received: 0 times
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-pages-controller' into 'master'	Rémy Coutable	2018-06-20	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix Projects::PagesController spec See merge request gitlab-org/gitlab-ce!20007
\| * \| \| \| \| \| \| \| \| \| \|	Rails5 fix Projects::PagesController spec	Jasper Maes	2018-06-19	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-disk-access-5' into 'master'	Douwe Maan	2018-06-20	6	-1/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More gitaly disk access blocks See merge request gitlab-org/gitlab-ce!19892
\| * \| \| \| \| \| \| \| \| \| \| \|	More gitaly disk access blocks	Jacob Vosmaer (GitLab)	2018-06-20	6	-1/+9
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-5024-filename-search' into 'master'	Sean McGivern	2018-06-20	8	-6/+186
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement filtering by filename on code search Closes #43627 See merge request gitlab-org/gitlab-ce!19509
\| * \| \| \| \| \| \| \| \| \| \| \|	Implement filtering by filename on code searchce-5024-filename-search	Mario de la Ossa	2018-06-19	8	-6/+186
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '48105-git-version-detection-using-gitaly' into 'master'	Sean McGivern	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move git version detection to gitaly for usage ping data Closes #48105 and charts/gitlab#530 See merge request gitlab-org/gitlab-ce!19993
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitaly	Balasankar "Balu" C	2018-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Point out the specific anchor inside the document See merge request gitlab-org/gitlab-ce!19998