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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'	Phil Hughes	2019-06-18	2	-7/+15
\|\ \| \| \| \| \| \| \| \|	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	2	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'generate-spans-for-sections' into 'master'	Sean McGivern	2019-06-17	2	-0/+52
\|\ \ \| \|/ \|/\| \| \| \| \|	Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
\| *	Update class names	Filipa Lacerda	2019-06-14	2	-3/+3
\| \|
\| *	Adds specs and changelog - squash	Filipa Lacerda	2019-06-13	2	-0/+52
\| \|
* \|	Merge branch 'error-pipelines-for-blocked-users' into 'master'	Grzegorz Bizon	2019-06-17	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preventing blocked users and their PipelineSchdules from creating new Pipelines Closes #47756 See merge request gitlab-org/gitlab-ce!27318
\| * \|	preventing blocked users and their PipelineSchdules from creating new Pipelines	drew cimino	2019-06-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	updated several specs and factories to accomodate new permissions
* \| \|	Merge branch 'revert-3a50fc5d' into 'master'	Filipa Lacerda	2019-06-17	7	-40/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-40/+23
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26853
* \| \| \|	Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵	Fatih Acet	2019-06-14	1	-18/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-18/+28
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Added diff suggestion popover	Phil Hughes	2019-06-14	4	-4/+50
\| \|/ / \|/\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
* \| \|	Fix missing deployment rockets in monitor dashboard	Dhiraj Bodicherla	2019-06-14	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed inconsistencies in variable names for deployment endpoints for monitoring dashboard which causes deployment rocket icons to disappear
* \| \|	Use scoped routes for labels and milestones	Dmitriy Zaporozhets	2019-06-13	3	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update frontend code to use /-/ scope for milestones and labels routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Remove the grafana_dashboard_link feature flag	Reuben Pereira	2019-06-12	1	-45/+16
\| \| \|
* \| \|	Merge branch 'sh-fix-resolve-button-not-available' into 'master'	Fatih Acet	2019-06-12	1	-2/+73
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-2/+73
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-1/+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	3	-1/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make API request for each chart
* \| \| \|	Merge branch 'prom-api-2' into 'master'	Mike Greiling	2019-06-12	3	-6/+186
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-6/+186
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* \| \| \|	Merge branch '59651-remove-unnecessary-decimal-places-on-chart-axes' into ↵	Phil Hughes	2019-06-12	1	-0/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Remove unnecessary decimal places on chart axes" Closes #59651 See merge request gitlab-org/gitlab-ce!29468
\| * \| \| \|	Strip trailing decimal zeros from Metrics axis59651-remove-unnecessary-decimal-places-on-chart-axes	Simon Knox	2019-06-12	1	-0/+14
\| \| \| \| \|
* \| \| \| \|	Merge branch '62788-clean-up-pagination' into 'master'	Phil Hughes	2019-06-12	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves table pagination component Closes #62788 See merge request gitlab-org/gitlab-ce!29543
\| * \| \| \| \|	Moves table pagination component	Filipa Lacerda	2019-06-12	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the table paginaiton component under the new pagination folder in vue shared components and updates all the paths
* \| \| \| \|	Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'	Lin Jen-Shin	2019-06-12	1	-54/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!12309: Remove merge request pipeline check in mergeable method See merge request gitlab-org/gitlab-ce!29074
\| * \| \| \| \|	Remove "target branch advanced" warning from FE code (CE)ce-remove-merge-request-pipeline-checkes	Nathan Friend	2019-06-12	1	-54/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the "target branch advanced" warning from the frontend as it is no longer needed due to the new merge trains feature.
* \| \| \| \|	Merge branch '9186-implement-atmtwps-state-to-mr-widget' into 'master'	Filipa Lacerda	2019-06-12	4	-67/+180
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for gitlab-org/gitlab-ee!12156: Update the merge request widget's "Merge" button to support merge trains See merge request gitlab-org/gitlab-ce!27594
\| * \| \| \| \|	Add merge train support to MR merge button (CE)9186-implement-atmtwps-state-to-mr-widget	Nathan Friend	2019-06-11	4	-67/+180
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the merge request widget's "Merge" button to support merge trains.
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2019-06-12	1	-3/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard' into 'master' Resolve "Target area for dropdown list items is too small on Metrics Dashboard" Closes #62300 See merge request gitlab-org/gitlab-ce!29458
\| * \| \| \|	Make time window links take up full dropdown width62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard	Simon Knox	2019-06-12	1	-3/+1
\| \|/ / /
* \| \| \|	Merge branch '62788-graphql-pagination' into 'master'	Phil Hughes	2019-06-11	1	-0/+70
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates pagination component graphql Closes #62788 See merge request gitlab-org/gitlab-ce!29277
\| * \| \|	Creates pagination component graphql	Filipa Lacerda	2019-06-11	1	-0/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	creates a pagination component for the graphql api
* \| \| \|	User link styling for commits	Marcel van Remmerden	2019-06-10	1	-1/+1
\| \| \| \|
* \| \| \|	Move Vue models from vue_shared to boards	Martin Hanzel	2019-06-07	5	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
* \| \| \|	Merge branch ↵	Stan Hu	2019-06-07	2	-0/+67
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137' into 'master' Allow masking if 8 or more characters in base64 See merge request gitlab-org/gitlab-ce!29143
\| * \| \|	Add masked toggle click to frontend specthomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137	mfluharty	2019-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to set masked to true before testing now that the default is false
\| * \| \|	Add frontend specs	mfluharty	2019-06-06	2	-0/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test that a regex is provided Test that it is the expected regex Test length of variable Test special character set
* \| \| \|	Merge branch 'ce-5276-2-update-stores-for-terminal-file-sync' into 'master'	Phil Hughes	2019-06-07	2	-2/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE of Part 2] 5276 Update existing stores for file terminal sync See merge request gitlab-org/gitlab-ce!29333
\| * \| \| \|	IDE trigger files change eventce-5276-2-update-stores-for-terminal-file-sync	Paul Slaughter	2019-06-07	2	-2/+19
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- On CMD+S when editor is focused - On editor blur - When file is created in tree - When file is removed in tree - When file is renamed in tree
* \| \| \|	Remove metrics_time_window feature flag	Sarah Yasonik	2019-06-07	1	-36/+4
\|/ / /
* \| \|	Change "Report abuse to GitLab" to more generic wording.	Marc Schwede	2019-06-06	1	-1/+1
\|/ /
* \|	Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into ↵	Phil Hughes	2019-06-06	6	-74/+261
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Default Web IDE's merge request checkbox to true" Closes #60034 See merge request gitlab-org/gitlab-ce!28665
\| * \|	Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-true	Sam Bigelow	2019-06-06	6	-74/+261
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Pull the new MR option out into it's own component - Default MR checkbox to true when creating a new MR and committing to a branch that does not have an MR - Still change the MR checkbox to false when a user is on a branch that already has an MR - Hide MR option when on a branch that already has an MR and committing to current branch - Don't default to true when committing directly to master
* \| \|	Use the selected time window for metrics dashboard	Sarah Yasonik	2019-06-06	1	-19/+51
\|/ /
* \|	Migrate old notes app test from Karma to Jest	Martin Hanzel	2019-06-05	1	-1048/+0
\| \|
* \|	Extract setListDetail() into issue boards store	Winnie Hellmann	2019-06-05	1	-0/+11
\| \|
* \|	Merge branch ↵	Filipa Lacerda	2019-06-05	1	-8/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61910-common_utils_spec-js-fails-locally-on-master-for-roundofffloat' into 'master' Resolve "common_utils_spec.js fails locally for roundOffFloat" Closes #61910 See merge request gitlab-org/gitlab-ce!28963
\| * \|	Fix broken floating point tests61910-common_utils_spec-js-fails-locally-on-master-for-roundofffloat	jboyson1	2019-05-30	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update tests to use toBeCloseTo instead of toBe for floating point checks. More info here: https://jestjs.io/docs/en/expect#tobeclosetonumber-numdigits
* \| \|	Merge branch 'jivanvl-add-single-stat-chart-component' into 'master'	Filipa Lacerda	2019-06-05	1	-0/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add single_stat chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!28948