logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 7951e7ffd5cf5932f7206b52cd85f602abd9b25d
parent: 10739df458a225a88f6301e6cd819ec3a533255d
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed, 11 Jan 2017 15:39:31 +0100

Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
fix bug in process feed service

Diffstat:

MGemfile1+
MGemfile.lock3+++
Mapp/services/process_feed_service.rb2++
Mpackage.json6++----
4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile @@ -1,6 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' +ruby '2.3.1' gem 'rails', '~> 5.0.1.0' gem 'sass-rails', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock @@ -463,5 +463,8 @@ DEPENDENCIES webmock will_paginate +RUBY VERSION + ruby 2.3.1p112 + BUNDLED WITH 1.13.6 diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb @@ -56,6 +56,8 @@ class ProcessFeedService < BaseService end end + return if status.nil? + status.save! NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local? diff --git a/package.json b/package.json @@ -4,7 +4,7 @@ "test": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx", "storybook": "start-storybook -p 9001 -c storybook" }, - "devDependencies": { + "dependencies": { "@kadira/storybook": "^2.24.0", "axios": "^0.14.0", "babel-plugin-react-transform": "^2.0.2", @@ -52,9 +52,7 @@ "reselect": "^2.5.4", "sass-loader": "^4.0.2", "sinon": "^1.17.6", - "style-loader": "^0.13.1" - }, - "dependencies": { + "style-loader": "^0.13.1", "webpack": "^1.14.0" } }