diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-01 18:06:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-01 18:06:00 +0000 |
| commit | 77a73903aa803869d0ab7fe544cc2d8b1a6aa1e0 (patch) | |
| tree | 0773f62090b7a896b29b8b08152565ba976716a8 /app/controllers/projects/settings | |
| parent | ded8ee5a09a1a02209adf179ac7d6e456703726a (diff) | |
| download | gitlab-ce-77a73903aa803869d0ab7fe544cc2d8b1a6aa1e0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/settings')
| -rw-r--r-- | app/controllers/projects/settings/operations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb index 5bf3618b389..1571cb8cd34 100644 --- a/app/controllers/projects/settings/operations_controller.rb +++ b/app/controllers/projects/settings/operations_controller.rb @@ -70,7 +70,7 @@ module Projects project: [:slug, :name, :organization_slug, :organization_name] ], - grafana_integration_attributes: [:token, :grafana_url] + grafana_integration_attributes: [:token, :grafana_url, :enabled] } end end |