Merge branch 'fix_public_builds' into 'master'

Fix: show builds for public users https://gitlab.com/gitlab-org/gitlab-ci/issues/175 See merge request !154
gitlabhq · Jun 22, 2015 · fe7fea3 · fe7fea3
2 parents ebf09aa + d53b41b
commit fe7fea3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/views/builds/show.html.haml b/app/views/builds/show.html.haml
@@ -104,7 +104,7 @@
           #{time_ago_in_words(@build.finished_at)} ago
       %p
         %span.attr-name Runner:
-        - if @build.runner && current_user.is_admin
+        - if @build.runner && current_user && current_user.is_admin
           \#{link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)}
         - elsif @build.runner
           \##{@build.runner.id}

diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
@@ -45,7 +45,9 @@
     before do
       @project = FactoryGirl.create :public_project
       @commit = FactoryGirl.create :commit, project: @project
-      @build = FactoryGirl.create :build, commit: @commit
+      @runner = FactoryGirl.create :specific_runner
+      @build = FactoryGirl.create :build, commit: @commit, runner: @runner
+
       stub_gitlab_calls
       visit project_build_path(@project, @build)
     end