summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-25 13:18:55 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-25 13:18:55 +0100
commit9e7e2c6b9d2e46720c0375b6c44a2fb5e0f7acbe (patch)
treec1f218659f2514599ac3182200db853353a212f4
parentb105b84e3ac34915cf00b7bfec923abf98d035ab (diff)
downloadgitlab-ce-9e7e2c6b9d2e46720c0375b6c44a2fb5e0f7acbe.tar.gz
Small refactoring and rewording
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/projects/_builds_settings.html.haml2
-rw-r--r--spec/models/repository_spec.rb6
2 files changed, 2 insertions, 6 deletions
diff --git a/app/views/projects/_builds_settings.html.haml b/app/views/projects/_builds_settings.html.haml
index 095e7e45df7..9ae6964aaac 100644
--- a/app/views/projects/_builds_settings.html.haml
+++ b/app/views/projects/_builds_settings.html.haml
@@ -5,7 +5,7 @@
- unless @repository.gitlab_ci_yml
.form-group
.col-sm-offset-2.col-sm-10
- %p Before you can use Builds (Continuous Integration) feature you need to setup it.
+ %p Builds need to be configured before you can begin using Continuous Integration.
= link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
%hr
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 0ba9da29a97..417f11acca4 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
describe Repository, models: true do
include RepoHelpers
+ TestBlob = Struct.new(:name)
let(:repository) { create(:project).repository }
let(:user) { create(:user) }
@@ -131,7 +132,6 @@ describe Repository, models: true do
describe "#license" do
before do
repository.send(:cache).expire(:license)
- TestBlob = Struct.new(:name)
end
it 'test selection preference' do
@@ -149,10 +149,6 @@ describe Repository, models: true do
end
describe "#gitlab_ci_yml" do
- before do
- TestBlob = Struct.new(:name)
- end
-
it 'returns valid file' do
files = [TestBlob.new('file'), TestBlob.new('.gitlab-ci.yml'), TestBlob.new('copying')]
expect(repository.tree).to receive(:blobs).and_return(files)