summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
|/
* Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into ↵Phil Hughes2019-06-066-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-trueSam Bigelow2019-06-066-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 dashboardSarah Yasonik2019-06-061-19/+51
|/
* Migrate old notes app test from Karma to JestMartin Hanzel2019-06-051-1048/+0
|
* Extract setListDetail() into issue boards storeWinnie Hellmann2019-06-051-0/+11
|
* Merge branch ↵Filipa Lacerda2019-06-051-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-roundofffloatjboyson12019-05-301-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 Lacerda2019-06-051-0/+28
|\ \ | | | | | | | | | | | | Add single_stat chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!28948
| * | Add single_stat chart component to the monitoring bundlejivanvl-add-single-stat-chart-componentJose Vargas2019-06-041-0/+28
| | | | | | | | | | | | | | | This merge requests just adds the component without integrating it to the dashboard, it adds tests as well
* | | Fix whitespace changes visibility when the related file was initially collapsedOndřej Budai2019-06-051-5/+6
| | |
* | | Merge branch 'fe-jestify-specs-starting-with-a-1' into 'master'Mike Greiling2019-06-043-702/+0
|\ \ \ | | | | | | | | | | | | | | | | Jestify some specs that start with "A" See merge request gitlab-org/gitlab-ce!28727
| * | | Jestify autosave spec and add localStorage helperfe-jestify-specs-starting-with-a-1Paul Slaughter2019-06-041-154/+0
| | | | | | | | | | | | | | | | | | | | | | | | The helper was needed because `jest.spyOn` would not work on this special window object property. The only way we could successfully spy on `localStorage` was with this helper.
| * | | Jestify api specPaul Slaughter2019-05-301-477/+0
| | | |
| * | | Jestify activities specPaul Slaughter2019-05-301-71/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add `jQuery` to global in `test_setup`. This was needed because: - `vendor/jquery.endless-scroll` depends on it. - Adding it to `global` in the spec itself didn't work.
* | | | Handle external dashboard form submissionAdriel Santiago2019-06-041-2/+2
| |/ / |/| | | | | | | | Connect frontend UI with backend api for external dashboard link
* | | Extract setIssueDetail() into issue boards storeWinnie Hellmann2019-06-041-0/+11
| | |
* | | Merge branch 'ce-fix-vue-spec-warning' into 'master'Fatih Acet2019-06-041-8/+0
|\ \ \ | | | | | | | | | | | | | | | | Fix warning in spec from committing unused mutation See merge request gitlab-org/gitlab-ce!28815
| * | | Fix warning in spec from committing unused mutationce-fix-vue-spec-warningSimon Knox2019-05-291-8/+0
| | | |
* | | | Extract toggleFilter() into issue boards storeWinnie Hellmann2019-06-041-0/+34
| | | |