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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use nip.io instead of xip.iodz-use-nip-io	Dmitriy Zaporozhets	2018-06-12	4	-16/+16
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	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
\| * \| \| \| \| \| \| \|	GitHub Rake importer: Fail with a clearer explanation if GitLab username is ↵	Stan Hu	2018-06-11	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrong
* \| \| \| \| \| \| \| \|	Merge branch '46708-page-numbers' into 'master'	Clement Ho	2018-06-11	2	-0/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix color of page numbers" Closes #46708 See merge request gitlab-org/gitlab-ce!19599
\| * \| \| \| \| \| \| \| \|	Override BS4 pagination variables	Annabel Dunstone Gray	2018-06-08	2	-0/+24
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'unify-uploaders-objects_storage.rb' into 'master'	Robert Speicher	2018-06-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify from EE for app/uploaders/object_storage.rb See merge request gitlab-org/gitlab-ce!19660
\| * \| \| \| \| \| \| \| \| \|	Unify from EE for app/uploaders/object_storage.rb	Lin Jen-Shin	2018-06-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'unify-http_status.js' into 'master'	Clement Ho	2018-06-11	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add NOT_FOUND: 404 to http_status.js from EE See merge request gitlab-org/gitlab-ce!19659
\| * \| \| \| \| \| \| \| \| \| \|	Add NOT_FOUND: 404 from EE	Lin Jen-Shin	2018-06-12	1	-0/+1
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-expire-content-cache-after-import' into 'master'	Mayra Cabrera	2018-06-11	8	-14/+32
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
\| * \| \| \| \| \| \| \| \| \|	Fix Rubocop failure in spec/models/project_spec.rb	Stan Hu	2018-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Work around limitations of expect_any_instance_of by stubbing Project.find	Stan Hu	2018-06-11	3	-9/+23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Expire Wiki content cache after importing a repository	Stan Hu	2018-06-11	6	-5/+9
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-admin-gitaly-server-fix' into 'master'	Clement Ho	2018-06-11	2	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert extra CSS causing Gitaly Servers table to be misalgined Closes #47648 See merge request gitlab-org/gitlab-ce!19623
\| * \| \| \| \| \| \| \| \| \|	Fix translation placeholder for Gitaly address	Stan Hu	2018-06-10	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Revert extra CSS causing Gitaly Servers table to be misalgined	Stan Hu	2018-06-10	1	-1/+1
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #47648
* \| \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-rails5-boards' into 'master'	Rémy Coutable	2018-06-11	1	-6/+12
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Fix conversion of integer into string in board spec Closes #47653 See merge request gitlab-org/gitlab-ce!19616
\| * \| \| \| \| \| \| \| \|	Fix conversion of integer into string in board spec	Jan Provaznik	2018-06-09	1	-6/+12
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In rails 5 controller specs, integers are converted to strings unless conte-type is set with `as: :json`: https://github.com/rails/rails/issues/26069
* \| \| \| \| \| \| \| \|	Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'	Sean McGivern	2018-06-11	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Uploads specs are failing on master" Closes #47684 See merge request gitlab-org/gitlab-ce!19638
\| * \| \| \| \| \| \| \| \|	Don't use Rails.root.join for upload fixture paths	Rémy Coutable	2018-06-11	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'ide-etag-polling' into 'master'	Filipa Lacerda	2018-06-11	4	-28/+51
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636