Download as
Browse Code »

Commit 4197c87068ee25675cee8ea557ddd4a325ec76f4

Authored by Braulio Bhavamitra
Committed by Daniela Feitosa
1 parent 7b4b710f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Remove/replace old ferret references

Showing 4 changed files with 5 additions and 7 deletions   Show diff stats
HACKING.rails235
  Diff comments   View file @4197c87
@@ -4,7 +4,6 @@ development. @@ -4,7 +4,6 @@ development.
4 Install dependencies: 4 Install dependencies:
5 5
6 gem install rails -v 2.3.5 6 gem install rails -v 2.3.5
7 -gem install ferret  
8 gem install i18n 7 gem install i18n
9 gem install will_paginate -v 2.3.12 8 gem install will_paginate -v 2.3.12
10 gem install cucumber 9 gem install cucumber
INSTALL.multitenancy
  Diff comments   View file @4197c87
@@ -20,7 +20,7 @@ The items below are separated for each hosted environment: @@ -20,7 +20,7 @@ The items below are separated for each hosted environment:
20 20
21 * Uploaded files 21 * Uploaded files
22 * Database 22 * Database
23 -* Ferret index 23 +* Solr index
24 * ActiveRecord#cache_key 24 * ActiveRecord#cache_key
25 * Feed updater 25 * Feed updater
26 * Delayed Job Workers 26 * Delayed Job Workers
@@ -116,9 +116,9 @@ Run Noosfero init file as root: @@ -116,9 +116,9 @@ Run Noosfero init file as root:
116 116
117 # invoke-rc.d noosfero start 117 # invoke-rc.d noosfero start
118 118
119 -== Ferret 119 +== Solr
120 120
121 -It's necessary to run only one instance of ferret_server. Don't worry 121 +It's necessary to run only one instance of Solr. Don't worry
122 about this, Noosfero initializer had already done this for you. 122 about this, Noosfero initializer had already done this for you.
123 123
124 == Feed updater & Delayed job 124 == Feed updater & Delayed job
@@ -140,7 +140,7 @@ by following the steps below in addition to the previous steps: @@ -140,7 +140,7 @@ by following the steps below in addition to the previous steps:
140 140
141 1. Reindex your database 141 1. Reindex your database
142 142
143 -Rebuild the Ferret index by running the following task just 143 +Rebuild the Solr index by running the following task just
144 for your hosting environment, do this as noosfero user: 144 for your hosting environment, do this as noosfero user:
145 145
146 $ RAILS_ENV=production rake multitenancy:reindex 146 $ RAILS_ENV=production rake multitenancy:reindex
debian/control
  Diff comments   View file @4197c87
@@ -12,7 +12,7 @@ Build-Depends: @@ -12,7 +12,7 @@ Build-Depends:
12 rake, 12 rake,
13 rails (>= 2.3.5-1~), 13 rails (>= 2.3.5-1~),
14 rails-ruby1.8 (>= 2.3.5-1~), 14 rails-ruby1.8 (>= 2.3.5-1~),
15 - libferret-ruby, 15 + openjdk-6-jre,
16 libwill-paginate-ruby, 16 libwill-paginate-ruby,
17 tango-icon-theme, 17 tango-icon-theme,
18 rcov 18 rcov
gitignore.example
  Diff comments   View file @4197c87
@@ -7,7 +7,6 @@ tmp @@ -7,7 +7,6 @@ tmp
7 config/database.yml 7 config/database.yml
8 config/session.secret 8 config/session.secret
9 config/noosfero.yml 9 config/noosfero.yml
10 -config/ferret_server.yml  
11 config/mongrel_cluster.yml 10 config/mongrel_cluster.yml
12 config/solr.yml 11 config/solr.yml
13 config/plugins 12 config/plugins