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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'graphql-file-renames' into 'master'	Kushal Pandya	2019-06-20	11	-6/+6
\|\ \| \| \| \| \| \| \| \|	Rename graphql files to match frontend docs See merge request gitlab-org/gitlab-ce!29856
\| *	Rename graphql files to match frontend docs	Phil Hughes	2019-06-19	11	-6/+6
\| \|
* \|	Merge branch 'api-js-forked-projects' into 'master'	Filipa Lacerda	2019-06-19	1	-0/+16
\|\ \ \| \|/ \|/\| \| \| \| \|	Added forked projects API call function See merge request gitlab-org/gitlab-ce!29841
\| *	Added forked projects API call function	Phil Hughes	2019-06-19	1	-0/+16
\| \| \| \| \| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* \|	Resolve "Username availability checker breaks inline validation"	Jiaan	2019-06-19	2	-102/+48
\|/
*	Merge branch 'chore/rename-variable-ce' into 'master'	Mike Greiling	2019-06-18	2	-3/+3
\|\ \| \| \| \| \| \| \| \|	Rename TOKEN_TYPES to USER_TOKEN_TYPES See merge request gitlab-org/gitlab-ce!29785
\| *	Rename TOKEN_TYPES to USER_TOKEN_TYPES	Arun Kumar Mohan	2019-06-18	2	-3/+3
\| \|
* \|	Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'	Phil Hughes	2019-06-18	3	-3/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix IDE commit to use start_ref See merge request gitlab-org/gitlab-ce!29769
\| * \|	Fix IDE commit to use start_ref59023-fix-web-ide-creating-branches-off-new-commits	Paul Slaughter	2019-06-17	3	-3/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? The branch HEAD could be changed since the IDE was opened. This leads to user's unintentionally creating commits that overwrite other changes. https://gitlab.com/gitlab-org/gitlab-ce/issues/59023
* \| \|	Merge branch ↵	Phil Hughes	2019-06-18	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontend' into 'master' Resolve "The GraphQL query for the MR popover failes on the frontend" Closes #63261 See merge request gitlab-org/gitlab-ce!29712
\| * \|	Make IID string instead of ID in mr popover query63261-the-graphql-query-for-the-mr-popover-failes-on-the-frontend	Sam Bigelow	2019-06-14	1	-1/+1
\| \| \|
* \| \|	Merge branch 'review-toolbar-data-addition-ce-backport' into 'master'	Filipa Lacerda	2019-06-17	2	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Toolbar backport changes for CE See merge request gitlab-org/gitlab-ce!29758
\| * \| \|	Add backport linesreview-toolbar-data-addition-ce-backport	sarahghp	2019-06-17	2	-0/+2
\| \| \| \|
* \| \| \|	Backport fix MR search by approvers	Justin Boyson	2019-06-17	3	-2/+5
\| \| \| \|
* \| \| \|	Merge branch 'visual-review-apps-fix-dropdown' into 'master'	Mike Greiling	2019-06-17	2	-11/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Dropdown to Stick to MR View App Button Closes gitlab-ee#12184 See merge request gitlab-org/gitlab-ce!29767
\| * \| \| \|	Move Dropdown to Stick to MR View App Button	Andrew Fontaine	2019-06-17	2	-11/+6
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The dropdown of changed pages in the review app should be attached to the view app button. This moves it to the correct place. The Review App button is to the right of both of those.
* \| \| \|	Merge branch 'generate-spans-for-sections' into 'master'	Sean McGivern	2019-06-17	1	-10/+43
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
\| * \| \|	Update class names	Filipa Lacerda	2019-06-14	1	-1/+1
\| \| \| \|
\| * \| \|	Adds specs and changelog - squash	Filipa Lacerda	2019-06-13	1	-6/+5
\| \| \| \|
\| * \| \|	Adds margins to the section lines	Filipa Lacerda	2019-06-12	1	-8/+9
\| \| \| \|
\| * \| \|	Moves JS into the vue component	Filipa Lacerda	2019-06-12	1	-10/+43
\| \| \| \|
* \| \| \|	Merge branch 'ce-11981-show-merge-train-position' into 'master'	Filipa Lacerda	2019-06-17	1	-0/+11
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!14064: Add merge train position indicator See merge request gitlab-org/gitlab-ce!29561
\| * \| \|	Add merge train position message (CE)	Nathan Friend	2019-06-17	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds an informational message under the pipeline block in the merge request widget that displays the current position of the merge request on the merge train.
* \| \| \|	Fix plan stage query	Gosia Ksionek	2019-06-17	2	-61/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix plan stage query and the way it is displayed
* \| \| \|	Resolve "Docker registry date not accurate"	Nick Kipling	2019-06-17	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'revert-3a50fc5d' into 'master'	Filipa Lacerda	2019-06-17	6	-76/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
\| * \| \| \|	Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5d	Kamil Trzciński	2019-06-14	6	-76/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26853
* \| \| \| \|	Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵	Fatih Acet	2019-06-14	1	-5/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge request tabs do not handle ctrl+click correctly" Closes #57813 See merge request gitlab-org/gitlab-ce!29506
\| * \| \| \|	Allow command and control click to work on MR tabs57813-merge-request-tabs-do-not-handle-ctrl-click-correctly	Sam Bigelow	2019-06-12	1	-5/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2019-06-15	13	-77/+189
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	62966-embed-zoom-call-in-issue-mvc
\| * \ \ \ \	Merge branch 'diff-suggestions-popover' into 'master'	Filipa Lacerda	2019-06-14	11	-68/+165
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added diff suggestion popover Closes #56523 See merge request gitlab-org/gitlab-ce!29473
\| \| * \| \| \| \|	Added diff suggestion popover	Phil Hughes	2019-06-14	11	-68/+165
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
\| * \| \| \| \|	Upgrade gitlab-ui and migrate gl-pagination	Paul Gascou-Vaillancourt	2019-06-14	2	-9/+24
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Upgraded gitlab-ui to v4.0.0 - Migrated pagination_links to reflect breaking changes introduced in gitlab-ui v4.0.0
* \| \| \| \|	Add Join meeting button to Issues with Zoom links62966-embed-zoom-call-in-issue-mvc	Simon Knox	2019-06-14	2	-0/+55
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect links containing zoom.us followed by j, s, or my Add link below Issue title that links to Zoom meeting
* \| \| \|	Fix missing deployment rockets in monitor dashboard	Dhiraj Bodicherla	2019-06-14	2	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed inconsistencies in variable names for deployment endpoints for monitoring dashboard which causes deployment rocket icons to disappear
* \| \| \|	Merge branch 'fix-flyout-navs' into 'master'	Phil Hughes	2019-06-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sidebar flyout navigation See merge request gitlab-org/gitlab-ce!29571
\| * \| \| \|	Fix sidebar flyout navigationfix-flyout-navs	Luke Bennett	2019-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show flyout nav for active item when collapsed.
* \| \| \| \|	Exclude preexisting lint issues for i18nfix-static-analysis-visual_review_toolbar	Thong Kuah	2019-06-14	4	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was done in an MR pre https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26789
* \| \| \| \|	Breakup first pass	Sarah Groff Hennigh-Palermo	2019-06-14	13	-1/+571
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It has a lot of files because that's the point
* \| \| \| \|	Use scoped routes for labels and milestones	Dmitriy Zaporozhets	2019-06-13	4	-7/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update frontend code to use /-/ scope for milestones and labels routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Disable unnecessary ESLint i18n offences	Brandon Labuschagne	2019-06-13	11	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unnecessary offences include false positives as well as flagged errors which have follow up issues in order to be addressed. Not all issues have been addressed before this being submitted in the spirit of results and iteration.
* \| \| \| \|	Click file row in repository Vue app to view file	Phil Hughes	2019-06-13	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Remove the grafana_dashboard_link feature flag	Reuben Pereira	2019-06-12	1	-8/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-fix-resolve-button-not-available' into 'master'	Fatih Acet	2019-06-12	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Resolve conflicts" button not appearing for some users Closes #47954 See merge request gitlab-org/gitlab-ce!29535
\| * \| \| \|	Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-available	Stan Hu	2019-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the frontend assumed that the user had to be able to merge to that project in order to resolve conflicts. However, this is overly restrictive, as the user only has to be able to push to the source branch. In fact, appending the text /conflicts to the merge request would bring up the conflict resolution page. This confusion happens when a project contains a protected branch that only allows maintainers to push. Users with Developer access no longer have permission to merge, but they still can create branches in that project. To fix this issue, we now loosen the permission check for the "Resolve conflicts" button and only check for access to push to the source branch. This is consistent with what the backend does in MergeRequests::Conflicts::ListService#can_be_resolved_by?. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
* \| \| \| \|	Merge branch 'prom-api-3' into 'master'	Mike Greiling	2019-06-12	7	-13/+117
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch charts to Prometheus API endpoint CE-3 Closes #58516 See merge request gitlab-org/gitlab-ce!29280
\| * \| \| \| \|	Use Prometheus API for dashboard metricsprom-api-3	Simon Knox	2019-06-07	7	-13/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make API request for each chart
* \| \| \| \| \|	Merge branch 'prom-api-2' into 'master'	Mike Greiling	2019-06-12	8	-7/+79
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| / / \| \|_\|_\|/ / \|/\| \| \| \|	Switch charts to Prometheus API endpoint CE-2 See merge request gitlab-org/gitlab-ce!29226
\| * \| \| \|	Add feature flag and dashboard endpointprom-api-2	Simon Knox	2019-06-07	8	-7/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* \| \| \| \|	Extract ide_status_list from ide_status_bar	Paul Slaughter	2019-06-12	3	-14/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? The ide_status_list will be used and extended in EE.