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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove trailing spacefix-labels-too-large-from-label-list-redesign	Luke Bennett	2018-06-12	1	-1/+1
\|
*	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-06-12	69	-181/+822
\|\ \| \| \| \| \| \|	fix-labels-too-large-from-label-list-redesign
\| *	Merge branch 'unify-ci-variables-form-row' into 'master'	Kamil Trzciński	2018-06-12	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	CE: Unify app/views/ci/variables/_variable_row.html.haml See merge request gitlab-org/gitlab-ce!19594
\| \| *	Add render_if_exists to variable env scopeunify-ci-variables-form-row	Lin Jen-Shin	2018-06-09	1	-0/+1
\| \| \|
\| * \|	Merge branch 'ide-project-img' into 'master'	Filipa Lacerda	2018-06-12	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix width of project avatar in Web IDE Closes #47696 See merge request gitlab-org/gitlab-ce!19647
\| \| * \|	Fix width of project avatar in Web IDEide-project-img	Phil Hughes	2018-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #47696
\| * \| \|	Merge branch ↵	Achilleas Pipinellis	2018-06-12	1	-5/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47731-update-docs-as-gke-cluster-creation-label-has-changed-from-project-id-to-project' into 'master' Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project"" Closes #47731 See merge request gitlab-org/gitlab-ce!19676
\| \| * \| \|	Resolve "Update docs as GKE cluster creation label has changed from "project ↵	Dennis Tang	2018-06-12	1	-5/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	ID" to "project""
\| * \| \|	Merge branch 'remove-favicon-blue.ico' into 'master'	Douwe Maan	2018-06-12	1	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove favicon-blue.ico because it's no longer used See merge request gitlab-org/gitlab-ce!19658
\| \| * \| \|	We already moved to png and this is no longer usedremove-favicon-blue.ico	Lin Jen-Shin	2018-06-12	1	-0/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'patch-28' into 'master'	Douwe Maan	2018-06-12	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in doc/development/README.md See merge request gitlab-org/gitlab-ce!19679
\| \| * \| \| \|	Fix typo in doc/development/README.md	Dennis Tang	2018-06-12	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'jr-6382-lfs-import-docs' into 'master'	Douwe Maan	2018-06-12	1	-0/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update import screenshot without LFS warning Closes gitlab-ee#6382 See merge request gitlab-org/gitlab-ce!19668
\| \| * \| \| \| \|	Update import screenshot without LFS warningjr-6382-lfs-import-docs	James Ramsay	2018-06-11	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for LFS object import was added by gitlab-org/gitlab-ce!18871 and should be reflected in the documentation.
\| * \| \| \| \| \|	Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'	Douwe Maan	2018-06-12	4	-4/+36
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes rejected pushes from maintainers Closes #46337 See merge request gitlab-org/gitlab-ce!18968
\| \| * \| \| \| \| \|	Fixes rejected pushes from maintainersbvl-fix-maintainer-push-rejected	Bob Van Landuyt	2018-06-11	4	-4/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before the push git would make a call to `/:namespace/:project/git-receive-pack`. This would perform an access check without a ref. So the `Project#branch_allows_maintainer_push?` would return false. This adjusts `Project#branch_allows_maintainer_push?` to return true when passing no branch name if there are merge requests open that would allow the user to push. The actual check then happens when a call to `/api/v4/internal/allowed` is made from a git hook.
\| * \| \| \| \| \| \|	Merge branch 'docs-coached-20180608-1' into 'master'	Achilleas Pipinellis	2018-06-12	1	-13/+45
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed/enhanced command-line documentation See merge request gitlab-org/gitlab-ce!19589
\| \| * \| \| \| \| \| \|	fixed/enhanced command-line documentation	Edwin Torres	2018-06-12	1	-13/+45
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'blackst0ne-update-gemfile-rails5-lock' into 'master'	Rémy Coutable	2018-06-12	1	-19/+19
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Update Gitlab.rails5.lock See merge request gitlab-org/gitlab-ce!19681
\| \| * \| \| \| \| \|	[Rails5] Update Gitlab.rails5.lockblackst0ne-update-gemfile-rails5-lock	blackst0ne	2018-06-12	1	-19/+19
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'fix-input-placeholder-color' into 'master'	Annabel Gray	2018-06-12	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix input placeholder text color Closes #47645 See merge request gitlab-org/gitlab-ce!19633
\| \| * \| \| \| \| \|	Fix input placeholder text colorfix-input-placeholder-color	Andreas Kämmerle	2018-06-11	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch ↵	Annabel Gray	2018-06-12	2	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47687-milestone-and-labels-dropdowns-are-misplaced-with-collapsed-sidebar' into 'master' Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar" Closes #47687 See merge request gitlab-org/gitlab-ce!19666
\| \| * \| \| \| \| \| \|	Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"47687-milestone-and-labels-dropdowns-are-misplaced-with-collapsed-sidebar	Clement Ho	2018-06-11	2	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'jivl-fix-import-gitlab-project-page' into 'master'	Annabel Gray	2018-06-11	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: New project > Import gitlab.com project page Closes #47357 See merge request gitlab-org/gitlab-ce!19656
\| \| * \| \| \| \| \| \| \|	fix styling of the gitlab import page	Jose	2018-06-11	1	-1/+1
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '47245-hr-avatar' into 'master'	Clement Ho	2018-06-11	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "avatar settings page hr is misbehaving" Closes #47245 See merge request gitlab-org/gitlab-ce!19667
\| \| * \| \| \| \| \| \| \|	Hide overflow on hr	Annabel Dunstone Gray	2018-06-11	1	-0/+4
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '47604-avatars-and-system-icons-for-mobile' into 'master'	Clement Ho	2018-06-11	2	-2/+7
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avatars and system icons on left of notes are shown on mobile Closes #47604 See merge request gitlab-org/gitlab-ce!19585
\| \| * \| \| \| \| \| \| \|	Make avatars/icons hidden on mobile	Takuya Noguchi	2018-06-08	2	-2/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '47522-revert-mr-modal' into 'master'	Annabel Gray	2018-06-11	2	-11/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Revert MR modal box is too smal after BS4" Closes #47522 See merge request gitlab-org/gitlab-ce!19603
\| \| * \| \| \| \| \| \| \| \|	Remove .row and .col-sm-12	Clement Ho	2018-06-11	1	-9/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix styling of revert MR modal	tauriedavis	2018-06-08	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-collapse-sidebar-button-color' into 'master'	Clement Ho	2018-06-11	1	-0/+8
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix collapse sidebar button color Closes #47354 See merge request gitlab-org/gitlab-ce!19662
\| \| * \| \| \| \| \| \| \| \| \|	Fix collapse sidebar button color	Jose	2018-06-11	1	-0/+8
\| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '47338-sign-in-btn' into 'master'	Clement Ho	2018-06-11	4	-11/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment of sign in/sign up button Closes #47338 See merge request gitlab-org/gitlab-ce!19587
\| \| * \| \| \| \| \| \| \| \|	Fix alignment of sign in/sign up button	Annabel Dunstone Gray	2018-06-08	4	-11/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'correct-gray-600' into 'master'	Annabel Gray	2018-06-11	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update $theme-gray-600 and $gl-text-color-tertiary values according to Design System Closes #47645 See merge request gitlab-org/gitlab-ce!19631
\| \| * \| \| \| \| \| \| \| \|	Update theme-gray-600 and gl-text-color-tertiary	Andreas Kämmerle	2018-06-11	1	-2/+2
\| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-merge-request-contribution-aligment' into 'master'	Annabel Gray	2018-06-11	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix contribution section aligment Closes #47606 See merge request gitlab-org/gitlab-ce!19592
\| \| * \| \| \| \| \| \| \| \|	Fix contribution section aligment	Jose	2018-06-08	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '47479-add-ssh-key-message-is-hard-to-read' into 'master'	Annabel Gray	2018-06-11	1	-1/+9
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add SSH key message is hard to read" Closes #47479 and gitlab-ee#6211 See merge request gitlab-org/gitlab-ce!19579
\| \| * \| \| \| \| \| \| \| \| \|	Removes the border-radius from the alerts	samdbeckham	2018-06-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Sets the colors and link colors in alerts/notices	samdbeckham	2018-06-11	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Adds the white color back to the alret banners	samdbeckham	2018-06-08	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-padding-commit-info' into 'master'	Annabel Gray	2018-06-11	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix padding in commit info Closes #47278 See merge request gitlab-org/gitlab-ce!19435
\| \| * \| \| \| \| \| \| \| \| \| \|	fix padding in commit info	Jose	2018-06-11	2	-1/+5
\| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-relax-project-import-spec' into 'master'	Mayra Cabrera	2018-06-11	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relax expectation in spec/models/project_spec.rb See merge request gitlab-org/gitlab-ce!19663
\| \| * \| \| \| \| \| \| \| \| \| \|	Relax expectation in spec/models/project_spec.rb	Stan Hu	2018-06-11	1	-1/+1
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multiple Sidekiq workers can run in the spec, causing `Project.find` to be run in different places. Instead of setting a fixed number of calls, just use `allow`.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-github-importer-improve-error' into 'master'	James Lopez	2018-06-11	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong See merge request gitlab-org/gitlab-ce!19653