diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-15 10:11:44 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-15 10:11:44 +0000 |
commit | 1c1f904b0a773d92d731029ba4f7f8d1c70246b5 (patch) | |
tree | a1a32d50852f204cb54aebfcd0dc14190c37b1db /app/views | |
parent | 713cf033a0090b1e686af1928e0161988eaa1410 (diff) | |
parent | 2052581f5a7fa1c848b8142973016e2cc680335f (diff) | |
download | gitlab-ce-1c1f904b0a773d92d731029ba4f7f8d1c70246b5.tar.gz |
Merge branch '5708-add-contact-sales-option-via-banner-for-canary-deployments' into 'master'
Backporting a change in ee branch
See merge request gitlab-org/gitlab-ce!23559
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/environments/folder.html.haml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/environments/folder.html.haml b/app/views/projects/environments/folder.html.haml index b7e1cf85cb7..aebd176af9b 100644 --- a/app/views/projects/environments/folder.html.haml +++ b/app/views/projects/environments/folder.html.haml @@ -1,8 +1,5 @@ - @no_container = true - page_title _("Environments") -#environments-folder-list-view{ data: { endpoint: folder_project_environments_path(@project, @folder, format: :json), - "folder-name" => @folder, - "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s, - "can-read-environment" => can?(current_user, :read_environment, @project).to_s, +#environments-folder-list-view{ data: { environments_data: environments_folder_list_view_data, "css-class" => container_class } } |