ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ruby version to Gemfile, move devDependencies in package.json to dependencies, 

fix bug in process feed service
rebase/4.0.0rc2
Eugen Rochko 2017-01-11 15:39:31 +01:00
parent 10739df458
commit 7951e7ffd5
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -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'

3
Gemfile.lock
View File

@ -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

2
app/services/process_feed_service.rb
View File

@ -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?

6
package.json
View File

@ -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"
} }
} }