Fix two problematic bits of code that will be deprecated or broken in Rails 5.
This commit is contained in:
parent
ad599eb65c
commit
c7d717cf6a
|
@ -58,7 +58,7 @@ class Project < ActiveRecord::Base
|
|||
|
||||
# Relations
|
||||
belongs_to :creator, foreign_key: 'creator_id', class_name: 'User'
|
||||
belongs_to :group, -> { where(type: Group) }, foreign_key: 'namespace_id'
|
||||
belongs_to :group, -> { where(type: 'Group') }, foreign_key: 'namespace_id'
|
||||
belongs_to :namespace
|
||||
|
||||
has_one :last_event, -> {order 'events.created_at DESC'}, class_name: 'Event', foreign_key: 'project_id'
|
||||
|
|
|
@ -13,9 +13,11 @@ Mime::Type.register "video/mp4", :mp4, [], [:m4v, :mov]
|
|||
Mime::Type.register "video/webm", :webm
|
||||
Mime::Type.register "video/ogg", :ogv
|
||||
|
||||
middlewares = Gitlab::Application.config.middleware
|
||||
middlewares.swap(ActionDispatch::ParamsParser, ActionDispatch::ParamsParser, {
|
||||
Mime::Type.lookup('application/vnd.git-lfs+json') => lambda do |body|
|
||||
ActiveSupport::JSON.decode(body)
|
||||
end
|
||||
})
|
||||
lfs_mime_types = %w(
|
||||
application/vnd.git-lfs+json
|
||||
text/x-json
|
||||
application/json
|
||||
)
|
||||
|
||||
Mime::Type.unregister :json
|
||||
Mime::Type.register 'application/json', :json, lfs_mime_types
|
||||
|
|
Loading…
Reference in New Issue