Merge branch 'protected_attributes' into 'master'

Remove protected attributes

https://dev.gitlab.org/gitlab/gitlab-ci/issues/165

See merge request !60

3 files changed, 0 insertions, 19 deletions

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index f8db78d..de0e0b9 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -38,13 +38,6 @@ describe Build do
   it { should respond_to :pending? }
   it { should respond_to :trace_html }
 
-  it { should allow_mass_assignment_of(:commit_id) }
-  it { should allow_mass_assignment_of(:status) }
-  it { should allow_mass_assignment_of(:started_at) }
-  it { should allow_mass_assignment_of(:finished_at) }
-  it { should allow_mass_assignment_of(:trace) }
-  it { should allow_mass_assignment_of(:runner_id) }
-
   describe :first_pending do
     let(:first) { FactoryGirl.create :build, commit: commit, status: 'pending', created_at: Date.yesterday }
     let(:second) { FactoryGirl.create :build, commit: commit, status: 'pending' }
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index d4a516b..03bc1e8 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -30,14 +30,6 @@ describe Commit do
   it { should respond_to :git_author_email }
   it { should respond_to :short_sha }
 
-  it { should allow_mass_assignment_of(:project_id) }
-  it { should allow_mass_assignment_of(:ref) }
-  it { should allow_mass_assignment_of(:sha) }
-  it { should allow_mass_assignment_of(:before_sha) }
-  it { should allow_mass_assignment_of(:push_data) }
-  it { should allow_mass_assignment_of(:status) }
-  it { should allow_mass_assignment_of(:project_name) }
-
   describe :last_build do
     subject { commit.last_build }
     before do
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 2c3c1c3..0f0f175 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -16,10 +16,6 @@ describe WebHook do
     it { should belong_to :project }
   end
 
-  describe "Mass assignment" do
-    it { should_not allow_mass_assignment_of(:project_id) }
-  end
-
   describe "Validations" do
     it { should validate_presence_of(:url) }