diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index 55dac139a..b888c99fd 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -10,11 +10,8 @@ json.project_name @project.name json.project_author @project.owner.try(:login) json.project_author_name @project.owner.try(:show_real_name) json.has_created_pull_requests @project.pull_requests.size > 0 -<<<<<<< 74dcdebe5ebf2bf33c242d7cdffe9497372406ca json.disable_pr_vew @project.pr_view_admin? && !@project.manager?(current_user) -======= json.pr_need @project.owner&.cla.try(:pr_need) ->>>>>>> cla pr and destroy user_cla json.issues do json.array! @issues.to_a do |issue|