Download as
Browse Code »

Commit 792d2bd9058dbaccfa8d982274494d83d9607a3b

Authored by Antonio Terceiro
1 parent 68569335
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

Use external eita-jrails package

Showing 2 changed files with 3 additions and 5 deletions   Show diff stats
Gemfile
  Diff comments   View file @792d2bd
... ... @@ -17,10 +17,8 @@ gem 'rest-client', '~> 1.6.7'
17 17 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   -
21 20 gem 'whenever', :require => false
22   -
23   -gem 'eita-jrails', path: 'vendor/plugins/eita-jrails'
  21 +gem 'eita-jrails'
24 22  
25 23 group :production do
26 24 gem 'dalli', '~> 2.7.0'
... ... @@ -48,4 +46,4 @@ eval(File.read('config/Gemfile'), binding) rescue nil
48 46 # dependencies.
49 47 Dir.glob('config/plugins/*/Gemfile').each do |gemfile|
50 48 eval File.read(gemfile)
51   -end
52 49 \ No newline at end of file
  50 +end
... ...
debian/control
  Diff comments   View file @792d2bd
... ... @@ -42,6 +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 46 ruby-eventmachine (>= 0.12.10-4~),
46 47 ruby-exception-notification,
47 48 ruby-fast-gettext,
... ... @@ -53,7 +54,6 @@ Depends: adduser,
53 54 ruby-nokogiri,
54 55 ruby-pg,
55 56 ruby-progressbar,
56   - ruby-prototype-rails,
57 57 ruby-rack (>= 1.4.5-2~),
58 58 ruby-rails-autolink,
59 59 ruby-redcloth,
... ...