diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-16 14:12:19 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-16 14:12:19 +0100 |
| commit | 7bab27914262dc82b7c115e1ca542cd32dca7b43 (patch) | |
| tree | 7bf344f2e3d5bbbbe1ccfc5f9e468bfa5b6e8130 | |
| parent | f55206cea522e35673092158fba2c57a4c0454de (diff) | |
| download | gitlab-ce-7bab27914262dc82b7c115e1ca542cd32dca7b43.tar.gz | |
Fix view that embeds abilities for the environments
| -rw-r--r-- | app/views/projects/environments/index.html.haml | 9 | ||||
| -rw-r--r-- | spec/features/environments_spec.rb | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index c47f1a21efa..b641d2cec34 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -4,16 +4,15 @@ - content_for :page_specific_javascripts do = page_specific_javascript_tag("environments/environments_bundle.js") - .commit-icon-svg.hidden = custom_icon("icon_commit") .play-icon-svg.hidden = custom_icon("icon_play") -#environments-list-view{ data: { environments_data: environments_list_data, - "can-create-deployment" => can?(current_user, :create_deployment, @environment), - "can-read-environment" => can?(current_user, :read_environment, @project), - "can-create-environmnet" => can?(current_user, :create_environment, @project), +#environments-list-view{ data: { environments_data: environments_list_data, + "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s, + "can-read-environment" => can?(current_user, :read_environment, @project).to_s, + "can-create-environment" => can?(current_user, :create_environment, @project).to_s, "project-environments-path" => project_environments_path(@project), "project-stopped-environments-path" => project_environments_path(@project, scope: :stopped), "new-environment-path" => new_namespace_project_environment_path(@project.namespace, @project), diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb index fbf0b6392b9..fe470fefca5 100644 --- a/spec/features/environments_spec.rb +++ b/spec/features/environments_spec.rb @@ -59,7 +59,6 @@ feature 'Environments', feature: true, js: true do given(:deployment) { create(:deployment, environment: environment) } scenario 'does show deployment SHA' do - puts page.body expect(page).to have_link(deployment.short_sha) end |