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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove second primary button on wiki create and edit	George Tsiolis	2019-02-15	1	-3/+0
\|
*	Merge branch '57744-fix-vue-warning-for-is-locked' into 'master'	Fatih Acet	2019-02-15	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make sure isLocked passed to Vue is a boolean Closes #57744 See merge request gitlab-org/gitlab-ce!25284
\| *	Make sure isLocked passed to Vue is a boolean	Heinrich Lee Yu	2019-02-15	1	-1/+1
\| \|
* \|	Merge branch '57768-remove-vertical-line' into 'master'	Fatih Acet	2019-02-15	1	-5/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove vertical connecting line placeholder from diff discussion notes Closes #57768 See merge request gitlab-org/gitlab-ce!25292
\| * \|	Remove vertical connecting line placeholder from diff discussion notes	Annabel Dunstone Gray	2019-02-15	1	-5/+0
\| \| \|
* \| \|	Merge branch '54725-fix-emoji-button-active-state' into 'master'	Phil Hughes	2019-02-15	1	-3/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add reaction emoji styling is off" See merge request gitlab-org/gitlab-ce!25295
\| * \| \|	Fix hover and active state colors of award emoji button	Annabel Dunstone Gray	2019-02-15	1	-3/+7
\| \|/ /
* \| \|	Replaced part of diff file properties with diff viewer	Natalia Tepluhina	2019-02-15	14	-84/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- replaced file.too_large - replaced file.text - replaced file.collapsed
* \| \|	Merge branch 'sh-fix-issue-9787-ce' into 'master'	Douwe Maan	2019-02-15	2	-5/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport commit author changes from CE See merge request gitlab-org/gitlab-ce!25294
\| * \| \|	Backport commit author changes from CE	Stan Hu	2019-02-15	2	-5/+5
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	This backports the changes made in EE to fix merge request approvers from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9574.
* \| \|	Merge branch 'rs-admin-user-case-insensitive' into 'master'	Douwe Maan	2019-02-15	1	-3/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Admin section finds users case-insensitively Closes #55877 See merge request gitlab-org/gitlab-ce!25176
\| * \| \|	Admin section finds users case-insensitively	Robert Speicher	2019-02-12	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, if you entered a username in the URL manually to view a specific user, the lookup was done case-sensitively, despite usernames being case-insensitive, often resulting in a 404. We now use the same `find_routable!` logic as the non-admin Users controller.
* \| \| \|	Merge branch '50433-make-emoji-picker-bigger' into 'master'	Annabel Dunstone Gray	2019-02-15	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Make emoji picker bigger" Closes #50433 See merge request gitlab-org/gitlab-ce!25187
\| * \| \| \|	Make emoji picker bigger	Jacopo	2019-02-15	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The emoji picker shows 9 emoji for each row. On mobile devices the width is reduced to 7 emoji for each row.
* \| \| \| \|	Merge branch '55893-artifacts-download' into 'master'	Phil Hughes	2019-02-15	2	-16/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes dropdowns not working in Pipelines pages Closes #55893 and #56071 See merge request gitlab-org/gitlab-ce!25043
\| * \| \| \| \|	Fixes not working dropdowns in pipelines page55893-artifacts-download	Filipa Lacerda	2019-02-13	2	-16/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	glbutton is not meant to work with old dropdowns This commit reverts the update to use gl button and adds i18n to some missing strings
* \| \| \| \| \|	Merge branch '56332-exclude-public-group-milestones-from-count' into 'master'	Stan Hu	2019-02-15	1	-3/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude public group milestones from counts in milestones dashboard Closes #56332 See merge request gitlab-org/gitlab-ce!25230
\| * \| \| \| \|	Exclude public group milestones from counts	Heinrich Lee Yu	2019-02-14	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only count milestones in groups that the user is a member of
* \| \| \| \| \|	Merge branch 'remove-ignored-columns' into 'master'	Lin Jen-Shin	2019-02-15	1	-3/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove two ignored columns See merge request gitlab-org/gitlab-ce!25250
\| * \| \| \| \| \|	Remove two ignored columns	Nick Thomas	2019-02-14	1	-3/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '57650-remove-tld-validation-from-cluster' into 'master'	Nick Thomas	2019-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove TLD validation from cluster domain Closes #57650 See merge request gitlab-org/gitlab-ce!25262
\| * \| \| \| \| \| \|	Remove TLD validation from Cluster#domain	Dylan Griffith	2019-02-14	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '55206-discussion-text-alignment' into 'master'	Annabel Dunstone Gray	2019-02-15	2	-25/+35
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly align resolved discussion text Closes #55206 See merge request gitlab-org/gitlab-ce!25001
\| * \| \| \| \| \| \| \|	Prevent line breaks in note timestamp55206-discussion-text-alignment	Mark Florian	2019-02-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For better readability.
\| * \| \| \| \| \| \| \|	Allow wrapping of note headline	Mark Florian	2019-02-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents a horizontal scrollbar from appearing in Firefox in certain situations. See the [merge request][1] for more details and discussion. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25001#note_141208011
\| * \| \| \| \| \| \| \|	Correctly align resolved discussion text	Mark Florian	2019-02-12	2	-24/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The header of the `NoteableDiscussion` component is really a media object[1], but it didn't have the right DOM or styling to correctly achieve it. This change wraps all the children of the media object (except the floated image) in a dedicated `.timeline-content` element, which is styled to establish its own block formatting context[2]. This ensures all of its children sit left-aligned to the right edge of the float. In short, the DOM used to look like this: .discussion-header .timeline-icon note-header note-edited-text and now it looks like this: .discussion-header .timeline-icon .timeline-content (with own formatting context) note-header note-edited-text This is also now more consistent with the DOM of `NoteableNote`, in that `.timeline-icon` and `.timeline-content` seem to want to be siblings. [1]: http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/ [2]: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
* \| \| \| \| \| \| \| \|	Merge branch 'import-go-to-project-cta-nibble-backend' into 'master'	Lin Jen-Shin	2019-02-15	33	-126/+895
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BE Improve the GitHub and Gitea import feature table interface See merge request gitlab-org/gitlab-ce!24606
\| * \| \| \| \| \| \| \| \|	Improve the GitHub and Gitea import feature table interfaceimport-go-to-project-cta-nibble-frontend	Luke Bennett	2019-02-13	23	-80/+738
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are frontend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
\| * \| \| \| \| \| \| \| \|	Improve the GitHub and Gitea import feature table interface	Luke Bennett	2019-02-13	11	-46/+157
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are backend changes. Use Vue for the import feature UI for "githubish" providers (GitHub and Gitea). Add "Go to project" button after a successful import. Use CI-style status icons and improve spacing of the table and its component. Adds ETag polling to the github and gitea import jobs endpoint.
* \| \| \| \| \| \| \| \|	Rename scope to imply :installed and :updated result	João Cunha	2019-02-15	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds to specs the case where apps are also updated - Rename scope calls on Gitlab::UsageData and Clusters::Cluster - Removes a duplicated spec
* \| \| \| \| \| \| \| \|	Base pipeline must be from target branch	Olivier Gonzalez	2019-02-15	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '56485-implement-graphql-mergerequestsresolver' into 'master'	James Lopez	2019-02-15	5	-8/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Implement GraphQL MergeRequestsResolver" Closes #56485 See merge request gitlab-org/gitlab-ce!24805
\| * \| \| \| \| \| \| \| \|	Use a block and move setup to example directly56485-implement-graphql-mergerequestsresolver	Lin Jen-Shin	2019-02-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Implement singular iid for IssuesResolver and ProjectType	Lin Jen-Shin	2019-02-14	3	-4/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow authorize on array of objects for GraphQL	Lin Jen-Shin	2019-02-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And add tests
\| * \| \| \| \| \| \| \| \|	Add field mergeRequests for project in GraphQL	Lin Jen-Shin	2019-02-14	4	-6/+32
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And fix the tests so that it won't run into circular paths.
* \| \| \| \| \| \| \| \|	Merge branch 'ce-1979-fe-multiple-approval-rules' into 'master'	Phil Hughes	2019-02-15	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port of Multiple merge request approval rules See merge request gitlab-org/gitlab-ce!25193
\| * \| \| \| \| \| \| \| \|	CE Port of Multiple merge request approval rules	Paul Slaughter	2019-02-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
* \| \| \| \| \| \| \| \| \|	Merge branch '57692-fix-rendering-of-none-any' into 'master'	Phil Hughes	2019-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search bar rendering `none` and `any` as users" Closes #57692 See merge request gitlab-org/gitlab-ce!25235
\| * \| \| \| \| \| \| \| \|	Fix rendering of user token special values	Heinrich Lee Yu	2019-02-14	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include capitalized `none` and `any` as special values
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-board-user-assigns' into 'master'	Douglas Barbosa Alexandre	2019-02-14	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 403 errors when adding an assignee list in project boards Closes gitlab-ee#9727 See merge request gitlab-org/gitlab-ce!25263
\| * \| \| \| \| \| \| \| \|	Fix 403 errors when adding an assignee list in project boards	Stan Hu	2019-02-14	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a bug in `BoardPolicy`, users were getting back a 403 error when trying to assign users to an assignee list and seeing "Something went wrong while fetching assignees list". For some reason, the declarative policy runtime was ignoring the ternary condition. To work around the issue, we make the project board an explicit condition check. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9727
* \| \| \| \| \| \| \| \| \|	Merge branch 'web-ide-commit-header-icon-alignment-fix' into 'master'	Filipa Lacerda	2019-02-14	2	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes alignment of changed icon in Web IDE Closes #57649 See merge request gitlab-org/gitlab-ce!25202
\| * \| \| \| \| \| \| \| \| \|	Fixes alignment of changed icon in Web IDE	Phil Hughes	2019-02-13	2	-2/+12
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57649
* \| \| \| \| \| \| \| \| \|	Update Metrics references to Object path	Sarah Yasonik	2019-02-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On reload, references to Metrics within classes in the Gitlab::Metrics module fail. Update all references to ::Gitlab::Metrics so that constant lookup finds the right module in development. This fix should not impact production.
* \| \| \| \| \| \| \| \| \|	Merge branch 'tz-stylelint' into 'master'	Annabel Dunstone Gray	2019-02-14	14	-46/+40
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Stylelint Setup See merge request gitlab-org/gitlab-ce!25148
\| * \| \| \| \| \| \| \| \|	Added Stylelint Setup	Tim Zallmann	2019-02-14	14	-46/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added stylelint to static-analysis Updated yarn dependencies CSS Fixes and rule adoptions of stylelint Added stylelint-scss Deduplicated yarn.lock to clear dependencies
* \| \| \| \| \| \| \| \| \|	Merge branch 'reduce-diff-with-ee-in-app-services' into 'master'	Lin Jen-Shin	2019-02-14	12	-35/+61
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce remaining diff with EE in app/services See merge request gitlab-org/gitlab-ce!24968
\| * \| \| \| \| \| \| \| \| \|	Reduce remaining diff with EE in app/services	Rémy Coutable	2019-02-14	12	-35/+61
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Add fix for suggested changes syntax highlighting	Annabel Dunstone Gray	2019-02-14	3	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the `note-text` class since it conflicted other classes.