Resolve conflict with lib/ci/model.rb | lib/gitlab/ci/model.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

lib/ci/model.rb

-module Ci
-  module Model
-    def table_name_prefix
-      "ci_"
-    end
-
-    def model_name
-      @model_name ||= ActiveModel::Name.new(self, nil, self.name.demodulize)
-    end
-  end
-end

lib/gitlab/ci/model.rb

@@ -6,7 +6,7 @@ module Gitlab
       end
 
       def model_name
-        @model_name ||= ActiveModel::Name.new(self, nil, self.name.split("::").last)
+        @model_name ||= ActiveModel::Name.new(self, nil, self.name.demodulize)
       end
     end
   end