diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-21 14:52:51 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-21 14:52:51 +0200 |
| commit | abaa65efc1f912ffef05ccaf1e92dc009f828278 (patch) | |
| tree | 9cc63e2422b514e33337e9c3288c965a22bf7f97 /app | |
| parent | 3abcab779ec3015914eda5d715b4a9588445d815 (diff) | |
| download | gitlab-ce-abaa65efc1f912ffef05ccaf1e92dc009f828278.tar.gz | |
Revert "Fixed MR handling when GitLab CI project is not present"
This reverts commit 3abcab779ec3015914eda5d715b4a9588445d815.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 8 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index 9e2b3bcd873..820dd3f567c 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/app/models/project_services/gitlab_ci_service.rb @@ -46,9 +46,7 @@ class GitlabCiService < CiService end ci_project = Ci::Project.find_by(gitlab_id: project.id) - if ci_project - Ci::CreateCommitService.new.execute(ci_project, data) - end + Ci::CreateCommitService.new.execute(ci_project, data) end def get_ci_commit(sha, ref) @@ -87,9 +85,7 @@ class GitlabCiService < CiService end def build_page(sha, ref) - if project.gitlab_ci_project.present? - Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha) - end + Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha) end def title diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 10640f746f0..4d4e2f68f61 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -10,8 +10,7 @@ %span CI build #{status} for #{@merge_request.last_commit_short_sha}. %span.ci-coverage - - if ci_build_details_path(@merge_request) - = link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink" + = link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink" .ci_widget = icon("spinner spin") |