Download as
Browse Code »

Commit 565e4a56908f37e9edf2b4a367233adfaeebec3f

Authored by Weblate
2 parents 31147c82 cf00ed96
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 2 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @565e4a5
... ... @@ -18,7 +18,7 @@ gem 'exception_notification', '~> 4.0.1'
18 18 gem 'gettext', '~> 2.2.1', :require => false, :group => :development
19 19 gem 'locale', '~> 2.0.5'
20 20 gem 'whenever', :require => false
21   -gem 'eita-jrails', :require => false
  21 +gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
22 22  
23 23 group :production do
24 24 gem 'dalli', '~> 2.7.0'
... ...
config/initializers/jrails.rb
View file @31147c8
... ... @@ -1 +0,0 @@
1   -require 'jrails'
debian/control
  Diff comments   View file @565e4a5
... ... @@ -42,7 +42,7 @@ Depends: adduser,
42 42 ruby-acts-as-taggable-on,
43 43 ruby-daemons,
44 44 ruby-dalli,
45   - ruby-eita-jrails (>= 0.9.3-3~),
  45 + ruby-eita-jrails (>= 0.9.3-5~),
46 46 ruby-eventmachine (>= 0.12.10-4~),
47 47 ruby-exception-notification,
48 48 ruby-fast-gettext,
... ...