Merge branch 'master' into fixes/api

spec/factories.rb

@@ -123,7 +123,7 @@ FactoryGirl.define do
   factory :event do
     factory :closed_issue_event do
       project
-      action { Event::Closed }
+      action { Event::CLOSED }
       target factory: :closed_issue
       author factory: :user
     end

spec/models/event_spec.rb

@@ -52,7 +52,7 @@ describe Event do
 
       @event = Event.create(
         project: project,
-        action: Event::Pushed,
+        action: Event::PUSHED,
         data: data,
         author_id: @user.id
       )

spec/models/project_hooks_spec.rb

@@ -19,7 +19,7 @@ describe Project, "Hooks" do
 
       event.should_not be_nil
       event.project.should == project
-      event.action.should == Event::Pushed
+      event.action.should == Event::PUSHED
       event.data.should == data
     end
   end

spec/observers/activity_observer_spec.rb

@@ -17,7 +17,7 @@ describe ActivityObserver do
     end
 
     it_should_be_valid_event
-    it { @event.action.should == Event::Created }
+    it { @event.action.should == Event::CREATED }
     it { @event.target.should == @merge_request }
   end
 
@@ -30,7 +30,7 @@ describe ActivityObserver do
     end
 
     it_should_be_valid_event
-    it { @event.action.should == Event::Created }
+    it { @event.action.should == Event::CREATED }
     it { @event.target.should == @issue }
   end
 
@@ -44,7 +44,7 @@ describe ActivityObserver do
     end
 
     it_should_be_valid_event
-    it { @event.action.should == Event::Commented }
+    it { @event.action.should == Event::COMMENTED }
     it { @event.target.should == @note }
   end
 end