Commit Graph

261 Commits

Author SHA1 Message Date
Thong Kuah 44eec56834 Expose can_uninstall in cluster_status.json
Only prometheus can be uninstalled atm, the rest will be dealt with
later.

Presumption is that new application types will have uninstallation
implmemented at the same time.
2019-04-29 22:55:11 -07:00
Jasper Maes 624a1cdab4 Upgrade Rails to 5.1.6.1
Model.new.attributes now also returns encrypted attributes.
2019-04-23 08:31:23 +08:00
Filipa Lacerda cd509d991e Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' into 'master'
Update merge request widget to accommodate post-merge pipelines

See merge request gitlab-org/gitlab-ce!25983
2019-04-16 14:21:50 +00:00
Nathan Friend 12170f8320
Add two warning messages to the MR widget
This commit adds two new warning messages to the MR widget that handle
cases involving merge request pipelines.
2019-04-15 10:25:48 -03:00
pataar a2d34fbfbe Add time tracking to issue board entities 2019-04-10 11:00:41 +00:00
Nick Thomas a6218f1bcd Merge branch 'osw-multi-assignees-merge-requests' into 'master'
[Backport] Support multiple assignees for merge requests

See merge request gitlab-org/gitlab-ce!27089
2019-04-09 15:19:36 +00:00
Krasimir Angelov 724f19ba0a Add new API endpoint to expose single environment
This is resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/30157.

Implement new API endpoint `/projects/:id/environments/:environment_id`
to expose single environment. Include information for environment's last
deployment if there is one.
2019-04-09 09:16:57 +00:00
Oswaldo Ferreira ca884980ee [CE] Support multiple assignees for merge requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
Brett Walker e86a2e7eb2 Increase GraphQL complexity
An IntrospectionQuery required more
complexity points.
2019-04-08 12:33:33 -05:00
Sean McGivern 934dabaf6d Merge branch 'keyval-labels' into 'master'
[CE] Add mutually exclusive labels

See merge request gitlab-org/gitlab-ce!26804
2019-04-05 10:28:19 +00:00
Jan Provaznik f88607923a Fix scoped_labels feature check
Check this feature per project/group instead of globally.
Also do not show tooltip if it's disabled.
2019-04-04 19:34:14 +02:00
Alexandru Croitor f4adb50ef2 Expose head pipeline in the related merge requests
Expose head pipeline for the MR in the api when requesting
related merge requests for an issue and show a detailed
status for the pipeline, which would include:
details_path, favicon, group, icon, label, text, tooltip.

https://gitlab.com/gitlab-org/gitlab-ce/issues/57662#note_152023412
2019-04-04 09:01:09 +00:00
mfluharty 0481d69907
Add control for variable value masking
Show masked switch for each variable
When toggled on, the variable value will be masked in runner logs
Show warning message if the switch is on but the value is not maskable
2019-03-29 12:49:59 -06:00
Kamil Trzciński 89fdf64c8a Revert "Merge branch '13784-validate-variables-for-masking' into 'master'"
This reverts merge request !25476
2019-03-27 21:42:23 +00:00
Miranda Fluharty fc8f4b62f8 Scaffold UI elements for minimal version
Add a masked switch to variable rows
Copy some behavior from the protected switch
2019-03-27 19:13:55 +00:00
Rémy Coutable 9aaa6c3fa4
Reduce diff with EE in spec/fixtures/api/schemas
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-14 10:33:48 +01:00
walkafwalka 460797dec3 Add support for ingress hostnames 2019-03-07 15:25:48 -08:00
Vladimir Shushlin 25c10abb80 Add name_without_type to environments.json
It's needed to show shorter names in environments "folders"
2019-02-26 19:13:09 +00:00
Natalia Tepluhina bf8f32da7f Replaced part of diff file properties with diff viewer
- replaced file.too_large
- replaced file.text
- replaced file.collapsed
2019-02-15 17:56:50 +00:00
Stan Hu 22f63b7b54 Revert "Merge branch '50559-add-milestone-progress-to-api' into 'master'"
This reverts merge request !25173
2019-02-14 05:06:38 +00:00
Robert Schilling 3328f097c9 Add milestone progress to API 2019-02-13 12:24:13 +00:00
Robert Schilling 2a5ca841c4 API: Expose text_color for project and group labels 2019-02-12 19:36:45 +01:00
Thong Kuah f67fc23727 Upgrade cluster applications, starting with runner 2019-02-07 21:40:55 +00:00
Sean McGivern d91b96458e Merge branch 'api-group-labels' into 'master'
API group labels

