diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-18 09:56:38 -0400 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-18 09:56:38 -0400 |
| commit | 21041525af5a678053cc47e082dc7484a67dfdf5 (patch) | |
| tree | c305e0896472a379b11a3222d0e0b6bcbf97b238 | |
| parent | 6b124d42d9861a5f8c3dd5add7cabc864fa3673c (diff) | |
| download | gitlab-ce-21041525af5a678053cc47e082dc7484a67dfdf5.tar.gz | |
Update according to review comments
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | spec/features/runners_spec.rb | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG index d1b20a34b17..d691113e198 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,7 +19,7 @@ v 8.7.0 (unreleased) - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524 - Improved Markdown rendering performance !3389 - Improved Markdown rendering performance !3389 (Yorick Peterse) - - Make shared runners text in box configurable (Kamil Trzciński) + - Make shared runners text in box configurable - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu) - API: Ability to subscribe and unsubscribe from issues and merge requests (Robert Schilling) - Expose project badges in project settings diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb index 1fe7645250c..789b06d7c67 100644 --- a/spec/features/runners_spec.rb +++ b/spec/features/runners_spec.rb @@ -83,12 +83,11 @@ describe "Runners" do describe "shared runners description" do let(:shared_runners_text) { 'custom shared runners description' } - before { stub_application_setting(shared_runners_text: shared_runners_text) } - before do - @project = FactoryGirl.create :empty_project, shared_runners_enabled: false - @project.team << [user, :master] - visit runners_path(@project) + stub_application_setting(shared_runners_text: shared_runners_text) + project = FactoryGirl.create :empty_project, shared_runners_enabled: false + project.team << [user, :master] + visit runners_path(project) end it "sees shared runners description" do |