summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2019-06-214-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 Greiling2019-06-214-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 deletionPaul Gascou-Vaillancourt2019-06-213-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 Pandya2019-06-211-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-tagFilipa Lacerda2019-06-211-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 Ming2019-06-211-0/+13
| | | | | | | | Add test for checking output
* | Merge branch 'fe-vue-test-utils-for-tooltip-on-truncate-spec' into 'master'Mike Greiling2019-06-191-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-specPaul Slaughter2019-06-171-82/+98
| |
* | Merge branch '59023-fix-web-ide-creating-branches-off-new-commits' into 'master'Phil Hughes2019-06-182-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-commitsPaul Slaughter2019-06-172-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 McGivern2019-06-172-0/+52
|\ \ \ | |/ / |/| | | | | | | | Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
| * | Update class namesFilipa Lacerda2019-06-142-3/+3
| | |
| * | Adds specs and changelog - squashFilipa Lacerda2019-06-132-0/+52
| | |
* | | Merge branch 'error-pipelines-for-blocked-users' into 'master'Grzegorz Bizon2019-06-171-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 Pipelinesdrew cimino2019-06-041-1/+1
| | | | | | | | | | | | | | | | updated several specs and factories to accomodate new permissions
* | | | Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-177-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-3a50fc5dKamil Trzciński2019-06-147-40/+23
| | | | | | | | | | | | | | | This reverts merge request !26853
* | | | | Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵Fatih Acet2019-06-141-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-correctlySam Bigelow2019-06-121-18/+28
| | |_|/ / | |/| | |
* | | | | Added diff suggestion popoverPhil Hughes2019-06-144-4/+50
| |/ / / |/| | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
* | | | Fix missing deployment rockets in monitor dashboardDhiraj Bodicherla2019-06-142-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 milestonesDmitriy Zaporozhets2019-06-133-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 flagReuben Pereira2019-06-121-45/+16
| | | |
* | | | Merge branch 'sh-fix-resolve-button-not-available' into 'master'Fatih Acet2019-06-121-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-availableStan Hu2019-06-111-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 Greiling2019-06-123-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-3Simon Knox2019-06-073-1/+117
| | | | | | | | | | | | | | | | | | | | Make API request for each chart
* | | | | Merge branch 'prom-api-2' into 'master'Mike Greiling2019-06-123-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-2Simon Knox2019-06-073-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 Hughes2019-06-121-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-axesSimon Knox2019-06-121-0/+14
| | | | | |
* | | | | | Merge branch '62788-clean-up-pagination' into 'master'Phil Hughes2019-06-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves table pagination component Closes #62788 See merge request gitlab-org/gitlab-ce!29543
| * | | | | | Moves table pagination componentFilipa Lacerda2019-06-121-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-Shin2019-06-121-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-checkesNathan Friend2019-06-121-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 Lacerda2019-06-124-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-widgetNathan Friend2019-06-114-67/+180
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This commit updates the merge request widget's "Merge" button to support merge trains.
* | | | | | Merge branch ↵Filipa Lacerda2019-06-121-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-dashboardSimon Knox2019-06-121-3/+1
| |/ / / /
* | | | | Merge branch '62788-graphql-pagination' into 'master'Phil Hughes2019-06-111-0/+70
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Creates pagination component graphql Closes #62788 See merge request gitlab-org/gitlab-ce!29277
| * | | | Creates pagination component graphqlFilipa Lacerda2019-06-111-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | creates a pagination component for the graphql api
* | | | | User link styling for commitsMarcel van Remmerden2019-06-101-1/+1
| | | | |
* | | | | Move Vue models from vue_shared to boardsMartin Hanzel2019-06-075-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Some classes in vue_shared were used only by boards, so they were moved to the boards directory.
* | | | | Merge branch ↵Stan Hu2019-06-072-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-13137mfluharty2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | Need to set masked to true before testing now that the default is false
| * | | | Add frontend specsmfluharty2019-06-062-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 Hughes2019-06-072-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-syncPaul Slaughter2019-06-072-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 flagSarah Yasonik2019-06-071-36/+4
|/ / / /
* | | | Change "Report abuse to GitLab" to more generic wording.Marc Schwede2019-06-061-1/+1
|/ / /