Commit Graph

2806 Commits

Author SHA1 Message Date
Filipa Lacerda 4b0ff7c742 Merge branch 'ide-list-merge-requests' into 'master'
Show merge requests in web IDE

Closes #45184

See merge request gitlab-org/gitlab-ce!18898
2018-06-01 12:57:16 +00:00
Francisco Javier López 840f80d48b Add validation to webhook and service URLs to ensure they are not blocked because of SSRF 2018-06-01 11:43:53 +00:00
Phil Hughes 9ffb60acd8
Merge branch 'master' into ide-list-merge-requests 2018-06-01 12:12:18 +01:00
Filipa Lacerda 5b9e4d986a Merge branch 'ide-jobs-list-components' into 'master'
Show CI jobs in IDE

Closes #44604

See merge request gitlab-org/gitlab-ce!19106
2018-06-01 08:45:35 +00:00
Dmitriy Zaporozhets d68ded2122 Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'master'
Resolve "Add support for Jupyter in GitLab via Kubernetes"

Closes #46487

See merge request gitlab-org/gitlab-ce!19019
2018-06-01 07:58:18 +00:00
Kushal Pandya 6a4b4255a1 Update Sortable package path 2018-05-31 17:49:12 +05:30
Sam Beckham 9f3bf8246d Resolve "Remove links from Web IDE unexpectedly navigate you to a different page" 2018-05-31 09:08:34 +00:00
Phil Hughes 745d353801
Merge branch 'master' into ide-jobs-list-components 2018-05-31 08:44:47 +01:00
Phil Hughes 9797905bd4
fixed mutations spec 2018-05-30 14:04:43 +01:00
Phil Hughes 3270e14077
changed mutation to return new array
this makes the component completly unaware of the store, instead it emits
events to the parent which knows about the store
2018-05-30 13:31:15 +01:00
Phil Hughes c9d676c106
changed mutations, update single object instead of returning new array
bunch of i18n stuff 🙈
2018-05-30 12:56:06 +01:00
Dmitriy Zaporozhets ef5282ee36 Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyter-in-gitlab-via-kubernetes 2018-05-30 14:26:54 +03:00
Phil Hughes 3bffbb159e
ability to search merge requests
reset merge requests before fetch
2018-05-30 11:10:32 +01:00
Phil Hughes 8f646faf3d
improved stored data
created reset action to reset stored merge requests
2018-05-30 10:59:29 +01:00
Phil Hughes c760965079
Merge branch 'master' into ide-list-merge-requests 2018-05-30 10:33:43 +01:00
Phil Hughes e6e9706e53
fixed failing specs
fixed merge requests not loading
2018-05-30 09:40:04 +01:00
Lukas Eipert e9c5e57b59
Convert spec/javascripts/.eslintrc to yml format as well 2018-05-30 10:06:41 +02:00
Lukas Eipert 6e1a7902f4
fix last lints 2018-05-29 18:42:51 +02:00
Lukas Eipert c98212e663
fix `spaced-comment` 2018-05-29 18:42:34 +02:00
Lukas Eipert 9a9f758d91
remove unused createComponentWithMixin from vue spec helpers 2018-05-29 18:42:29 +02:00
Lukas Eipert 99c4e46d1d
fix `no-unused-vars` 2018-05-29 18:42:25 +02:00
Phil Hughes 552c0c99bb
more store tests 2018-05-29 14:59:52 +01:00
Phil Hughes c8f3a60d8a
Merge branch 'master' into ide-jobs-list-components 2018-05-29 14:30:29 +01:00
Phil Hughes aab713132e
karma fixes 2018-05-29 14:26:46 +01:00
Phil Hughes 66bf2de830
added component specs 2018-05-29 13:09:19 +01:00
Phil Hughes 782c31a494
added empty state & YAML error state 2018-05-29 10:35:13 +01:00
Dennis Tang f7efc5f8b7 update tests 2018-05-28 17:53:57 +02:00
Filipa Lacerda 08216d2e58
Changes after review 2018-05-28 10:17:17 +01:00
Phil Hughes 6c9027f8f6
fixed up after bootstrap upgrade 2018-05-25 23:10:04 +01:00
Phil Hughes 65c16758f9
Merge branch 'master' into ide-jobs-list-components 2018-05-25 22:56:34 +01:00
Dennis Tang 95a63a8816 Merge remote-tracking branch 'origin/master' into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster 2018-05-25 23:56:17 +02:00
Mike Greiling 74894a3877 Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4

Closes #45185 and #46710

See merge request gitlab-org/gitlab-ce!18232
2018-05-25 21:05:53 +00:00
Phil Hughes 32498cd70d
fixed mutations spec 2018-05-25 17:31:59 +01:00
Phil Hughes aca0d610fd
fixed mutations spec 2018-05-25 16:00:00 +01:00
Filipa Lacerda 1d6adc27c5 Handle disabled button state in backend 2018-05-25 17:16:42 +03:00
Filipa Lacerda e1d4deb2d2 Disables jupyter install button while ingress is not installed
Includes juptyer hostname in the post request
Adds tests
2018-05-25 17:16:42 +03:00
Phil Hughes cdc92d94e0
fixed pipeline actions spec 2018-05-25 15:09:20 +01:00
Phil Hughes 0c0a779f4c
Merge branch 'master' into ide-jobs-list-components 2018-05-25 13:49:50 +01:00
Filipa Lacerda 4e25721334 Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master'
Resolve "Typo on the empty Pipelines page"

Closes #46768

See merge request gitlab-org/gitlab-ce!19140
2018-05-25 12:21:42 +00:00
Phil Hughes 323e402e21
fixed tests failing caused by rewire 2018-05-25 12:55:59 +01:00
Phil Hughes a57e43dd8c
Show merge requests in web IDE
Closes #45184
2018-05-25 12:55:37 +01:00
Mark Fletcher 10350c2e4f Fix typo in Pipelines empty state view 2018-05-25 11:37:54 +01:00
André Luís c53890548e Resolve "Show CI pipeline status in Web IDE" 2018-05-25 10:08:53 +00:00
Clement Ho cbbe6d5d55 Merge branch 'master' into bootstrap4 2018-05-24 16:48:54 -05:00
Achilleas Pipinellis 6d2a613972 Merge branch '5779_rename_code_quality_job_and_artifact' into 'master'
Rename code quality job and artifact.

See merge request gitlab-org/gitlab-ce!19049
2018-05-24 15:58:28 +00:00
Phil Hughes 8b1c43bde3
spec fixes 2018-05-24 15:07:09 +01:00
Phil Hughes cfe4d2f29d
added tab component 2018-05-24 10:38:02 +01:00
Olivier Gonzalez dd639aad8d
Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779 2018-05-23 19:26:57 -04:00
Clement Ho 51d455d05b Merge branch 'master' into bootstrap4 2018-05-23 14:45:32 -05:00
Dennis Tang fb9d8b9b49 use testAction for validateProjectBilling 2018-05-23 19:59:32 +02:00