mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 01:25:36 +00:00
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
fix bug in process feed service
This commit is contained in:
parent
10739df458
commit
7951e7ffd5
1
Gemfile
1
Gemfile
|
@ -1,6 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
ruby '2.3.1'
|
||||||
|
|
||||||
gem 'rails', '~> 5.0.1.0'
|
gem 'rails', '~> 5.0.1.0'
|
||||||
gem 'sass-rails', '~> 5.0'
|
gem 'sass-rails', '~> 5.0'
|
||||||
|
|
|
@ -463,5 +463,8 @@ DEPENDENCIES
|
||||||
webmock
|
webmock
|
||||||
will_paginate
|
will_paginate
|
||||||
|
|
||||||
|
RUBY VERSION
|
||||||
|
ruby 2.3.1p112
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.13.6
|
1.13.6
|
||||||
|
|
|
@ -56,6 +56,8 @@ class ProcessFeedService < BaseService
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
return if status.nil?
|
||||||
|
|
||||||
status.save!
|
status.save!
|
||||||
|
|
||||||
NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
|
NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"test": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx",
|
"test": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx",
|
||||||
"storybook": "start-storybook -p 9001 -c storybook"
|
"storybook": "start-storybook -p 9001 -c storybook"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"dependencies": {
|
||||||
"@kadira/storybook": "^2.24.0",
|
"@kadira/storybook": "^2.24.0",
|
||||||
"axios": "^0.14.0",
|
"axios": "^0.14.0",
|
||||||
"babel-plugin-react-transform": "^2.0.2",
|
"babel-plugin-react-transform": "^2.0.2",
|
||||||
|
@ -52,9 +52,7 @@
|
||||||
"reselect": "^2.5.4",
|
"reselect": "^2.5.4",
|
||||||
"sass-loader": "^4.0.2",
|
"sass-loader": "^4.0.2",
|
||||||
"sinon": "^1.17.6",
|
"sinon": "^1.17.6",
|
||||||
"style-loader": "^0.13.1"
|
"style-loader": "^0.13.1",
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"webpack": "^1.14.0"
|
"webpack": "^1.14.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue