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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Merge branch 'id-extract-widget-into-different-request' into 'master'	Ash McKenzie	2019-06-28	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract MR's widget into a separate request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
\| * \|	Extract MR's widget into a separate endpointid-extract-widget-into-different-request	Igor Drozdov	2019-06-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
* \| \|	Rearrange discussion resolve buttons & update button display	Samantha Ming	2019-06-28	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- next-discuss button is always show unless there is only 1 discussion - regroup buttons arrangements
* \| \|	Merge branch ↵	Clement Ho	2019-06-27	1	-3/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable' into 'master' Turn commit sha in monitor charts popover to link Closes gitlab-ee#11888 See merge request gitlab-org/gitlab-ce!29914
\| * \| \|	Turn commit sha in monitor charts popover to link11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickable	Dhiraj Bodicherla	2019-06-26	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit sha in deployment popovers within monitoring dashboard are not clickable or selectable. This commit makes those commit sha links selectable and point to projects commit page
* \| \| \|	Merge branch '12436-mr-widget' into 'master'	Phil Hughes	2019-06-27	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for spec/javascripts/vue_mr_widget/mr_widget_options_spec.js Closes gitlab-ee#12436 See merge request gitlab-org/gitlab-ce!30091
\| * \| \|	Removes EE differences12436-mr-widget	Filipa Lacerda	2019-06-26	1	-1/+1
\| \| \| \|
* \| \| \|	Add feature flag and dashboard endpoint	Simon Knox	2019-06-26	4	-6/+89
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* \| \|	Always display environment selector	Reuben Pereira	2019-06-26	1	-9/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On the metrics dashboard, always display the environment selector, even if there is no data to display for that environment. This allows the user to switch to the metrics dashboard of another environment.
* \| \|	Re-name entries in one commit	Denys Mishunov	2019-06-26	4	-11/+61
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Update window's URL after entry's re-name Set proper hook for correct fileLanguage Filtered out `moved` entries from the tree
* \|	Merge branch ↵	Filipa Lacerda	2019-06-25	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	'63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
\| *	Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestones	Dmitriy Zaporozhets	2019-06-24	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Keep empty folders in the tree list	Denys Mishunov	2019-06-25	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When removing the last file from a folder in WebIDE, do not remove the folder from the view. We keep those to give users possibility to re-upload files to the same folders. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60860
* \|	Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-tracking	Heinrich Lee Yu	2019-06-25	3	-20/+85
\| \| \| \| \| \| \| \|	Changes migration and all other places the attribute is used
* \|	Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'	Mike Greiling	2019-06-24	1	-0/+58
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add column chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!29293
\| * \|	Add column chart component to the monitoring bundlejivanvl-add-column-chart-monitoring-dashboard	Jose Vargas	2019-06-21	1	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge request just adds the column chart component without integrating it to the dashboard
* \| \|	Improve group list UI	Dennis Tang	2019-06-24	2	-12/+7
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the groups list UI to match the style of the project list: - New layout - Improve loading state when loading group children - Larger, responsive text - Icon and text colors changed to secondary - Smaller button sizes - Content list description colors were standardized to body text
* \|	Merge branch 'update-pagination-texts' into 'master'	Kushal Pandya	2019-06-24	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update pagination prev and next texts See merge request gitlab-org/gitlab-ce!29911
\| * \|	Update pagination prev and next textsupdate-pagination-texts	Paul Gascou-Vaillancourt	2019-06-20	1	-2/+2
\| \|/
* \|	Merge branch 'mg-upgrade-prettier' into 'master'	Clement Ho	2019-06-21	4	-23/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade prettier to latest (v1.18.2) See merge request gitlab-org/gitlab-ce!29943
\| * \|	Upgrade prettier to latest (v1.18.2)	Mike Greiling	2019-06-21	4	-23/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrades prettier to the latest version, and auto-corrects files with yarn prettier-all-save The diffs all seem to stem from formatting changes in brackets within template literals. Nothing major. Relevant changelogs here: https://prettier.io/blog/2019/04/12/1.17.0.html https://prettier.io/blog/2019/06/06/1.18.0.html
* \| \|	Add confirmation for registry image deletion	Paul Gascou-Vaillancourt	2019-06-21	3	-3/+73
\|/ / \| \| \| \| \| \| \| \|	Adds a modal to let the user confirm their action before proceeding to registry/image deletion
* \|	Merge branch '38105-pre-release-tag' into 'master'	Kushal Pandya	2019-06-21	1	-1/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Renders pre-release tag for pre-releases See merge request gitlab-org/gitlab-ce!29797
\| * \|	Renders pre-release tag for pre-releases38105-pre-release-tag	Filipa Lacerda	2019-06-21	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a release is a pre release, we render an orange badge with `pre-release` label
* \| \|	Add back trimChar method to remove trailing +/-	Samantha Ming	2019-06-21	1	-0/+13
\| \|/ \|/\| \| \| \| \|	Add test for checking output
* \|	Merge branch 'fe-vue-test-utils-for-tooltip-on-truncate-spec' into 'master'	Mike Greiling	2019-06-19	1	-82/+98
\|\ \ \| \|/ \|/\| \| \| \| \|	Use @vue/test-utils for tooltip_on_truncate_spec See merge request gitlab-org/gitlab-ce!29249
\| *	Use @vue/test-utils for tooltip_on_truncate_specfe-vue-test-utils-for-tooltip-on-truncate-spec	Paul Slaughter	2019-06-17	1	-82/+98
\| \|
* \|	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
\| \| \| \| \| \|