Closes #44901

See merge request gitlab-org/gitlab-ce!21368
2019-02-07 09:48:04 +00:00
Luke Duncalfe 2b7dd017af Allow custom squash commit messages 2019-02-06 12:33:11 +00:00
Sean McGivern 70b92fb380 Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master'
Forms with task lists can be overwritten when editing simultaneously

See merge request gitlab-org/gitlab-ce!23938
2019-02-04 08:52:22 +00:00
Robert Schilling 82f09a91dd Incorporate feedback from Nick 2019-01-31 13:49:50 +01:00
Robert Schilling f17d10c451 Use a schema matcher to capture all entity members 2019-01-31 13:49:50 +01:00
Reuben Pereira 5841a7d5ef Update Sentry client to get project list 2019-01-31 10:05:29 +00:00
Brett Walker 2dc304855b
Fix for broken spec 2019-01-30 23:18:19 +01:00
Grzegorz Bizon cb76f79dbb Merge branch 'cluster_status_for_ugprading' into 'master'
Expose app version to frontend

See merge request gitlab-org/gitlab-ce!24791
2019-01-30 15:06:32 +00:00
Thong Kuah be386cb2cf Expose app version to frontend 2019-01-31 01:15:02 +13:00
Kamil Trzciński 045d07bab3 Add Container Registry API
This includes a set of APIs to manipulate container registry.
This includes also an ability to delete tags based on requested
criteria, like keep-last-n, matching-name, older-than.
2019-01-25 13:13:48 +01:00
Reuben Pereira d69074fc72 Service for calling Sentry issues api 2019-01-09 21:04:27 +00:00
Phil Hughes aae6d17494
Disable resolve conflicts for protected branches
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
2019-01-07 09:17:04 +00:00
Shinya Maeda 6bd7e1b876 Add tests for Release Link API
Add tests for the API and add a couple of tests

Add

revert

revert
2019-01-07 14:07:05 +09:00
Shinya Maeda f5f52da885 Add spec for Releases::Source and Link models
Releases::Source and Releases::Link are covered by tests
2019-01-04 22:17:02 +09:00
Shinya Maeda 66755c9ed5 Support CURD operation for release asset links
- Add Releases::Links model
- Expose it in release API
- Add integration tests
2019-01-04 22:17:02 +09:00
Shinya Maeda 8f1e96c89b Add spec for Release API
Add spec for all release API - GET, POST, PUT, DELETE.
Also, fixes some minior bugs.
2018-12-31 14:35:57 +09:00
Francisco Javier López 5a3e6fdff9
Fixing image lfs bug and also displaying text lfs
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
2018-12-27 16:51:07 +01:00
Heinrich Lee Yu 95aae95a1c Code style changes and refactor 2018-12-20 07:28:28 +08:00
Heinrich Lee Yu 199a4db2c4 Add schema tests 2018-12-19 17:58:53 +08:00
Heinrich Lee Yu 6c79e9307e Refactor issuable sidebar to have extras option 2018-12-19 17:58:53 +08:00
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Robert Speicher abeeb24c5b Merge branch '20422-hide-ui-variables-by-default' into 'master'
Resolve "Hide variables in UI by default"

Closes #20422

See merge request gitlab-org/gitlab-ce!23518
2018-12-07 20:14:02 +00:00
Dmitriy Zaporozhets f689b1612e Merge branch 'cert-manager-email' into 'master'
Ability to override Issuer Email for Cert Manager

See merge request gitlab-org/gitlab-ce!23503
2018-12-07 20:10:15 +00:00
jhampton 6de31cddb8 Merge remote-tracking branch 'origin/master' into 20422-hide-ui-variables-by-default 2018-12-07 13:21:43 -05:00
Amit Rathi 1cdcf40265 Allows user to override default issuer email for cert manager 2018-12-07 21:40:03 +05:30
jhampton 242bead1fb Adds optional attribute to value property
- Value is no longer required
2018-12-06 13:42:34 -05:00
jhampton 0c8b70d8e6 Removes value from required properties
- Value is now conditionally included
2018-12-05 22:32:43 -05:00