Fixes resolution for environment entity

5a3bda13 · Mayra Cabrera · e16fec65 · 5a3bda13
Commit 5a3bda13 authored Aug 10, 2018 by Mayra Cabrera
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/serializers/environment_entity.rb app/serializers/environment_entity.rb +0 -3

No files found.
--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -47,13 +47,10 @@ class EnvironmentEntity < Grape::Entity
    request.current_user
  end

-<<<<<<< HEAD
  def can_read_deploy_board?
    can?(current_user, :read_deploy_board, environment.project)
  end

-=======
->>>>>>> upstream/master
  def can_access_terminal?
    can?(request.current_user, :create_environment_terminal, environment)
  end