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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'merge-dev-to-master' into 'master'	John Jarvis	2019-03-05	1	-0/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Merge dev.gitlab.org master into GitLab.com master Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787 See merge request gitlab-org/gitlab-ce!25746
\| *	Merge dev master into GitLab.com master	Yorick Peterse	2019-03-04	1	-0/+19
\| \|\
\| \| *	Merge branch 'security-mermaid' into 'master'	Yorick Peterse	2019-03-04	1	-0/+19
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit number of characters allowed in mermaidjs See merge request gitlab/gitlabhq!2964
\| \| \| *	Limit number of characters allowed in mermaidjs	Rajat Jain	2019-02-27	1	-0/+19
\| \| \| \|
* \| \| \|	Merge branch '49663-branch-to-mr-connection' into 'master'	Phil Hughes	2019-03-05	4	-11/+70
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to the MR from current branch in Web IDE Closes #49663 See merge request gitlab-org/gitlab-ce!25689
\| * \| \|	Extended Web IDE API to get MRs for a certain branch in a project	Denys Mishunov	2019-03-04	4	-11/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New `Api.projectMergeRequests` allows: - to query for all MRs on a project without specifying `mergeRequestId` - to filter the returned MRs using parameters from https://bit.ly/2H7We4V The new API request is used for fetching information about MRs associated with a particular branch in Web IDE to have IdeSidebar behave consistently in both scenarios: - getting to a branch from and MR (where we already have info about relevant MR), or - getting to a branch somehow differently directly For cases where there are several merge requests that the current branch is associated with, mark the most recent one as 'current' Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49663
* \| \| \|	Removes EE differences from ci_icon.vue	Filipa Lacerda	2019-03-04	1	-0/+1
\| \| \| \|
* \| \| \|	Fixed mutation for root	Natalia Tepluhina	2019-03-04	4	-23/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- fixed test spec - added warning only if file is deleted
* \| \| \|	Merge branch 'issuable-ee-differences-ce' into 'master'	Filipa Lacerda	2019-03-04	4	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of issuable-ee-differences See merge request gitlab-org/gitlab-ce!25730
\| * \| \| \|	Update index.js	Phil Hughes	2019-03-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	CE backport of issuable-ee-differences	Phil Hughes	2019-03-04	4	-4/+4
\| \| \| \| \|
* \| \| \| \|	Fix username escaping when clicking 'assign to me'	Ezekiel Kigbo	2019-03-04	1	-14/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec for assigning user with apostrophe in name
* \| \| \| \|	CE backport of batch-comments-ee-store-module	Phil Hughes	2019-03-04	4	-66/+88
\| \| \| \| \|
* \| \| \| \|	Merge branch 'winh-import_projects_table_spec' into 'master'	Fatih Acet	2019-03-04	2	-7/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use factory method for import_projects store Closes gitlab-ee#10062 See merge request gitlab-org/gitlab-ce!25646
\| * \| \| \| \|	Use factory method for import_projects store	Winnie Hellmann	2019-03-01	2	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure we always create a new instance of the import_projects store.
* \| \| \| \| \|	Merge branch '10021-mr-widget-ee' into 'master'	Phil Hughes	2019-03-04	2	-14/+36
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves EE diferences to CE for mr_widget_pipeline Closes gitlab-ee#10021 See merge request gitlab-org/gitlab-ce!25688
\| * \| \| \| \|	Moves EE diferences to CE for mr_widget_pipeline	Filipa Lacerda	2019-03-01	2	-14/+36
\| \| \| \| \| \|
* \| \| \| \| \|	Creates a function to check if repo is EE	Filipa Lacerda	2019-03-04	2	-0/+18
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds EE information to gon Creates a global vue mixin
* \| \| \| \|	Refactor model and spec	Reuben Pereira	2019-03-01	12	-0/+587
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move some specs into contexts - Let get_slugs method take a parameter and return a specific slug. - Add rescues when using Addressable::URI.
* \| \| \| \|	Merge branch '10097-number-utils' into 'master'	Phil Hughes	2019-03-01	1	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves EE differences out of number_utils.js Closes gitlab-ee#10097 See merge request gitlab-org/gitlab-ce!25680
\| * \| \| \| \|	Moves utility function into CE	Filipa Lacerda	2019-03-01	1	-0/+19
\| \|/ / / /
* \| \| \| \|	Merge branch ↵	Phil Hughes	2019-03-01	2	-21/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57991-frontend-pagination-needs-to-handle-cases-where-the-x-total-pages-header-isn-t-present' into 'master' Improve the JS pagination to handle the case when the `X-Total` and `X-Total-Pages` headers aren't present Closes #57991 See merge request gitlab-org/gitlab-ce!25601
\| * \| \| \| \|	Make JS pagination handle missing 'X-Total-Pages' header	Rémy Coutable	2019-02-28	2	-21/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Move related issues shared components from EE	Fatih Acet	2019-03-01	2	-0/+271
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We will rewrite Related MRs widget in CE with Vue. It’s pretty much the same with Related Issues in EE. I made EE only components reusable and this is the CE backward compatability commit. Links: Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/57662 MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9730
* \| \| \| \|	Move EE differences in CE diff files into CE	Phil Hughes	2019-03-01	3	-8/+13
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9974, https://gitlab.com/gitlab-org/gitlab-ee/issues/9973, https://gitlab.com/gitlab-org/gitlab-ee/issues/9969
* \| \| \|	Merge branch '57734-improve-label-dropdown-selection-performance' into 'master'	Fatih Acet	2019-03-01	2	-29/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve labels select rendering Closes #48230 and #57734 See merge request gitlab-org/gitlab-ce!25281
\| * \| \| \|	Remove jQuery overhead in labels select rendering	Heinrich Lee Yu	2019-02-27	1	-11/+18
\| \| \| \| \|
\| * \| \| \|	Improve glDropdown rendering performance	Heinrich Lee Yu	2019-02-27	2	-19/+4
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Return jQuery element instead of HTML for renderRow for labels select
* \| \| \|	Externalize markdown toolbar tooltips	Enrique Alcántara	2019-03-01	1	-12/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace tooltip texts in the markdown toolbar with bindings to gettext calls Author: Enrique Alcantara <enrique@crunch.io>
* \| \| \|	CE port of noteable-discussion-ee-differences	Phil Hughes	2019-02-28	4	-2/+20
\| \|/ / \|/\| \|
* \| \|	Resolve "Add missing karma tests to the the MR Diff components"	Natalia Tepluhina	2019-02-28	2	-9/+8
\| \| \|
* \| \|	inherit DropdownUser from DropdownAjaxFilter	Alexis Reigel	2019-02-27	1	-63/+20
\| \| \|
* \| \|	use lazy ajax filter dropdown for runner tags	Alexis Reigel	2019-02-27	2	-1/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the potential number of available runner tags is too large to load it statically to a dropdown. we use the same lazy loaded dropdown as is used for the users dropdown already.
* \| \|	add tag filter to admin runners page	Alexis Reigel	2019-02-27	2	-0/+21
\| \| \|
* \| \|	Merge branch 'members-ee-code-ce' into 'master'	Filipa Lacerda	2019-02-27	3	-11/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of members-ee-code See merge request gitlab-org/gitlab-ce!25593
\| * \| \|	CE backport of members-ee-code	Phil Hughes	2019-02-27	3	-11/+20
\| \| \| \|
* \| \| \|	Fix misspellings in app/spec executable lines	Takuya Noguchi	2019-02-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \|	Merge branch 'qa-fix-import-github-repo-spec-2' into 'master'	Ramya Authappan	2019-02-27	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `import_github_repo_spec.rb` Closes #55700 See merge request gitlab-org/gitlab-ce!25133
\| * \| \| \|	Update GitHub Import test	Sanad Liaquat	2019-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the unnecessary :orchestrated tag and updates a few selectors. Also wait_for_success for import before proceeding. The test is currently placed in quarantine because of a bug.
* \| \| \| \|	Add Project template for go-micro	Jason Lenny	2019-02-27	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Fix inconsistent pagination styles	Clement Ho	2019-02-27	1	-2/+2
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'sh-wip-fix-duplicate-env-xhr' into 'master'	Filipa Lacerda	2019-02-27	1	-5/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pagination and duplicate requests in environments page Closes #58191 See merge request gitlab-org/gitlab-ce!25582
\| * \| \| \|	Add pagination spec and improve filtering of null values	Stan Hu	2019-02-26	1	-2/+6
\| \| \| \| \|
\| * \| \| \|	Fix pagination and duplicate requests in environments page	Stan Hu	2019-02-26	1	-5/+8
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes two problems: 1. When a user clicked on another page, the app would fetch the new page data but never update because the request and response parameters failed to match the isEqual check. This was happening because the JSON response omitted the `nested` attribute, so there was a comparison with a `null` value. We fix this by scrubbing undefined values before doing the comparison. 2. There were duplicate requests made for the environments page because the success handler of fetchPipelines() would cause the polling component to make another XHR request. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58191
* \| \| \|	Set up basic keyboard next/previous navigation in diff list	Denys Mishunov	2019-02-27	3	-3/+41
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mousetrap is used as the help-tool to listen to keystrokes Added currentDiffIndex getter to store that holds the index of currently active diff file in the list Instead of computing it on the component, we will take advantage of it being available for all components in DiffsApp Testing keyboard navigation and jumpToFile()
* \| \|	Merge branch ↵	Filipa Lacerda	2019-02-26	1	-1/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46750-ci-empty-environment-is-created-even-when-a-job-isn-t-run-when-manual' into 'master' Sort Environments by Last Updated Closes #46750 See merge request gitlab-org/gitlab-ce!25260
\| * \| \|	Sort Environments in Table by Last Updated	Andrew Fontaine	2019-02-25	1	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure folders push to the top, if both have no last update, sort by name. The sorting algorithm should sort in the following priorities: 1. folders first, 2. last updated descending, 3. by name ascending, the sorting algorithm must: 1. Sort by name ascending, 2. Reverse (sort by name descending), 3. Sort by last deployment ascending, 4. Reverse (last deployment descending, name ascending), 5. Put folders first. It is done this way, as `underscore`'s sort API is very basic: simple comparisons, sorting by ascending only.
* \| \| \|	Merge branch 'ce-revert-d5ce84fd' into 'master'	Lin Jen-Shin	2019-02-26	5	-3/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-82d7b5a0-ce' into 'master'" Closes #57857 and #50747 See merge request gitlab-org/gitlab-ce!25559
\| * \| \| \|	Merge branch 'fix-misspellings-app-comments' into 'master'	Rémy Coutable	2019-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix misspellings in app/spec comments See merge request gitlab-org/gitlab-ce!25517
\| * \| \| \|	Fix issues filter search token ee import	Luke Bennett	2019-02-26	2	-2/+2
\| \| \| \| \|