Merge branch 'staging' into login-captcha

Victor Costa
2 parents 2ba09a89 eaa94bb4
Showing 1497 changed files with 19942 additions and 65211 deletions Show diff stats
.gitlab-ci.yml
.gitmodules
.ruby-version
.travis.yml
Gemfile
Gemfile.lock
Vagrantfile
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/categories_controller.rb
app/controllers/admin/environment_role_manager_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/admin/licenses_controller.rb
app/controllers/admin/plugins_controller.rb
app/controllers/admin/role_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/application.rb
app/controllers/application_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/enterprise_validation_controller.rb
+image: noosfero/ci
+
 before_script:
-  - mkdir -p tmp/{pids,cache} log
-  - bundle check || bundle install
-# workaround for plugins with Gemfile
-  - perl -pi -e 's/--local //' script/noosfero-plugins
-  - script/noosfero-plugins disableall
-  - bundle exec rake makemo &>/dev/null
-# database
-  - cp config/database.yml.gitlab-ci config/database.yml
-  - createdb gitlab_ci_test || true
-  - bundle exec rake db:schema:load &>/dev/null
-  - bundle exec rake db:migrate &>/dev/null
+  - mkdir -p locale # makes quick-start skip compiling translations
+  - ./script/silent-quick-start
  
 units:
   script: bundle exec rake test:units
@@ -34,3 +34,6 @@
 [submodule "plugins/serpro_captcha"]
 	path = plugins/serpro_captcha
 	url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/serpro_captcha.git
+[submodule "plugins/insight"]
+	path = plugins/insight
+	url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/insight.git
@@ -0,0 +1 @@
+ruby-2.2.1@noosfero
@@ -8,8 +8,7 @@ notifications:
  
 language: ruby
 rvm:
-# for 2.2 support we need to upgrade the pg gem
-  - 2.1.6
+  - 2.2.3
  
 sudo: false
 addons:
@@ -26,19 +25,16 @@ addons:
       - libsqlite3-dev
       - libxslt1-dev
  
-before_install:
-  - gem env
-
 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
 before_install:
-  - export GEM_HOME=$PWD/vendor/bundle/ruby/2.1.0
+  - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0
   - gem install bundler
 cache: bundler
  
 before_script:
   - mkdir -p tmp/{pids,cache} log
   - script/noosfero-plugins disableall
-  - bundle exec rake makemo &>/dev/null
+  #- bundle exec rake makemo &>/dev/null
 # database
   - cp config/database.yml.travis config/database.yml
   - psql -c 'create database myapp_test;' -U postgres
@@ -49,7 +45,7 @@ env:
   - TASK=test:units
   - TASK=test:functionals
   - TASK=test:integration
-  - TASK=cucumber
+  - TASK=cucumber LANG=en
   - TASK=selenium
   - TASK=test:noosfero_plugins BUNDLE_OPTS=install
  
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.22'
-gem 'minitest',                 '~> 3.2.0'
-gem 'fast_gettext',             '~> 0.6.8'
-gem 'acts-as-taggable-on',      '~> 3.4.2'
+
+platform :ruby do
+  gem 'pg',                     '~> 0.17'
+  gem 'rmagick',                '~> 2.13'
+end
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+  gem 'rmagick4j'
+end
+
+gem 'rails',                    '~> 4.2.4'
+gem 'fast_gettext',             '~> 0.9'
+gem 'acts-as-taggable-on',      '~> 3.5'
 gem 'rails_autolink',           '~> 1.1.5'
-gem 'pg',                       '~> 0.13.2'
-gem 'rmagick',                  '~> 2.13.1'
-gem 'RedCloth',                 '~> 4.2.9'
-gem 'will_paginate',            '~> 3.0.3'
+gem 'RedCloth',                 '~> 4.2'
 gem 'ruby-feedparser',          '~> 0.7'
-gem 'daemons',                  '~> 1.1.5'
-#gem 'thin',                     '~> 1.3.1'
-gem 'nokogiri',                 '~> 1.6.0'
+gem 'daemons',                  '~> 1.1'
 gem 'unicorn',                  '~> 4.8'
-#gem 'nokogiri',                 '~> 1.5.5'
+gem 'nokogiri',                 '~> 1.6.0'
+gem 'will_paginate'
+gem 'pothoven-attachment_fu',   '~> 3.2.16'
+gem 'delayed_job'
+gem 'delayed_job_active_record'
 gem 'rake', :require => false
-gem 'rest-client',              '~> 1.6.7'
+gem 'rest-client',              '~> 1.6'
 gem 'exception_notification',   '~> 4.0.1'
-gem 'gettext',                  '~> 2.2.1', :require => false
-gem 'locale',                   '~> 2.0.5'
+gem 'gettext',                  '~> 3.1', :require => false
+gem 'locale',                   '~> 2.1'
 gem 'whenever', :require => false
-gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
+gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
+gem 'diffy',                    '~> 3.0'
+gem 'slim'
  
 # API dependencies
 gem 'grape',                    '~> 0.12'
 gem 'grape-entity'
+gem 'grape_logging'
 gem 'grape-swagger'
 gem 'swagger-ui_rails'
 gem 'kramdown'
-
-#FIXME Get the Grape Loggin from master yo solve this issue https://github.com/intridea/grape/issues/1059
-#We have to remove this commit referenve code when update the next release of grape_logging. Actualy we are using (1.1.2)
-gem 'grape_logging', :git => 'https://github.com/aceunreal/grape_logging.git', :ref => 'f1755ae'
-#gem 'grape_logging'
 gem 'rack-cors'
 gem 'rack-contrib'
 gem 'liquid',                    '~> 3.0.3'
-#gem 'grape-swagger-rails'
-gem 'rubyzip'
-
-gem 'execjs'
-gem 'therubyracer'
-
-# FIXME list here all actual dependencies (i.e. the ones in debian/control),
-# with their GEM names (not the Debian package names)
  
 gem 'api-pagination',           '~> 4.1.1'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
 gem 'sass-rails'
-gem 'sass', '~> 3.1.19'
+
+# gems to enable rails3 behaviour
+gem 'protected_attributes'
+gem 'rails-observers'
+gem 'actionpack-page_caching'
+gem 'actionpack-action_caching'
+gem 'activerecord-session_store'
+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
  
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
  
+group :development, :test do
+  gem 'spring'
+end
+
 group :test do
-  gem 'rspec',                  '~> 2.14.0'
-  gem 'rspec-rails',            '~> 2.14.1'
+  gem 'rspec',                  '~> 3.3', require: false
+  gem 'rspec-rails',            '~> 3.2', require: false
   gem 'mocha',                  '~> 1.1.0', :require => false
+  gem 'test-unit' if RUBY_VERSION >= '2.2.0'
+  gem 'minitest'
+  gem 'minitest-reporters'
 end
  
 group :cucumber do
-  gem 'cucumber-rails',         '~> 1.0.6', :require => false
-  gem 'capybara',               '~> 2.1.0'
-  gem 'cucumber',               '~> 1.0.6'
-  gem 'database_cleaner',       '~> 1.2.0'
-  gem 'selenium-webdriver',     '~> 2.47.0'
+  gem 'capybara',               '~> 2.2'
+  gem 'launchy'
+  gem 'cucumber'
+  gem 'cucumber-rails',         '~> 1.4.2', :require => false
+  gem 'database_cleaner',       '~> 1.3'
+  gem 'selenium-webdriver'
 end
  
 # Requires custom dependencies
 eval(File.read('config/Gemfile'), binding) rescue nil
  
+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
+vendor.each do |dir|
+  plugin = File.basename dir
+  version = if Dir.glob("#{dir}/*.gemspec").length > 0 then '> 0.0.0' else '0.0.0' end
+
+  gem plugin, version, path: dir
+end
+
 # include gemfiles from enabled plugins
 # plugins in baseplugins/ are not included on purpose. They should not have any
 # dependencies.
-GIT
-  remote: https://github.com/aceunreal/grape_logging.git
-  revision: f1755ae4e1d897a65b20218d40681f59a9630f1b
-  ref: f1755ae
+PATH
+  remote: vendor/contacts
   specs:
-    grape_logging (1.1.2)
-      grape
+    contacts (1.2.0)
+      gdata (>= 1.1.1)
+      json (>= 1.1.1)
+
+PATH
+  remote: vendor/ezcrypto
+  specs:
+    ezcrypto (0.0.0)
+
+PATH
+  remote: vendor/gdata
+  specs:
+    gdata (1.1.1)
+
+PATH
+  remote: vendor/plugins/access_control
+  specs:
+    access_control (0.0.0)
+
+PATH
+  remote: vendor/plugins/action_tracker
+  specs:
+    action_tracker (0.0.1)
+
+PATH
+  remote: vendor/plugins/action_tracker_has_comments
+  specs:
+    action_tracker_has_comments (0.0.0)
+
+PATH
+  remote: vendor/plugins/acts_as_list
+  specs:
+    acts_as_list (0.0.0)
+
+PATH
+  remote: vendor/plugins/acts_as_tree
+  specs:
+    acts_as_tree (0.0.0)
+
+PATH
+  remote: vendor/plugins/acts_as_versioned
+  specs:
+    acts_as_versioned (3.2.1)
+      activerecord
+
+PATH
+  remote: vendor/plugins/honeypot
+  specs:
+    honeypot (0.0.0)
+
+PATH
+  remote: vendor/plugins/i18n_deprecation
+  specs:
+    i18n_deprecation (0.0.0)
+
+PATH
+  remote: vendor/plugins/kandadaboggu-vote_fu
+  specs:
+    kandadaboggu-vote_fu (0.0.15)
+
+PATH
+  remote: vendor/plugins/monkey_patches
+  specs:
+    monkey_patches (0.0.0)
+
+PATH
+  remote: vendor/plugins/noosfero_caching
+  specs:
+    noosfero_caching (0.0.0)
+
+PATH
+  remote: vendor/plugins/rails_rcov
+  specs:
+    rails_rcov (0.0.0)
+
+PATH
+  remote: vendor/plugins/recaptcha
+  specs:
+    recaptcha (0.3.2)
+      i18n
+
+PATH
+  remote: vendor/plugins/ruby_bosh
+  specs:
+    ruby_bosh (0.5.4)
+      builder
+      rest-client
+
+PATH
+  remote: vendor/plugins/validates_as_cnpj
+  specs:
+    validates_as_cnpj (0.0.0)
+
+PATH
+  remote: vendor/plugins/validates_multiparameter_assignments
+  specs:
+    validates_multiparameter_assignments (0.0.0)
+
+PATH
+  remote: vendor/plugins/xss_terminate
+  specs:
+    xss_terminate (0.0.0)
  
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.22)
-      actionpack (= 3.2.22)
-      mail (~> 2.5.4)
-    actionpack (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionpack-action_caching (1.1.1)
+      actionpack (>= 4.0.0, < 5.0)
+    actionpack-page_caching (1.0.2)
+      actionpack (>= 4.0.0, < 5)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.22)
-      activesupport (= 3.2.22)
-      builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-    activesupport (3.2.22)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (3.4.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
+      arel (~> 6.0)
+    activerecord-deprecated_finders (1.0.4)
+    activerecord-session_store (0.1.2)
+      actionpack (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
+      railties (>= 4.0.0, < 5)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
+    addressable (2.3.8)
+    ansi (1.5.0)
     api-pagination (4.1.1)
-    arel (3.0.3)
+    arel (6.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.0.4)
-    capybara (2.1.0)
+    builder (3.2.2)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.6)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    cucumber (1.0.6)
+    cucumber (1.3.20)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.6)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.0.6)
-      nokogiri (>= 1.5.0)
-    daemons (1.1.9)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-rails (1.4.2)
+      capybara (>= 1.1.2, < 3)
+      cucumber (>= 1.3.8, < 2)
+      mime-types (>= 1.16, < 3)
+      nokogiri (~> 1.5)
+      rails (>= 3, < 5)
+    daemons (1.2.3)
     dalli (2.7.4)
-    database_cleaner (1.2.0)
+    database_cleaner (1.5.1)
+    delayed_job (4.1.1)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.1.0)
+      activerecord (>= 3.0, < 5)
+      delayed_job (>= 3.0, < 5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    eita-jrails (0.9.8)
+    diffy (3.0.7)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    eita-jrails (0.10.0)
       actionpack (>= 3.1.0)
       activesupport (>= 3.0.0)
     equalizer (0.0.11)
@@ -82,13 +209,16 @@ GEM
       actionmailer (>= 3.0.4)
       activesupport (>= 3.0.4)
     execjs (2.6.0)
-    fast_gettext (0.6.12)
+    fast_gettext (0.9.2)
     ffi (1.9.10)
-    gettext (2.2.1)
-      locale
-    gherkin (2.4.21)
-      json (>= 1.4.6)
+    gettext (3.1.7)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     git-version-bump (0.15.1)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     grape (0.13.0)
       activesupport
       builder
@@ -105,125 +235,157 @@ GEM
     grape-swagger (0.10.2)
       grape (>= 0.8.0)
       grape-entity
-    hashie (3.4.2)
-    hike (1.2.3)
+    grape_logging (1.1.2)
+      grape
+    hashie (3.4.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     i18n (0.7.0)
     ice_nine (0.11.1)
-    journey (1.0.4)
     json (1.8.3)
     kgio (2.10.0)
     kramdown (1.9.0)
-    libv8 (3.16.14.11)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     liquid (3.0.6)
-    locale (2.0.9)
+    locale (2.1.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     magic (0.2.9)
       ffi (>= 0.6.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
-    mime-types (1.25.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (3.2.0)
+    minitest (5.8.2)
+    minitest-reporters (1.1.5)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
+    multi_test (0.1.2)
     multi_xml (0.5.5)
+    netrc (0.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    pg (0.13.2)
-    polyglot (0.3.5)
-    rack (1.4.7)
+    pg (0.18.4)
+    pothoven-attachment_fu (3.2.16)
+    power_assert (0.2.6)
+    protected_attributes (1.1.3)
+      activemodel (>= 4.0.1, < 5.0)
+    rack (1.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-cache (1.5.0)
-      rack (>= 0.4)
     rack-contrib (1.4.0)
       git-version-bump (~> 0.15)
       rack (~> 1.4)
     rack-cors (0.4.0)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22)
-      actionmailer (= 3.2.22)
-      actionpack (= 3.2.22)
-      activerecord (= 3.2.22)
-      activeresource (= 3.2.22)
-      activesupport (= 3.2.22)
-      bundler (~> 1.0)
-      railties (= 3.2.22)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.5)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (3.2.22)
-      actionpack (= 3.2.22)
-      activesupport (= 3.2.22)
-      rack-ssl (~> 1.3.2)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
     rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ref (2.0.0)
-    rest-client (1.6.9)
-      mime-types (~> 1.16)
-    rmagick (2.13.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rmagick (2.15.4)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.0)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.0)
     ruby-feedparser (0.9.3)
       magic
+    ruby-progressbar (1.7.5)
     rubyzip (1.1.7)
-    sass (3.1.21)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    selenium-webdriver (2.47.1)
+    sass (3.4.19)
+    sass-rails (5.0.4)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (2.48.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
+    spring (1.4.1)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     swagger-ui_rails (0.1.7)
-    term-ansicolor (1.3.2)
-      tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
+    temple (0.7.6)
+    test-unit (3.1.5)
+      power_assert
+    text (1.3.1)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
-    tins (1.6.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.45)
+    tilt (2.0.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -244,48 +406,81 @@ PLATFORMS
   ruby
  
 DEPENDENCIES
-  RedCloth (~> 4.2.9)
-  acts-as-taggable-on (~> 3.4.2)
+  RedCloth (~> 4.2)
+  access_control (= 0.0.0)!
+  action_tracker (> 0.0.0)!
+  action_tracker_has_comments (= 0.0.0)!
+  actionpack-action_caching
+  actionpack-page_caching
+  activerecord-deprecated_finders
+  activerecord-jdbcpostgresql-adapter
+  activerecord-session_store
+  acts-as-taggable-on (~> 3.5)
+  acts_as_list (= 0.0.0)!
+  acts_as_tree (= 0.0.0)!
+  acts_as_versioned (> 0.0.0)!
   api-pagination (~> 4.1.1)
-  capybara (~> 2.1.0)
-  cucumber (~> 1.0.6)
-  cucumber-rails (~> 1.0.6)
-  daemons (~> 1.1.5)
+  capybara (~> 2.2)
+  contacts (> 0.0.0)!
+  cucumber
+  cucumber-rails (~> 1.4.2)
+  daemons (~> 1.1)
   dalli (~> 2.7.0)
-  database_cleaner (~> 1.2.0)
-  eita-jrails (~> 0.9.5)
+  database_cleaner (~> 1.3)
+  delayed_job
+  delayed_job_active_record
+  diffy (~> 3.0)
+  eita-jrails (~> 0.10.0)
   exception_notification (~> 4.0.1)
-  execjs
-  fast_gettext (~> 0.6.8)
-  gettext (~> 2.2.1)
+  ezcrypto (= 0.0.0)!
+  fast_gettext (~> 0.9)
+  gdata (> 0.0.0)!
+  gettext (~> 3.1)
   grape (~> 0.12)
   grape-entity
   grape-swagger
-  grape_logging!
+  grape_logging
+  honeypot (= 0.0.0)!
+  i18n_deprecation (= 0.0.0)!
+  kandadaboggu-vote_fu (> 0.0.0)!
   kramdown
+  launchy
   liquid (~> 3.0.3)
-  locale (~> 2.0.5)
-  minitest (~> 3.2.0)
+  locale (~> 2.1)
+  minitest
+  minitest-reporters
   mocha (~> 1.1.0)
+  monkey_patches (= 0.0.0)!
   nokogiri (~> 1.6.0)
-  pg (~> 0.13.2)
+  noosfero_caching (= 0.0.0)!
+  pg (~> 0.17)
+  pothoven-attachment_fu (~> 3.2.16)
+  protected_attributes
   rack-contrib
   rack-cors
-  rails (~> 3.2.22)
+  rails (~> 4.2.4)
+  rails-observers
   rails_autolink (~> 1.1.5)
+  rails_rcov (= 0.0.0)!
   rake
-  rest-client (~> 1.6.7)
-  rmagick (~> 2.13.1)
-  rspec (~> 2.14.0)
-  rspec-rails (~> 2.14.1)
+  recaptcha (> 0.0.0)!
+  rest-client (~> 1.6)
+  rmagick (~> 2.13)
+  rmagick4j
+  rspec (~> 3.3)
+  rspec-rails (~> 3.2)
   ruby-feedparser (~> 0.7)
-  rubyzip
-  sass (~> 3.1.19)
+  ruby_bosh (> 0.0.0)!
   sass-rails
-  selenium-webdriver (~> 2.47.0)
+  selenium-webdriver
+  slim
+  spring
   swagger-ui_rails
-  therubyracer
+  test-unit
   uglifier (>= 1.0.3)
   unicorn (~> 4.8)
+  validates_as_cnpj (= 0.0.0)!
+  validates_multiparameter_assignments (= 0.0.0)!
   whenever
-  will_paginate (~> 3.0.3)
+  will_paginate
+  xss_terminate (= 0.0.0)!
@@ -3,7 +3,7 @@
  
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
+  config.vm.box = ENV.fetch('VAGRANT_BOX', "debian/jessie64")
   config.vm.network :forwarded_port, host: 3000, guest: 3000
   config.vm.provision :shell do |shell|
     shell.inline = 'su vagrant -c /vagrant/script/vagrant'
@@ -12,7 +12,7 @@ class AdminPanelController &lt; AdminController
       if params[:environment][:languages]
         params[:environment][:languages] = params[:environment][:languages].map {|lang, value| lang if value=='true'}.compact
       end
-      if @environment.update_attributes(params[:environment])
+      if @environment.update(params[:environment])
         session[:notice] = _('Environment settings updated')
         redirect_to :action => 'index'
       end
@@ -54,7 +54,7 @@ class AdminPanelController &lt; AdminController
  
      if request.post?
        env = environment
-       folders = params[:folders].map{|fid| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} if params[:folders]
+       folders = env.portal_community.folders.where(id: params[:folders]).order(params[:folders].reverse.map{ |f| "id=#{f}" }) if params[:folders]
        env.portal_folders = folders
        if env.save
          session[:notice] = _('Saved the portal folders')
@@ -65,7 +65,7 @@ class AdminPanelController &lt; AdminController
  
   def set_portal_news_amount
     if request.post?
-      if @environment.update_attributes(params[:environment])
+      if @environment.update(params[:environment])
         session[:notice] = _('Saved the number of news on folders')
         redirect_to :action => 'index'
       end
 class CategoriesController < AdminController
  
   protect 'manage_environment_categories', :environment
-  
+
   helper :categories
  
   def index
-    @categories = environment.categories.find(:all, :conditions => "parent_id is null AND type is null")
-    @regions = environment.regions.find(:all, :conditions => {:parent_id => nil})
-    @product_categories = environment.product_categories.find(:all, :conditions => {:parent_id => nil})
+    @categories = environment.categories.where("parent_id is null AND type is null")
+    @regions = environment.regions.where(:parent_id => nil)
+    @product_categories = environment.product_categories.where(:parent_id => nil)
   end
  
   def get_children
@@ -43,7 +43,7 @@ class CategoriesController &lt; AdminController
     begin
       @category = environment.categories.find(params[:id])
       if request.post?
-        @category.update_attributes!(params[:category])
+        @category.update!(params[:category])
         @saved = true
         session[:notice] = _("Category %s saved." % @category.name)
         redirect_to :action => 'index'
@@ -2,7 +2,7 @@ class EnvironmentRoleManagerController &lt; AdminController
   protect 'manage_environment_roles', :environment
  
   def index
-    @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments )
+    @admins = Person.where('role_assignments.resource_type = ?', 'Environment').includes(:role_assignments)
   end
  
   def change_roles
 class FeaturesController < AdminController
  
   protect 'edit_environment_features', :environment
+  helper CustomFieldsHelper
  
   def index
     @features = Environment.available_features.sort_by{|k,v|v}
@@ -36,7 +37,7 @@ class FeaturesController &lt; AdminController
  
   post_only :update
   def update
-    if @environment.update_attributes(params[:environment])
+    if @environment.update(params[:environment])
       session[:notice] = _('Features updated successfully.')
       redirect_to :action => 'index'
     else
@@ -91,9 +92,37 @@ class FeaturesController &lt; AdminController
     redirect_to :action => 'manage_fields'
   end
  
+  def manage_custom_fields
+    custom_field_list = params[:custom_fields] || {}
+
+    custom_fields_to_destroy =
+      params[:customized_type].constantize.custom_fields(environment).map(&:id) - custom_field_list.keys.map(&:to_i)
+    CustomField.destroy(custom_fields_to_destroy)
+
+    custom_field_list.each_pair do |id, custom_field|
+      field = CustomField.find_by_id(id)
+      if not field.blank?
+        params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
+        field.update_attributes(params_to_update)
+      else
+        if !custom_field[:extras].nil?
+          tmp = []
+          custom_field[:extras].each_pair do |k, v|
+            tmp << v
+          end
+          custom_field[:extras] = tmp
+        end
+        field =  CustomField.new custom_field.except(:environment)
+        field.environment=environment
+        field.save if field.valid?
+      end
+    end
+    redirect_to :action => 'manage_fields'
+  end
+
   def search_members
     arg = params[:q].downcase
-    result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
+    result = environment.people.where('LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%")
     render :text => prepare_to_token_input(result).to_json
   end
  
@@ -23,7 +23,7 @@ class LicensesController &lt; AdminController
     @license = environment.licenses.find(params[:license_id])
     if request.post?
       begin
-        @license.update_attributes!(params[:license])
+        @license.update!(params[:license])
         session[:notice] = _('License updated')
         redirect_to :action => 'index'
       rescue
@@ -8,7 +8,7 @@ class PluginsController &lt; AdminController
   post_only :update
   def update
     params[:environment][:enabled_plugins].delete('')
-    if @environment.update_attributes(params[:environment])
+    if @environment.update(params[:environment])
       session[:notice] = _('Plugins updated successfully.')
     else
       session[:error] = _('Plugins were not updated successfully.')
@@ -29,7 +29,7 @@ class RoleController &lt; AdminController
  
   def update
     @role = environment.roles.find(params[:id])
-    if @role.update_attributes(params[:role])
+    if @role.update(params[:role])
       redirect_to :action => 'show', :id => @role
     else
       session[:notice] = _('Failed to edit role')
@@ -63,7 +63,7 @@ class UsersController &lt; AdminController
     respond_to do |format|
       format.html
       format.xml do
-        users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
+        users = User.where(:environment_id => environment.id).includes(:person)
         send_data users.to_xml(
             :skip_types => true,
             :only => %w[email login created_at updated_at],
@@ -1 +0,0 @@
-require 'application_controller'
@@ -8,7 +8,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :init_noosfero_plugins
   before_filter :allow_cross_domain_access
  
-  before_filter :login_from_cookie
+  include AuthenticatedSystem
   before_filter :require_login_for_environment, :if => :private_environment?
  
   before_filter :verify_members_whitelist, :if => [:private_environment?, :user]
@@ -50,7 +50,7 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    return nil if request.format == :js or request.xhr?
+    return false if request.format == :js or request.xhr?
  
     theme_layout = theme_option(:layout)
     if theme_layout
@@ -74,15 +74,12 @@ class ApplicationController &lt; ActionController::Base
   helper :language
  
   include DesignHelper
-
-  # Be sure to include AuthenticationSystem in Application Controller instead
-  include AuthenticatedSystem
   include PermissionCheck
  
   before_filter :set_locale
   def set_locale
     FastGettext.available_locales = environment.available_locales
-    FastGettext.default_locale = environment.default_locale
+    FastGettext.default_locale = environment.default_locale || 'en'
     FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
     I18n.locale = FastGettext.locale.to_s.gsub '_', '-'
     I18n.default_locale = FastGettext.default_locale.to_s.gsub '_', '-'
@@ -153,7 +150,7 @@ class ApplicationController &lt; ActionController::Base
       # Check if the requested profile belongs to another domain
       if @profile && !params[:profile].blank? && params[:profile] != @profile.identifier
         @profile = @environment.profiles.find_by_identifier params[:profile]
-        redirect_to params.merge(:host => @profile.default_hostname)
+        redirect_to url_for(params.merge host: @profile.default_hostname)
       end
     end
   end
@@ -168,7 +165,8 @@ class ApplicationController &lt; ActionController::Base
   def render_not_found(path = nil)
     @no_design_blocks = true
     @path ||= request.path
-    render :template => 'shared/not_found.html.erb', :status => 404, :layout => get_layout
+    # force html template even if the browser asked for a image
+    render template: 'shared/not_found', status: 404, layout: get_layout, formats: [:html]
   end
   alias :render_404 :render_not_found
  
@@ -176,7 +174,8 @@ class ApplicationController &lt; ActionController::Base
     @no_design_blocks = true
     @message = message
     @title = title
-    render :template => 'shared/access_denied.html.erb', :status => 403
+    # force html template even if the browser asked for a image
+    render template: 'shared/access_denied', status: 403, formats: [:html]
   end
  
   def load_category
@@ -190,13 +189,7 @@ class ApplicationController &lt; ActionController::Base
   end
  
   include SearchTermHelper
-
-  def find_by_contents(asset, context, scope, query, paginate_options={:page => 1}, options={})
-    scope = scope.with_templates(options[:template_id]) unless options[:template_id].blank?
-    search = plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options)
-    register_search_term(query, scope.count, search[:results].count, context, asset)
-    search
-  end
+  include FindByContents
  
   def find_suggestions(query, context, asset, options={})
     plugins.dispatch_first(:find_suggestions, query, context, asset, options)
@@ -209,7 +202,7 @@ class ApplicationController &lt; ActionController::Base
   def redirect_to_current_user
     if params[:profile] == '~'
       if logged_in?
-        redirect_to params.merge(:profile => user.identifier)
+        redirect_to url_for(params.merge profile: user.identifier)
       else
         render_not_found
       end
@@ -69,9 +69,9 @@ class BoxOrganizerController &lt; ApplicationController
     if request.xhr? and params[:query]
       search = params[:query]
       path_list = if boxes_holder.is_a?(Environment) && boxes_holder.enabled?('use_portal_community') && boxes_holder.portal_community
-        boxes_holder.portal_community.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{portal}/"+content.path }
+                    boxes_holder.portal_community.articles.where("name ILIKE ? OR path ILIKE ?", "%#{search}%", "%#{search}%").limit(20).map { |content| "/{portal}/"+content.path }
       elsif boxes_holder.is_a?(Profile)
-        boxes_holder.articles.find(:all, :conditions=>"name ILIKE '%#{search}%' or path ILIKE '%#{search}%'", :limit=>20).map { |content| "/{profile}/"+content.path }
+        boxes_holder.articles.where("name ILIKE ? OR path ILIKE ?", "%#{search}%", "%#{search}%").limit(20).map { |content| "/{profile}/"+content.path }
       else
         []
       end
@@ -86,7 +86,7 @@ class BoxOrganizerController &lt; ApplicationController
     if @block.kind_of?(RawHTMLBlock) && !user.is_admin?(environment)
       render_access_denied
     else
-      @block.update_attributes(params[:block])
+      @block.update(params[:block])
       redirect_to :action => 'index'
     end
   end
@@ -6,7 +6,7 @@ class CmsController &lt; MyProfileController
  
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
+    result = Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
  
@@ -50,16 +50,9 @@ class CmsController &lt; MyProfileController
  
   def view
     @article = profile.articles.find(params[:id])
-    conditions = []
-    if @article.has_posts?
-      conditions = ['type != ?', 'RssFeed']
-    end
-
-    @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name").paginate(
-      :conditions => conditions,
-      :per_page => per_page,
-      :page => params[:npage]
-    )
+    @articles = @article.children.reorder("case when type = 'Folder' then 0 when type ='Blog' then 1 else 2 end, updated_at DESC, name")
+    @articles = @articles.where "type <> ?", 'RssFeed' if @article.has_posts?
+    @articles = @articles.paginate per_page: per_page, page: params[:npage]
   end
  
   def index
@@ -99,7 +92,7 @@ class CmsController &lt; MyProfileController
         @article.image.save!
       end
       @article.last_changed_by = user
-      if @article.update_attributes(params[:article])
+      if @article.update(params[:article])
         if !continue
           if @article.content_type.nil? || @article.image?
             success_redirect
@@ -230,7 +223,7 @@ class CmsController &lt; MyProfileController
       else
         session[:notice] = _('File(s) successfully uploaded')
         if @back_to
-          redirect_to @back_to
+          redirect_to url_for(@back_to)
         elsif @parent
           redirect_to :action => 'view', :id => @parent.id
         else
@@ -381,7 +374,7 @@ class CmsController &lt; MyProfileController
  
   def search_article_privacy_exceptions
     arg = params[:q].downcase
-    result = profile.members.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = profile.members.where('LOWER(name) LIKE ?', "%#{arg}%")
     render :text => prepare_to_token_input(result).to_json
   end
  
@@ -54,7 +54,7 @@ class EnterpriseValidationController &lt; MyProfileController
   def edit_validation_info
     @info = profile.validation_info
     if request.post?
-      if @info.update_attributes(params[:info])
+      if @info.update(params[:info])
         redirect_to :action => 'index'
       end
     end
@@ -69,7 +69,7 @@ class ManageProductsController &lt; ApplicationController
     field = params[:field]
     if request.post?
       begin
-        @product.update_attributes!(params[:product])
+        @product.update!(params[:product])
         render :partial => "display_#{field}", :locals => {:product => @product}
       rescue Exception => e
         render :partial => "edit_#{field}", :locals => {:product => @product, :errors => true}
@@ -86,7 +86,7 @@ class ManageProductsController &lt; ApplicationController
     @edit = true
     @level = @category.level
     if request.post?
-      if @product.update_attributes({:product_category_id => params[:selected_category_id]}, :without_protection => true)
+      if @product.update({:product_category_id => params[:selected_category_id]}, :without_protection => true)
         render :partial => 'shared/redirect_via_javascript',
           :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
       else
@@ -115,7 +115,7 @@ class ManageProductsController &lt; ApplicationController
     @categories = ProductCategory.top_level_for(environment)
     @level = 0
     if request.post?
-      if @input.update_attributes(:product_category_id => params[:selected_category_id])
+      if @input.update(:product_category_id => params[:selected_category_id])
         @inputs = @product.inputs
         render :partial => 'display_inputs'
       else
@@ -172,7 +172,7 @@ class ManageProductsController &lt; ApplicationController
       @input = @profile.inputs.find_by_id(params[:id])
       if @input
         if request.post?
-          if @input.update_attributes(params[:input])
+          if @input.update(params[:input])
             render :partial => 'display_input', :locals => {:input => @input}
           else
             render :partial => 'edit_input'
@@ -15,7 +15,7 @@ class MapsController &lt; MyProfileController
         end
  
         Profile.transaction do
-          if profile.update_attributes!(params[:profile_data])
+          if profile.update!(params[:profile_data])
             BlockSweeper.expire_blocks profile.blocks.select{ |b| b.class == LocationBlock }
             session[:notice] = _('Address was updated successfully!')
             redirect_to :action => 'edit_location'
 class MembershipsController < MyProfileController
  
   protect 'manage_memberships', :profile
+  helper CustomFieldsHelper
  
   def index
     @roles = environment.roles.select do |role|
@@ -8,6 +8,7 @@ class ProfileEditorController &lt; MyProfileController
   before_filter :forbid_destroy_profile, :only => [:destroy_profile]
   before_filter :check_user_can_edit_header_footer, :only => [:header_footer]
   helper_method :has_welcome_page
+  helper CustomFieldsHelper
  
   def index
     @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
@@ -30,7 +31,7 @@ class ProfileEditorController &lt; MyProfileController
         Image.transaction do
           begin
             @plugins.dispatch(:profile_editor_transaction_extras)
-            @profile_data.update_attributes!(params[:profile_data])
+            @profile_data.update!(params[:profile_data])
             redirect_to :action => 'index', :profile => profile.identifier
           rescue Exception => ex
             profile.identifier = params[:profile] if profile.identifier.blank?
@@ -86,7 +87,7 @@ class ProfileEditorController &lt; MyProfileController
       if @profile.destroy
         session[:notice] = _('The profile was deleted.')
         if(params[:return_to])
-          redirect_to params[:return_to]
+          redirect_to url_for(params[:return_to])
         else
           redirect_to :controller => 'home'
         end
@@ -100,7 +101,7 @@ class ProfileEditorController &lt; MyProfileController
     @welcome_page = profile.welcome_page || TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
     if request.post?
       begin
-        @welcome_page.update_attributes!(params[:welcome_page])
+        @welcome_page.update!(params[:welcome_page])
         profile.welcome_page = @welcome_page
         profile.save!
         session[:notice] = _('Welcome page saved successfully.')
@@ -47,7 +47,7 @@ class ProfileMembersController &lt; MyProfileController
   end
  
   def remove_role
-    @association = RoleAssignment.find(:all, :conditions => {:id => params[:id], :target_id => profile.id})
+    @association = RoleAssignment.where(:id => params[:id], :target_id => profile.id)
     if @association.destroy
       session[:notice] = 'Member succefully unassociated'
     else
@@ -120,7 +120,7 @@ class ProfileMembersController &lt; MyProfileController
  
   def search_user
     role = Role.find(params[:role])
-    render :text => environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?', "%#{params['q_'+role.key]}%", "%#{params['q_'+role.key]}%"]).
+    render :text => environment.people.where('LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?', "%#{params['q_'+role.key]}%", "%#{params['q_'+role.key]}%").
       select { |person| !profile.members_by_role(role).include?(person) }.
       map {|person| {:id => person.id, :name => person.name} }.
       to_json
@@ -58,7 +58,7 @@ class ProfileRolesController &lt; MyProfileController
  
   def update
     @role = environment.roles.find(params[:id])
-    if @role.update_attributes(params[:role])
+    if @role.update(params[:role])
       redirect_to :action => 'show', :id => @role
     else
       session[:notice] = _('Failed to edit role')
@@ -71,7 +71,7 @@ class TasksController &lt; MyProfileController
           if VALID_DECISIONS.include?(decision) && id && decision != 'skip'
             task ||= profile.find_in_all_tasks(id)
             begin
-              task.update_attributes(value[:task])
+              task.update(value[:task])
               task.send(decision, current_person)
             rescue Exception => ex
               message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
@@ -85,7 +85,6 @@ class TasksController &lt; MyProfileController
     end
  
     url = { :action => 'index' }
-
     if failed.blank?
       session[:notice] = _("All decisions were applied successfully.")
     else
@@ -113,7 +112,7 @@ class TasksController &lt; MyProfileController
   end
  
   def ticket_details
-    @ticket = Ticket.find(:first, :conditions => ['(requestor_id = ? or target_id = ?) and id = ?', profile.id, profile.id, params[:id]])
+    @ticket = Ticket.where('(requestor_id = ? or target_id = ?) and id = ?', profile.id, profile.id, params[:id]).first
   end
  
   def search_tasks
@@ -179,7 +178,7 @@ class TasksController &lt; MyProfileController
   end
  
   def filter_tasks(filter, tasks)
-    tasks = tasks.includes(:requestor, :closed_by)
+    tasks = tasks.eager_load(:requestor, :closed_by)
     tasks = tasks.of(filter[:type].presence)
     tasks = tasks.where(:status => filter[:status]) unless filter[:status].blank?
     tasks = filter_by_creation_date(filter, tasks)
@@ -6,6 +6,9 @@ class AccountController &lt; ApplicationController
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
  
+  protect_from_forgery except: [:login]
+
+  helper CustomFieldsHelper
   # say something nice, you goof!  something sweet.
   def index
     unless logged_in?
@@ -125,9 +128,9 @@ class AccountController &lt; ApplicationController
           @user.signup!
           owner_role = Role.find_by_name('owner')
           @user.person.affiliate(@user.person, [owner_role]) if owner_role
-          invitation = Task.find_by_code(@invitation_code)
+          invitation = Task.from_code(@invitation_code).first
           if invitation
-            invitation.update_attributes!({:friend => @user.person})
+            invitation.update! friend: @user.person
             invitation.finish
           end
  
@@ -222,7 +225,7 @@ class AccountController &lt; ApplicationController
   #
   # Posts back.
   def new_password
-    @change_password = ChangePassword.find_by_code(params[:code])
+    @change_password = ChangePassword.from_code(params[:code]).first
  
     unless @change_password
       render :action => 'invalid_change_password_code', :status => 403
@@ -231,7 +234,7 @@ class AccountController &lt; ApplicationController
  
     if request.post?
       begin
-        @change_password.update_attributes!(params[:change_password])
+        @change_password.update!(params[:change_password])
         @change_password.finish
         render :action => 'new_password_ok'
       rescue ActiveRecord::RecordInvalid => e
@@ -415,7 +418,7 @@ class AccountController &lt; ApplicationController
   end
  
   def load_enterprise_activation
-    @enterprise_activation ||= EnterpriseActivation.find_by_code(params[:enterprise_code])
+    @enterprise_activation ||= EnterpriseActivation.from_code(params[:enterprise_code]).first
   end
  
   def load_enterprise
@@ -439,7 +442,7 @@ class AccountController &lt; ApplicationController
  
   def go_to_initial_page
     if params[:return_to]
-      redirect_to params[:return_to]
+      redirect_to url_for(params[:return_to])
     elsif environment.enabled?('allow_change_of_redirection_after_login')
       check_redirection_options(user, user.preferred_login_redirection, user.admin_url)
     else
@@ -500,7 +503,7 @@ class AccountController &lt; ApplicationController
   def check_redirection
     unless params[:redirection].blank?
       session[:return_to] = @user.return_to
-      @user.update_attributes(:return_to => nil)
+      @user.update(:return_to => nil)
     end
   end
  
@@ -67,7 +67,7 @@ class ChatController &lt; PublicController
  
   def update_presence_status
     if request.xhr?
-      current_user.update_attributes({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
+      current_user.update({:chat_status_at => DateTime.now}.merge(params[:status] || {}))
     end
     render :nothing => true
   end
@@ -78,7 +78,7 @@ class CommentController &lt; ApplicationController
     respond_to do |format|
       format.js do
         comment_to_render = @comment.comment_root
-        render :json => { 
+        render :json => {
             :render_target => comment_to_render.anchor,
             :html => render_to_string(:partial => 'comment', :locals => {:comment => comment_to_render, :display_link => true}),
             :msg => _('Comment successfully created.')
@@ -114,7 +114,7 @@ class CommentController &lt; ApplicationController
   end
  
   def update
-    if @comment.update_attributes(params[:comment])
+    if @comment.update(params[:comment])
       @plugins.dispatch(:process_extra_comment_params, [@comment,params])
  
       respond_to do |format|
@@ -4,7 +4,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
   before_filter :login_required
  
   # Just go to the first step.
-  # 
+  #
   # FIXME: shouldn't this action present some sort of welcome message and point
   # to the first step explicitly?
   def index
@@ -15,7 +15,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
         @create_enterprise.target = Profile.find(params[:create_enterprise][:target_id])
       end
     elsif @validation == :admin || @validation == :none
-        @create_enterprise.target = environment
+      @create_enterprise.target = environment
     end
     @create_enterprise.requestor = user
     the_action =
@@ -40,7 +40,7 @@ class EnterpriseRegistrationController &lt; ApplicationController
  
   protected
  
-  # Fill in the form and select your Region. 
+  # Fill in the form and select your Region.
   #
   # Posts back.
   def basic_information
@@ -7,6 +7,7 @@ class ProfileController &lt; PublicController
  
   helper TagsHelper
   helper ActionTrackerHelper
+  helper CustomFieldsHelper
  
   protect 'send_mail_to_members', :profile, :only => [:send_mail]
  
@@ -37,7 +38,7 @@ class ProfileController &lt; PublicController
  
   def tag_feed
     @tag = params[:id]
-    tagged = profile.articles.paginate(:per_page => 20, :page => 1, :order => 'published_at DESC', :include => :tags, :conditions => ['tags.name LIKE ?', @tag])
+    tagged = profile.articles.paginate(:per_page => 20, :page => 1).order('published_at DESC').joins(:tags).where('tags.name LIKE ?', @tag)
     feed_writer = FeedWriter.new
     data = feed_writer.write(
       tagged,
@@ -228,7 +229,7 @@ class ProfileController &lt; PublicController
   end
  
   def more_replies
-    activity = Scrap.find(:first, :conditions => {:id => params[:activity], :receiver_id => @profile, :scrap_id => nil})
+    activity = Scrap.where(:id => params[:activity], :receiver_id => @profile, :scrap_id => nil).first
     comments_count = activity.replies.count
     comment_page = (params[:comment_page] || 1).to_i
     comments_per_page = 5
@@ -275,7 +276,7 @@ class ProfileController &lt; PublicController
   def remove_notification
     begin
       raise if !can_edit_profile
-      notification = ActionTrackerNotification.find(:first, :conditions => {:profile_id => profile.id, :action_tracker_id => params[:activity_id]})
+      notification = ActionTrackerNotification.where(profile_id: profile.id, action_tracker_id: params[:activity_id]).first
       notification.destroy
       render :text => _('Notification successfully removed.')
     rescue
@@ -17,7 +17,7 @@ class SearchController &lt; PublicController
   # Backwards compatibility with old URLs
   def redirect_asset_param
     return unless params.has_key?(:asset)
-    redirect_to params.merge(:action => params.delete(:asset))
+    redirect_to url_for(params.merge action: params.delete(:asset))
   end
  
   no_design_blocks
@@ -65,12 +65,12 @@ class SearchController &lt; PublicController
   end
  
   def articles
-    @scope = @environment.articles.public
+    @scope = @environment.articles.is_public
     full_text_search
   end
  
   def contents
-    redirect_to params.merge(:action => :articles)
+    redirect_to url_for(params.merge action: :articles)
   end
  
   def people
@@ -125,7 +125,7 @@ class SearchController &lt; PublicController
   # keep old URLs workings
   def assets
     params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
-    redirect_to params
+    redirect_to url_for(params)
   end
  
   def tags
@@ -13,7 +13,7 @@ class ThemesController &lt; ApplicationController
  
   def index
     @environment = environment
-    @themes = (environment.themes + Theme.approved_themes(target)).sort_by { |t| t.name }
+    @themes = (environment.themes + Theme.approved_themes(target)).uniq.sort_by { |t| t.name }
  
     @current_theme = target.theme
  
@@ -8,6 +8,10 @@ module ApplicationHelper
  
   include PermissionNameHelper
  
+  include UrlHelper
+
+  include PartialsHelper
+
   include ModalHelper
  
   include BoxesHelper
@@ -283,36 +287,6 @@ module ApplicationHelper
     concat(content_tag('div', capture(&block).to_s + tag('br', :style => 'clear: left;'), options))
   end
  
-
-  def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
-    return nil if klass.nil?
-    name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
-
-    search_name = String.new(name)
-    if search_name.include?("/")
-      search_name.gsub!(/(\/)([^\/]*)$/,'\1_\2')
-      name = File.join(params[:controller], name) if defined?(params) && params[:controller]
-    else
-      search_name = "_" + search_name
-    end
-
-    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
-    return name if File.exists?(File.join(path))
-
-    partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
-  end
-
-  def partial_for_class(klass, prefix=nil, suffix=nil)
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
-    name = klass.name.underscore
-    controller.view_paths.each do |view_path|
-      partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
-      return partial if partial
-    end
-
-    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
-  end
-
   def render_profile_actions klass
     name = klass.to_s.underscore
     begin
@@ -909,8 +883,14 @@ module ApplicationHelper
   end
   alias :top_url :base_url
  
+  class View < ActionView::Base
+    def url_for *args
+      self.controller.url_for *args
+    end
+  end
+
   def helper_for_article(article)
-    article_helper = ActionView::Base.new
+    article_helper = View.new
     article_helper.controller = controller
     article_helper.extend ArticleHelper
     article_helper.extend Rails.application.routes.url_helpers
@@ -19,7 +19,7 @@ module BlockHelper
         content_tag('span', _('Title')) +
         text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
       }</label></td>
-      <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', :confirm=>_('Are you sure you want to remove this highlight'))}</td>
+      <td>#{button_without_text(:delete, _('Remove'), '#', class: 'delete-highlight', data: {confirm: _('Are you sure you want to remove this highlight')})}</td>
     </tr>
     "
   end
@@ -255,7 +255,7 @@ module BoxesHelper
     end
  
     if movable?(block) && !block.main?
-      buttons << icon_button(:delete, _('Remove block'), { :action => 'remove', :id => block.id }, { :method => 'post', :confirm => _('Are you sure you want to remove this block?')})
+      buttons << icon_button(:delete, _('Remove block'), { action: 'remove', id: block.id }, method: 'post', data: {confirm: _('Are you sure you want to remove this block?')})
       buttons << icon_button(:clone, _('Clone'), { :action => 'clone_block', :id => block.id }, { :method => 'post' })
     end
  
@@ -34,7 +34,7 @@ module CmsHelper
   end
  
   def display_delete_button(article)
-    expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
+    expirable_button article, :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, 'data-confirm' => delete_article_message(article)
   end
  
   def expirable_button(content, action, title, url, options = {})
@@ -42,7 +42,7 @@ module CmsHelper
     if reason.present?
       options[:class] = (options[:class] || '') + ' disabled'
       options[:disabled] = 'disabled'
-      options.delete(:confirm)
+      options.delete('data-confirm')
       options.delete(:method)
       title = reason
     end
@@ -0,0 +1,58 @@
+module CustomFieldsHelper
+
+  def format_name(format)
+    names = {}
+    names['string'] = _('String')
+    names['text'] = _('Text')
+    names['date'] = _('Date')
+    names['numeric'] = _('Numeric')
+    names['link'] = _('Link')
+    names['list'] = _('List')
+    names['checkbox'] = _('Checkbox')
+    names[format]
+  end
+
+  def custom_field_forms(customized_type)
+    forms = []
+    forms << [_('String'), form_for_format(customized_type,'string')]
+    forms << [_('Text'), form_for_format(customized_type,'text')]
+    forms << [_('Date'), form_for_format(customized_type,'date')]
+    forms << [_('Numeric'), form_for_format(customized_type,'numeric')]
+    forms << [_('Link'), form_for_format(customized_type,'link')]
+    forms << [_('List'), form_for_format(customized_type,'list')]
+    forms << [_('Checkbox'), form_for_format(customized_type,'checkbox')]
+    forms
+  end
+
+  def render_extras_field(id, extra=nil, field=nil)
+    if extra.nil?
+      CGI::escapeHTML((render(:partial => 'features/custom_fields/extras_field', :locals => {:id => id, :extra => nil, :field => field})))
+    else
+      render :partial => 'features/custom_fields/extras_field', :locals => {:id => id, :extra => extra, :field => field}
+    end
+  end
+
+  def form_for_field(field, customized_type)
+    render :partial => 'features/custom_fields/form', :locals => {:field => field}
+  end
+
+  def display_custom_field_value(custom_field_value)
+    value = profile.custom_value(custom_field_value.custom_field.name)
+    case custom_field_value.custom_field.format
+    when 'text', 'list', 'numeric', 'date', 'string'
+      value
+    when 'checkbox'
+      value == "1" ? _('Yes') : _('No')
+    when 'link'
+      url = value[/\Ahttps?:\/\//i] ? value : "http://#{value}"
+      link_to(value, url, :target => '_blank')
+    end
+  end
+
+  private
+
+  def form_for_format(customized_type, format)
+    field = CustomField.new(:format => format, :customized_type => customized_type, :environment => environment)
+    CGI::escapeHTML((render(:partial => 'features/custom_fields/form', :locals => {:field => field})))
+  end
+end
@@ -24,7 +24,8 @@ module EventsHelper
   end
  
   def populate_calendar(selected_date, events)
-    events.reject! {|event| !event.display_to?(user)}
+    selected_date = selected_date.to_date
+    events = events.reject{ |event| !event.display_to? user }
     calendar = Event.date_range(selected_date.year, selected_date.month).map do |date|
       [
         # the day itself
@@ -5,13 +5,11 @@ module FolderHelper
   def list_contents(configure={})
     configure[:recursive] ||= false
     configure[:list_type] ||= :folder
-    if !configure[:contents].blank?
-      configure[:contents] = configure[:contents].paginate(
-        :order => "name ASC",
-        :per_page => 30,
-        :page => params[:npage]
-      )
-
+    contents = configure[:contents]
+    contents = contents.order('name ASC') unless contents.is_a? Array
+    contents = contents.paginate per_page: 30, page: params[:npage]
+    configure[:contents] = contents
+    if contents.present?
       render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
@@ -184,9 +184,9 @@ module FormsHelper
     datepicker_options[:year_suffix] ||= ''
  
     element_id = html_options[:id] || 'datepicker-date'
-    value_js_formatted = value.present? ? value.strftime('%Y-%m-%d %H:%S') : nil
     value = value.strftime(format) if value.present?
     method = datepicker_options[:time] ? 'datetimepicker' : 'datepicker'
+    current_date_or_nil = value.present? ? "new Date('#{value}')" : "null"
     result = text_field_tag(name, value, html_options)
     result +=
     "
@@ -237,7 +237,7 @@ module FormsHelper
         weekHeader: #{datepicker_options[:week_header].to_json},
         yearRange: #{datepicker_options[:year_range].to_json},
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
-      }).datepicker('setDate', new Date('#{value_js_formatted}'))
+      }).datepicker('setDate', current_date_or_nil)
     </script>
     ".html_safe
     result
@@ -0,0 +1,43 @@
+module PartialsHelper
+
+  def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
+    return nil if klass.nil?
+    name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
+
+    search_name = String.new(name)
+    if search_name.include?("/")
+      search_name.gsub!(/(\/)([^\/]*)$/,'\1_\2')
+      name = File.join(params[:controller], name) if defined?(params) && params[:controller]
+    else
+      search_name = "_" + search_name
+    end
+
+    path = defined?(params) && params[:controller] ? File.join(view_path, params[:controller], search_name + '.html.erb') : File.join(view_path, search_name + '.html.erb')
+    return name if File.exists?(File.join(path))
+
+    partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
+  end
+
+  def partial_for_class(klass, prefix=nil, suffix=nil)
+    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
+    name = klass.name.underscore
+    controller.view_paths.each do |view_path|
+      partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
+      return partial if partial
+    end
+
+    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
+  end
+
+  def render_partial_for_class klass, *args
+    raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
+    begin
+      partial = klass.name.underscore
+      partial = "#{params[:controller]}/#{partial}" if params[:controller] and partial.index '/'
+      return render partial, *args
+    rescue ActionView::MissingTemplate
+      return render_partial_for_class klass.superclass, *args
+    end
+  end
+
+end
@@ -20,18 +20,9 @@ module TinymceHelper
       :image_advtab => true,
       :language => tinymce_language
  
-    options[:toolbar1] = "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
-    if options[:mode] == 'simple'
-      options[:menubar] = false
-    else
-      options[:menubar] = 'edit insert view tools'
-      options[:toolbar2] = 'print preview code media | table'
-
-      options[:toolbar2] += ' | macros'
-      macros_with_buttons.each do |macro|
-        options[:toolbar2] += " #{macro.identifier}"
-      end
-    end
+    options[:toolbar1] = toolbar1(options[:mode])
+    options[:menubar] = menubar(options[:mode])
+    options[:toolbar2] = toolbar2(options[:mode])
  
     options[:macros_setup] = macros_with_buttons.map do |macro|
       <<-EOS
@@ -49,4 +40,29 @@ module TinymceHelper
     "noosfero.tinymce.init(#{options.to_json})"
   end
  
+  def menubar mode
+    if mode =='restricted' || mode == 'simple'
+      return false
+    end
+    return 'edit insert view tools'
+  end
+
+  def toolbar1 mode
+    if mode == 'restricted'
+      return "bold italic underline | link"
+    end
+    return "fullscreen | insertfile undo redo | copy paste | bold italic underline | styleselect fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"
+  end
+
+  def toolbar2 mode
+    if mode.blank?
+      toolbar2 = 'print preview code media | table'
+      toolbar2 += ' | macros'
+      macros_with_buttons.each do |macro|
+        toolbar2 += " #{macro.identifier}"
+      end
+      return toolbar2
+    end
+  end
+
 end
@@ -0,0 +1,7 @@
+module UrlHelper
+
+  def back_url
+    'javascript:history.back()'
+  end
+
+end
@@ -0,0 +1,18 @@
+require_relative '../helpers/application_helper'
+
+class ApplicationMailer < ActionMailer::Base
+
+  include AuthenticatedSystem
+
+  helper ApplicationHelper
+
+  attr_accessor :environment
+
+  def default_url_options options = nil
+    options ||= {}
+    options[:host] = environment.default_hostname if environment
+    options
+  end
+
+end
+
-class CommentNotifier < ActionMailer::Base
+class CommentNotifier < ApplicationMailer
+
   def notification(comment)
     profile = comment.article.profile
+    self.environment = profile.environment
     @recipient = profile.nickname || profile.name
     @sender = comment.author_name
     @sender_link = comment.author_link
@@ -8,7 +10,6 @@ class CommentNotifier &lt; ActionMailer::Base
     @comment_url = comment.url
     @comment_title = comment.title
     @comment_body = comment.body
-    @environment = profile.environment.name
     @url = profile.environment.top_url
  
     mail(
@@ -20,6 +21,8 @@ class CommentNotifier &lt; ActionMailer::Base
  
   def mail_to_followers(comment, emails)
     profile = comment.article.profile
+    self.environment = profile.environment
+
     @recipient = profile.nickname || profile.name
     @sender = comment.author_name
     @sender_link = comment.author_link
@@ -28,7 +31,6 @@ class CommentNotifier &lt; ActionMailer::Base
     @unsubscribe_url = comment.article.view_url.merge({:unfollow => true})
     @comment_title = comment.title
     @comment_body = comment.body
-    @environment = profile.environment.name
     @url = profile.environment.top_url
  
     mail(
@@ -30,14 +30,16 @@ class Contact
     Contact::Sender.notification(self).deliver
   end
  
-  class Sender < ActionMailer::Base
+  class Sender < ApplicationMailer
+
     def notification(contact)
+      self.environment = contact.dest.environment
+
       @name = contact.name
       @email = contact.email
       @city = contact.city
       @state = contact.state
       @message = contact.message
-      @environment = contact.dest.environment.name
       @url = url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
       @target = contact.dest.name
  
 class EnvironmentMailing < Mailing
  
   def recipients(offset=0, limit=100)
-   source.people.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+    source.people.order(:id).offset(offset).limit(limit)
+      .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
+      .where("m.person_id" => nil)
   end
  
   def each_recipient
@@ -46,7 +46,8 @@ class Mailing &lt; ActiveRecord::Base
     end
   end
  
-  class Sender < ActionMailer::Base
+  class Sender < ApplicationMailer
+
     def notification(mailing, recipient)
       @message = mailing.body
       @signature_message = mailing.signature_message
@@ -5,7 +5,9 @@ class OrganizationMailing &lt; Mailing
   end
  
   def recipients(offset=0, limit=100)
-    source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+    source.members.order(:id).offset(offset).limit(limit)
+      .joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
+      .where("m.person_id" => nil)
   end
  
   def each_recipient
-class PendingTaskNotifier < ActionMailer::Base
+class PendingTaskNotifier < ApplicationMailer
  
   def notification(person)
+    self.environment = person.environment
+
     @person = person
     @tasks = person.tasks.pending
     @organizations_with_pending_tasks = person.organizations_with_pending_tasks
-    @environment = person.environment.name
     @url = url_for(:host => person.environment.default_hostname, :controller => 'home')
     @default_hostname = person.environment.default_hostname
     @url_for_pending_tasks = url_for(:host => person.environment.default_hostname, :controller => 'tasks', :profile => person.identifier)
-class ScrapNotifier < ActionMailer::Base
+class ScrapNotifier < ApplicationMailer
+
   def notification(scrap)
     sender, receiver = scrap.sender, scrap.receiver
+    self.environment = sender.environment
     # for tests
     return unless receiver.email
  
@@ -9,7 +11,6 @@ class ScrapNotifier &lt; ActionMailer::Base
     @sender_link = sender.url
     @scrap_content = scrap.content
     @wall_url = scrap.scrap_wall_url
-    @environment = sender.environment.name
     @url = sender.environment.top_url
     mail(
       to: receiver.email,
-class TaskMailer < ActionMailer::Base
+class TaskMailer < ApplicationMailer
  
   include EmailTemplateHelper
  
   def target_notification(task, message)
+    self.environment = task.environment
+
     @message = extract_message(message)
     @target = task.target.name
-    @environment = task.environment.name
     @url = generate_environment_url(task, :controller => 'home')
     url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url.merge(:script_name => Noosfero.root('/')))
     @tasks_url = url_for_tasks_list
@@ -13,35 +14,38 @@ class TaskMailer &lt; ActionMailer::Base
     mail(
       to: task.target.notification_emails.compact,
       from: self.class.generate_from(task),
-      subject: "[%s] %s" % [task.environment.name, task.target_notification_description]
+      subject: "[%s] %s" % [self.environment.name, task.target_notification_description]
     )
   end
  
   def invitation_notification(task)
+    self.environment = task.requestor.environment
+
     msg = task.expanded_message
     @message = msg.gsub /<url>/, generate_environment_url(task, :controller => 'account', :action => 'signup', :invitation_code => task.code)
  
     mail(
       to: task.friend_email,
       from: self.class.generate_from(task),
-      subject: '[%s] %s' % [ task.requestor.environment.name, task.target_notification_description ]
+      subject: '[%s] %s' % [ self.environment.name, task.target_notification_description ]
     )
   end
  
   def generic_message(name, task)
+    self.environment = task.requestor.environment
+
     return if !task.respond_to?("#{name}_message")
  
     @message = extract_message(task.send("#{name}_message"))
     @requestor = task.requestor.name
-    @environment = task.requestor.environment.name
-    @url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
+    @url = url_for(:host => self.environment.default_hostname, :controller => 'home')
  
     mail_with_template(
       to: task.requestor.notification_emails,
       from: self.class.generate_from(task),
-      subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
+      subject: '[%s] %s' % [self.environment.name, task.target_notification_description],
       email_template: task.email_template,
-      template_params: {:environment => task.requestor.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
+      template_params: {:environment => self.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
     )
   end
  
-class UserMailer < ActionMailer::Base
+class UserMailer < ApplicationMailer
  
   include EmailTemplateHelper
  
   def activation_email_notify(user)
+    self.environment = user.environment
+
     user_email = "#{user.login}@#{user.email_domain}"
     @name = user.name
     @email = user_email
     @webmail = MailConf.webmail_url(user.login, user.email_domain)
-    @environment = user.environment.name
     @url = url_for(:host => user.environment.default_hostname, :controller => 'home')
  
     mail(
@@ -18,9 +19,10 @@ class UserMailer &lt; ActionMailer::Base
   end
  
   def activation_code(user)
+    self.environment = user.environment
+
     @recipient = user.name
     @activation_code = user.activation_code
-    @environment = user.environment.name
     @url = user.environment.top_url
     @redirection = (true if user.return_to)
     @join = (user.community_to_join if user.community_to_join)
@@ -35,6 +37,8 @@ class UserMailer &lt; ActionMailer::Base
   end
  
   def signup_welcome_email(user)
+    self.environment = user.environment
+
     @body = user.environment.signup_welcome_text_body.gsub('{user_name}', user.name)
     email_subject = user.environment.signup_welcome_text_subject
     mail(
@@ -47,8 +51,9 @@ class UserMailer &lt; ActionMailer::Base
   end
  
   def profiles_suggestions_email(user)
+    self.environment = user.environment
+
     @recipient = user.name
-    @environment = user.environment.name
     @url = user.environment.top_url
     @people_suggestions_url = user.people_suggestions_url
     @people_suggestions = user.suggested_people.sample(3)
@@ -11,7 +11,7 @@ class AddMember &lt; Task
   alias :organization :target
   alias :organization= :target=
  
-  settings_items :roles
+  settings_items :roles, type: Array
  
   after_create do |task|
     remove_from_suggestion_list(task)
@@ -8,7 +8,7 @@ class ApproveComment &lt; Task
   def comment
     unless @comment || self.comment_attributes.nil?
       @comment = Comment.new
-      @comment.assign_attributes(ActiveSupport::JSON.decode(self.comment_attributes), :without_protection => true)
+      @comment.assign_attributes(ActiveSupport::JSON.decode(self.comment_attributes.to_s), :without_protection => true)
     end
     @comment
   end
@@ -83,7 +83,7 @@ class Article &lt; ActiveRecord::Base
  
   has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
  
-  has_many :article_categorizations, :conditions => [ 'articles_categories.virtual = ?', false ]
+  has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
   has_many :categories, :through => :article_categorizations
  
   has_many :article_categorizations_including_virtual, :class_name => 'ArticleCategorization'
@@ -135,17 +135,15 @@ class Article &lt; ActiveRecord::Base
  
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
  
-  scope :in_category, lambda { |category|
-    {:include => 'categories_including_virtual', :conditions => { 'categories.id' => category.id }}
+  scope :in_category, -> category {
+    includes('categories_including_virtual').where('categories.id' => category.id)
   }
  
   include TimeScopes
  
-  scope :by_range, lambda { |range| {
-    :conditions => [
-      'articles.published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
-    ]
-  }}
+  scope :by_range, -> range {
+    where 'articles.published_at BETWEEN :start_date AND :end_date', { start_date: range.first, end_date: range.last }
+  }
  
   URL_FORMAT = /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\Z/ix
  
@@ -269,19 +267,21 @@ class Article &lt; ActiveRecord::Base
  
   # retrieves all articles belonging to the given +profile+ that are not
   # sub-articles of any other article.
-  scope :top_level_for, lambda { |profile|
-    {:conditions => [ 'parent_id is null and profile_id = ?', profile.id ]}
+  scope :top_level_for, -> profile {
+    where 'parent_id is null and profile_id = ?', profile.id
   }
  
-  scope :public,
-    :conditions => [ "articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ], :joins => [:profile]
+  scope :is_public, -> {
+    joins(:profile).
+    where("articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true)
+  }
  
-  scope :more_recent,
-    :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
-      ((articles.type != ?) OR articles.type is NULL)",
-      true, true, true, true, 'RssFeed'
-    ],
-    :order => 'articles.published_at desc, articles.id desc'
+  scope :more_recent, -> {
+    order('articles.published_at desc, articles.id desc')
+    .where("articles.advertise = ? AND articles.published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
+    ((articles.type != ?) OR articles.type is NULL)",
+    true, true, true, true, 'RssFeed')
+  }
  
   # retrives the most commented articles, sorted by the comment count (largest
   # first)
@@ -289,12 +289,14 @@ class Article &lt; ActiveRecord::Base
     paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
   end
  
-  scope :more_popular, :order => 'hits DESC'
-  scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
+  scope :more_popular, -> { order 'hits DESC' }
+  scope :relevant_as_recent, -> {
+   where "(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"
+  }
  
   def self.recent(limit = nil, extra_conditions = {}, pagination = true)
     result = scoped({:conditions => extra_conditions}).
-      public.
+      is_public.
       relevant_as_recent.
       limit(limit).
       order(['articles.published_at desc', 'articles.id desc'])
@@ -419,7 +421,7 @@ class Article &lt; ActiveRecord::Base
     self.translations.map(&:language)
   end
  
-  scope :native_translations, :conditions => { :translation_of_id => nil }
+  scope :native_translations, -> { where :translation_of_id => nil }
  
   def translatable?
     false
@@ -461,7 +463,7 @@ class Article &lt; ActiveRecord::Base
  
   def rotate_translations
     unless self.translations.empty?
-      rotate = self.translations
+      rotate = self.translations.all
       root = rotate.shift
       root.update_attribute(:translation_of_id, nil)
       root.translations = rotate
@@ -474,7 +476,7 @@ class Article &lt; ActiveRecord::Base
     elsif self.native_translation.language == locale
       self.native_translation
     else
-      self.native_translation.translations.first(:conditions => { :language => locale })
+      self.native_translation.translations.where(:language => locale).first
     end
   end
  
@@ -502,19 +504,19 @@ class Article &lt; ActiveRecord::Base
     ['TextArticle', 'TextileArticle', 'TinyMceArticle']
   end
  
-  scope :published, :conditions => ['articles.published = ?', true]
-  scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
-  scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
-  scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
-  scope :images, :conditions => { :is_image => true }
-  scope :no_images, :conditions => { :is_image => false }
-  scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
-  scope :files, :conditions => { :type => 'UploadedFile' }
-  scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
+  scope :published, -> { where 'articles.published = ?', true }
+  scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
+  scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
+  scope :galleries, -> { where "articles.type IN ('Gallery')" }
+  scope :images, -> { where :is_image => true }
+  scope :no_images, -> { where :is_image => false }
+  scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
+  scope :files, -> { where :type => 'UploadedFile' }
+  scope :with_types, -> types { where 'articles.type IN (?)', types }
  
-  scope :more_popular, :order => 'hits DESC'
-  scope :more_comments, :order => "comments_count DESC"
-  scope :more_recent, :order => "created_at DESC"
+  scope :more_popular, -> { order 'hits DESC' }
+  scope :more_comments, -> { order "comments_count DESC" }
+  scope :more_recent, -> { order "created_at DESC" }
  
   scope :display_filter, lambda {|user, profile|
     return published if (user.nil? && profile && profile.public?)
@@ -636,7 +638,7 @@ class Article &lt; ActiveRecord::Base
   ]
  
   def self.find_by_old_path(old_path)
-    find(:first, :include => :versions, :conditions => ['article_versions.path = ?', old_path], :order => 'article_versions.id desc')
+    self.includes(:versions).where('article_versions.path = ?', old_path).order('article_versions.id DESC').first
   end
  
   def hit
@@ -722,11 +724,11 @@ class Article &lt; ActiveRecord::Base
   end
  
   def get_version(version_number = nil)
-    version_number ? versions.find(:first, :order => 'version', :offset => version_number - 1) : versions.earliest
+    if version_number then self.versions.order('version').offset(version_number - 1).first else self.versions.earliest end
   end
  
   def author_by_version(version_number = nil)
-    version_number ? profile.environment.people.find_by_id(get_version(version_number).author_id) : author
+    if version_number then profile.environment.people.where(id: get_version(version_number).author_id).first else author end
   end
  
   def author_name(version_number = nil)
@@ -822,7 +824,7 @@ class Article &lt; ActiveRecord::Base
   end
  
   def activity
-    ActionTracker::Record.find_by_target_type_and_target_id 'Article', self.id
+    ActionTracker::Record.where(target_type: 'Article', target_id: self.id).first
   end
  
   def create_activity
 class ArticleCategorization < ActiveRecord::Base
-  set_table_name :articles_categories
+  self.table_name = :articles_categories
+
   belongs_to :article
   belongs_to :category
  
@@ -20,7 +20,7 @@ class Block &lt; ActiveRecord::Base
  
   acts_as_having_settings
  
-  scope :enabled, :conditions => { :enabled => true }
+  scope :enabled, -> { where :enabled => true }
  
   after_save do |block|
     if block.owner.kind_of?(Profile) && block.owner.is_template? && block.mirror?
@@ -15,7 +15,7 @@ class BlogArchivesBlock &lt; Block
     _('Blog posts')
   end
  
-  settings_items :blog_id, Integer
+  settings_items :blog_id, type: Integer
  
   def blog
     blog_id && owner.blogs.exists?(blog_id) ? owner.blogs.find(blog_id) : owner.blog
@@ -33,10 +33,10 @@ class BlogArchivesBlock &lt; Block
     results = ''
     posts = visible_posts(args[:person])
     posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count|
-      results << content_tag('li', content_tag('strong', "#{year} (#{count})"))
-      results << "<ul class='#{year}-archive'>"
-      posts.except(:order).count(:all, :conditions => ['EXTRACT(YEAR FROM published_at)=?', year], :group => 'EXTRACT(MONTH FROM published_at)').sort_by {|month, count| -month.to_i}.each do |month, count|
-        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(:year => year, :month => month)))
+      results << content_tag('li', content_tag('strong', "#{year.to_i} (#{count})"))
+      results << "<ul class='#{year.to_i}-archive'>"
+      posts.except(:order).where('EXTRACT(YEAR FROM published_at)=?', year.to_i).group('EXTRACT(MONTH FROM published_at)').count.sort_by {|month, count| -month.to_i}.each do |month, count|
+        results << content_tag('li', link_to("#{month_name(month.to_i)} (#{count})", owner_blog.url.merge(year: year.to_i, month: month.to_i)))
       end
       results << "</ul>"
     end
@@ -7,7 +7,7 @@ class Box &lt; ActiveRecord::Base
  
   include Noosfero::Plugin::HotSpot
  
-  scope :with_position, :conditions => ['boxes.position > 0']
+  scope :with_position, -> { where 'boxes.position > 0' }
  
   def environment
     owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
 module Categorization
  
   def add_category_to_object(category, object)
-    if !find(:first, :conditions => {object_id_column => object, :category_id => category} )
+    if !self.where(object_id_column => object, :category_id => category).first
       connection.execute("insert into #{table_name} (category_id, #{object_id_column}) values(#{category.id}, #{object.id})")
  
       c = category.parent
-      while !c.nil? && !self.find(:first, :conditions => {object_id_column => object, :category_id => c})
+      while !c.nil? && !self.where(object_id_column => object, :category_id => c).first
         connection.execute("insert into #{table_name} (category_id, #{object_id_column}, virtual) values(#{c.id}, #{object.id}, 1>0)")
         c = c.parent
       end
@@ -14,12 +14,12 @@ class Category &lt; ActiveRecord::Base
   validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('{fn} is already being used by another category.').fix_i18n
   belongs_to :environment
  
-  # Finds all top level categories for a given environment. 
-  scope :top_level_for, lambda { |environment|
-    {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
+  # Finds all top level categories for a given environment.
+  scope :top_level_for, -> environment {
+    where 'parent_id is null and environment_id = ?', environment.id
   }
  
-  scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
+  scope :on_level, -> parent { where :parent_id => parent }
  
   acts_as_filesystem
  
@@ -46,26 +46,26 @@ class Category &lt; ActiveRecord::Base
     display_color = nil if display_color.blank?
   end
  
-  scope :from_types, lambda { |types|
-    types.select{ |t| t.blank? }.empty? ?
-      { :conditions => { :type => types } } :
-      { :conditions => [ "type IN (?) OR type IS NULL", types.reject{ |t| t.blank? } ] }
+  scope :from_types, -> types {
+    if types.select{ |t| t.blank? }.empty? then
+      where(type: types) else
+      where("type IN (?) OR type IS NULL", types.reject{ |t| t.blank? }) end
   }
  
   def recent_people(limit = 10)
-    self.people.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.people.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
  
   def recent_enterprises(limit = 10)
-    self.enterprises.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.enterprises.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
  
   def recent_communities(limit = 10)
-    self.communities.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.communities.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
  
   def recent_products(limit = 10)
-    self.products.paginate(:order => 'created_at DESC, id DESC', :page => 1, :per_page => limit)
+    self.products.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
  
   def recent_articles(limit = 10)
@@ -73,7 +73,7 @@ class Category &lt; ActiveRecord::Base
   end
  
   def recent_comments(limit = 10)
-    comments.paginate(:order => 'created_at DESC, comments.id DESC', :page => 1, :per_page => limit)
+    self.comments.reorder('created_at DESC, comments.id DESC').paginate(page: 1, per_page: limit)
   end
  
   def most_commented_articles(limit = 10)
@@ -81,7 +81,7 @@ class Category &lt; ActiveRecord::Base
   end
  
   def upcoming_events(limit = 10)
-    self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :page => 1, :per_page => limit)
+    self.events.where('start_date >= ?', DateTime.now.beginning_of_day).order('start_date').paginate(page: 1, per_page: limit)
   end
  
   def display_in_menu?
@@ -90,11 +90,11 @@ class Category &lt; ActiveRecord::Base
  
   def children_for_menu
     results = []
-    pending = children.find(:all, :conditions => { :display_in_menu => true})
-    while !pending.empty?
+    pending = children.where(display_in_menu: true).all
+    while pending.present?
       cat = pending.shift
       results << cat
-      pending += cat.children.find(:all, :conditions => { :display_in_menu => true} )
+      pending += cat.children.where :display_in_menu => true
     end
  
     results
@@ -102,7 +102,7 @@ class Category &lt; ActiveRecord::Base
  
   def is_leaf_displayable_in_menu?
     return false if self.display_in_menu == false
-    self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
+    self.children.where(:display_in_menu => true).empty?
   end
  
   def with_color
@@ -20,7 +20,7 @@ class Certifier &lt; ActiveRecord::Base
   validates_presence_of :name
  
   def destroy
-    product_qualifiers.each { |pq| pq.update_attributes! :certifier => nil }
+    product_qualifiers.each { |pq| pq.update! :certifier => nil }
     super
   end
  
@@ -18,7 +18,7 @@ class Comment &lt; ActiveRecord::Base
   has_many :children, :class_name => 'Comment', :foreign_key => 'reply_of_id', :dependent => :destroy
   belongs_to :reply_of, :class_name => 'Comment', :foreign_key => 'reply_of_id'
  
-  scope :without_reply, :conditions => ['reply_of_id IS NULL']
+  scope :without_reply, -> { where 'reply_of_id IS NULL' }
  
   include TimeScopes
  
@@ -29,7 +29,7 @@ class Community &lt; Organization
   # places that call this method are safe from mass-assignment by setting the
   # environment key themselves.
   def self.create_after_moderation(requestor, attributes = {})
-    environment = attributes.delete(:environment)
+    environment = attributes[:environment]
     community = Community.new(attributes)
     community.environment = environment
     if community.environment.enabled?('admin_must_approve_new_communities')
@@ -34,7 +34,7 @@ class CreateCommunity &lt; Task
       ! DATA_FIELDS.include?(key.to_s)
     end
  
-    community.update_attributes(community_data)
+    community.update(community_data)
     community.image = image if image
     community.environment = self.environment
     community.save!
@@ -16,13 +16,13 @@ class CreateEnterprise &lt; Task
     settings_items field.to_sym
   end
  
-  # checks for virtual attributes 
+  # checks for virtual attributes
   validates_presence_of :name, :identifier
  
   #checks if the validation method is region to validates
   validates_presence_of :region_id, :if => lambda { |obj| obj.environment.organization_approval_method == :region }
  
-  validates_format_of :foundation_year, :with => /^\d*$/
+  validates_numericality_of :foundation_year, only_integer: true, if: -> o { o.foundation_year.present? }
  
   # checks for actual attributes
   validates_presence_of :requestor_id, :target_id
@@ -129,7 +129,7 @@ class CreateEnterprise &lt; Task
     finish
   end
  
-  # tells if this request was appoved 
+  # tells if this request was appoved
   def approved?
     self.status == Task::Status::FINISHED
   end
@@ -0,0 +1,34 @@
+class CustomField < ActiveRecord::Base
+  attr_accessible :name, :default_value, :format, :extras, :customized_type, :active, :required, :signup, :environment
+  serialize :customized_type
+  serialize :extras
+  has_many :custom_field_values, :dependent => :delete_all
+  belongs_to :environment
+
+  validates_presence_of :name, :format, :customized_type, :environment
+  validate :related_to_other?
+  validate :unique?
+
+  def unique?
+    if environment.custom_fields.any?{|cf| cf.name==name && cf.environment == environment && cf.customized_type==customized_type && new_record?}
+      errors.add(:body, N_("There is a field with the same name for this type in this environment"))
+      return false
+    end
+    true
+  end
+
+  def related_to_other?
+    environment.custom_fields.any? do |cf|
+      if cf.name == name && cf.customized_type != customized_type
+        ancestor = cf.customized_type.constantize < customized_type.constantize
+        descendant = cf.customized_type.constantize > customized_type.constantize
+        if ancestor || descendant
+          errors.add(:body, N_("New field related to existent one with same name"))
+          return false
+        end
+      end
+    end
+    true
+  end
+end
+
@@ -0,0 +1,14 @@
+class CustomFieldValue < ActiveRecord::Base
+  belongs_to :custom_field
+  belongs_to :customized, :polymorphic => true
+  attr_accessible :value, :public, :customized, :custom_field, :customized_type
+  validate :can_save?
+
+  def can_save?
+    if value.blank? && custom_field.required
+      errors.add(custom_field.name, _("can't be blank"))
+      return false
+    end
+    return true
+  end
+end
@@ -14,7 +14,7 @@ class Domain &lt; ActiveRecord::Base
  
   # <tt>name</tt> must be sequences of alphanumeric characters (a to z,
   # 0 to 9), plus '_' or '-', separated by dots. Letters must be lowercase.
-  validates_format_of :name, :with => /^([a-z0-9_-]+\.)+[a-z0-9_-]+$/, :message => N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
+  validates_format_of :name, with: /\A([a-z0-9_-]+\.)+[a-z0-9_-]+\z/, message: N_('{fn} must be composed of sequences of lowercase letters (a to z), numbers (0 to 9), "_" and "-", separated by dots.').fix_i18n
  
   # checks validations that could not be expressed using Rails' predefined
   # validations. In particular:
@@ -37,7 +37,7 @@ class Domain &lt; ActiveRecord::Base
   # "www.", but it will be removed before searching. So searching for
   # 'www.example.net' is exactly the same as searching for just 'example.net'
   def self.find_by_name(name)
-    self.find(:first, :conditions => [ 'name = ?', self.extract_domain_name(name) ])
+    self.where('name = ?', self.extract_domain_name(name)).first
   end
  
   # turns the argument (expected to be a String) into a domain name that is
@@ -71,7 +71,7 @@ class Enterprise &lt; Organization
   end
  
   def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true}, :joins => :image}.merge(options))
+    Product.where(:highlighted => true).joins(:image)
   end
  
   def required_fields
@@ -17,10 +17,14 @@ class Environment &lt; ActiveRecord::Base
  
   has_many :users
  
-  self.partial_updates = false
+  # allow roles use
+  def self.dangerous_attribute_method? name
+    false
+  end
  
   has_many :tasks, :dependent => :destroy, :as => 'target'
   has_many :search_terms, :as => :context
+  has_many :custom_fields, :dependent => :destroy
   has_many :email_templates, :foreign_key => :owner_id
  
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
@@ -110,7 +114,7 @@ class Environment &lt; ActiveRecord::Base
   def admins
     admin_role = Environment::Roles.admin(self)
     return [] if admin_role.blank?
-    Person.members_of(self).all(:conditions => ['role_assignments.role_id = ?', admin_role.id])
+    Person.members_of(self).where 'role_assignments.role_id = ?', admin_role.id
   end
  
   # returns the available features for a Environment, in the form of a
@@ -225,9 +229,11 @@ class Environment &lt; ActiveRecord::Base
   has_many :licenses
  
   has_many :categories
-  has_many :display_categories, :class_name => 'Category', :conditions => 'display_color is not null and parent_id is null', :order => 'display_color'
+  has_many :display_categories, -> {
+    order('display_color').where('display_color is not null and parent_id is null')
+  }, class_name: 'Category'
  
-  has_many :product_categories, :conditions => { :type => 'ProductCategory'}
+  has_many :product_categories, -> { where type: 'ProductCategory'}
   has_many :regions
   has_many :states
   has_many :cities
@@ -349,7 +355,7 @@ class Environment &lt; ActiveRecord::Base
   settings_items :signup_welcome_screen_body, :type => String
  
   #Captcha settings
-  settings_items :api_captcha_settings, :type => ActiveSupport::HashWithIndifferentAccess, :default => {}
+  settings_items :api_captcha_settings, :default => {}
  
   def has_custom_welcome_screen?
     settings[:signup_welcome_screen_body].present?
@@ -495,8 +501,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def custom_person_fields
-    self.settings[:custom_person_fields] = {} if self.settings[:custom_person_fields].nil?
-    self.settings[:custom_person_fields]
+    self.settings[:custom_person_fields].nil? ? {} : self.settings[:custom_person_fields]
   end
  
   def custom_person_fields=(values)
@@ -696,7 +701,7 @@ class Environment &lt; ActiveRecord::Base
  
   # the default Environment.
   def self.default
-    self.find(:first, :conditions => [ 'is_default = ?', true ] )
+    self.where('is_default = ?', true).first
   end
  
   # returns an array with the top level categories for this environment.
@@ -877,7 +882,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def portal_folders
-    (settings[:portal_folders] || []).map{|fid| portal_community.articles.find(:first, :conditions => { :id => fid }) }.compact
+    (settings[:portal_folders] || []).map{|fid| portal_community.articles.where(id: fid).first }.compact
   end
  
   def portal_folders=(folders)
@@ -964,7 +969,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def highlighted_products_with_image(options = {})
-    Product.find(:all, {:conditions => {:highlighted => true, :profile_id => self.enterprises.find(:all, :select => :id) }, :joins => :image}.merge(options))
+    self.products.where(highlighted: true).joins(:image).order('created_at ASC')
   end
  
   settings_items :home_cache_in_minutes, :type => :integer, :default => 5
@@ -13,14 +13,14 @@ class Event &lt; Article
   settings_items :presenter, :type => :string
  
   def link=(value)
-    self.setting[:link] = maybe_add_http(value)
+    self.setting[:link] = maybe_add_http(URI.escape value.to_s)
   end
  
   def link
     maybe_add_http(self.setting[:link])
   end
  
-  xss_terminate :only => [ :name, :body, :link, :address ], :with => 'white_list', :on => 'validation'
+  xss_terminate :only => [ :name, :body, :address ], :with => 'white_list', :on => 'validation'
  
   def initialize(*args)
     super(*args)
@@ -35,23 +35,21 @@ class Event &lt; Article
     end
   end
  
-  scope :by_day, lambda { |date|
-    { :conditions => [' start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)', {:start_date => date.beginning_of_day, :end_date => date.end_of_day}],
-      :order => 'start_date ASC'
-    }
+  scope :by_day, -> date {
+    where('start_date >= :start_date AND start_date <= :end_date AND end_date IS NULL OR (start_date <= :end_date  AND end_date >= :start_date)',
+          start_date: date.beginning_of_day, end_date: date.end_of_day).
+    order('start_date ASC')
   }
  
-  scope :next_events_from_month, lambda { |date|
+  scope :next_events_from_month, -> date {
     date_temp = date.strftime("%Y-%m-%d")
-    { :conditions => ["start_date >= ?","#{date_temp}"],
-      :order => 'start_date ASC'
-    }
+    order('start_date ASC')
+    .where("start_date >= ?","#{date_temp}")
   }
  
-  scope :by_month, lambda { |date|
-    { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
-      :order => 'start_date ASC'
-    }
+  scope :by_month, -> date {
+    order('start_date ASC')
+    .where("EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?", date.year, date.month)
   }
  
   include WhiteListFilter
@@ -72,12 +70,10 @@ class Event &lt; Article
     'event'
   end
  
-  scope :by_range, lambda { |range| {
-    :conditions => [
-      'start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
-      { :start_day => range.first, :end_day => range.last }
-    ]
-  }}
+  scope :by_range, -> range {
+    where('start_date BETWEEN :start_day AND :end_day OR end_date BETWEEN :start_day AND :end_day',
+      {:start_day => range.first, :end_day => range.last})
+  }
  
   def self.date_range(year, month)
     if year.nil? || month.nil?
@@ -92,11 +88,11 @@ class Event &lt; Article
     first_day = DateTime.new(year, month, 1)
     last_day = first_day + 1.month - 1.day
  
-    first_day..last_day
+    first_day.to_date..last_day.to_date
   end
  
   def date_range
-    start_date..(end_date||start_date)
+    start_date.to_date..(end_date||start_date).to_date
   end
  
   def first_paragraph
@@ -115,7 +111,7 @@ class Event &lt; Article
   end
  
   def duration
-    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24)
+    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) + 1
   end
  
   alias_method :article_lead, :lead
@@ -5,9 +5,9 @@ class ExternalFeed &lt; ActiveRecord::Base
   validates_presence_of :address, :if => lambda {|efeed| efeed.enabled}
   validates_uniqueness_of :blog_id
  
-  scope :enabled, :conditions => { :enabled => true }
-  scope :expired, lambda {
-    { :conditions => ['(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval] }
+  scope :enabled, -> { where enabled: true }
+  scope :expired, -> {
+    where '(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval
   }
  
   attr_accessible :address, :enabled, :only_once
@@ -11,7 +11,7 @@ class FeaturedProductsBlock &lt; Block
     if block.owner.kind_of?(Environment) && block.product_ids.blank?
       total = block.owner.products.count
       offset = rand([(total - block.groups_of * 3) + 1, 1].max)
-      block.product_ids = block.owner.highlighted_products_with_image(:offset => offset, :limit => block.groups_of * 3).map(&:id)
+      block.product_ids = block.owner.highlighted_products_with_image.offset(offset).limit(block.groups_of * 3).map(&:id)
     end
     block.groups_of = block.groups_of.to_i
   end
@@ -27,8 +27,8 @@ class FeedReaderBlock &lt; Block
   settings_items :update_errors, :type => :integer, :default => 0
   settings_items :error_message, :type => :string
  
-  scope :expired, lambda {
-    { :conditions => [ '(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval] }
+  scope :expired, -> {
+    where '(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval
   }
  
   before_create do |block|
@@ -56,10 +56,11 @@ class Folder &lt; Article
     profile.recent_documents(limit, ["articles.type != ? AND articles.highlighted = ? AND articles.parent_id = ?", 'Folder', highlight, id])
   end
  
-  has_many :images, :class_name => 'Article',
-                    :foreign_key => 'parent_id',
-                    :order => 'articles.type, articles.name',
-                    :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types]
+  has_many :images, -> {
+    order('articles.type, articles.name').
+    where("articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type in ('Folder','Gallery')", UploadedFile.content_types)
+  }, class_name: 'Article', foreign_key: 'parent_id'
+
  
   def accept_uploads?
     !self.has_posts? || self.gallery?
 class Image < ActiveRecord::Base
  
+  attr_accessible :uploaded_data, :label, :remove_image
+  attr_accessor :remove_image
+
   def self.max_size
     Image.attachment_options[:max_size]
   end
  
   sanitize_filename
  
-  has_attachment :content_type => :image, 
-                 :storage => :file_system, 
+  has_attachment :content_type => :image,
+                 :storage => :file_system,
                  :path_prefix => 'public/image_uploads',
                  :resize_to => '800x600>',
                  :thumbnails => { :big      => '150x150',
@@ -15,7 +18,8 @@ class Image &lt; ActiveRecord::Base
                                   :portrait => '64x64',
                                   :minor    => '50x50>',
                                   :icon     => '20x20!' },
-                 :max_size => 5.megabytes # remember to update validate message below
+                 :max_size => 5.megabytes, # remember to update validate message below
+                 processor: 'Rmagick'
  
   validates_attachment :size => N_("{fn} of uploaded file was larger than the maximum size of 5.0 MB").fix_i18n
  
@@ -23,10 +27,8 @@ class Image &lt; ActiveRecord::Base
  
   postgresql_attachment_fu
  
-  attr_accessible :uploaded_data, :label, :remove_image
-  attr_accessor :remove_image
-
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
   end
+
 end
@@ -13,7 +13,7 @@ class Input &lt; ActiveRecord::Base
  
   belongs_to :unit
  
-  scope :relevant_to_price, :conditions => { :relevant_to_price => true }
+  scope :relevant_to_price, -> { where relevant_to_price: true }
  
   include FloatHelper
  
@@ -45,7 +45,7 @@ class InviteFriend &lt; Invitation
   private
   def check_for_invitation_existence
     if friend
-      friend.tasks.pending.of("InviteFriend").find(:all, :conditions => {:requestor_id => person.id, :target_id => friend.id}).blank?
+      friend.tasks.pending.of("InviteFriend").where(requestor_id: person.id, target_id: friend.id).blank?
     end
   end
  
@@ -65,7 +65,7 @@ class InviteMember &lt; Invitation
   private
   def check_for_invitation_existence
     if friend
-      friend.tasks.pending.of("InviteMember").find(:all, :conditions => {:requestor_id => person.id}).select { |t| t.data[:community_id] == community_id }.blank?
+      friend.tasks.pending.of("InviteMember").where(requestor_id: person.id).select{ |t| t.data[:community_id] == community_id }.blank?
     end
   end
  
@@ -41,7 +41,7 @@ class LinkListBlock &lt; Block
     [N_('New window'), '_new'],
   ]
  
-  settings_items :links, Array, :default => []
+  settings_items :links, type: Array, :default => []
  
   before_save do |block|
     block.links = block.links.delete_if {|i| i[:name].blank? and i[:address].blank?}
@@ -84,7 +84,7 @@ class Organization &lt; Profile
   end
  
   def find_pending_validation(code)
-    validations.pending.find(:first, :conditions => {:code => code})
+    validations.pending.where(code: code).first
   end
  
   def processed_validations
@@ -92,7 +92,7 @@ class Organization &lt; Profile
   end
  
   def find_processed_validation(code)
-    validations.finished.find(:first, :conditions => {:code => code})
+    validations.finished.where(code: code).first
   end
  
   def is_validation_entity?
@@ -116,6 +116,7 @@ class Organization &lt; Profile
     tag_list
     template_id
     district
+    address_line2
     address_reference
   ]
  
@@ -136,11 +137,11 @@ class Organization &lt; Profile
   end
  
   N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference')
-  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_line2, :address_reference
  
   settings_items :zip_code, :city, :state, :country
  
-  validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
+  validates_numericality_of :foundation_year, only_integer: true, if: -> o { o.foundation_year.present? }
   validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
   validates_as_cnpj :cnpj
  
@@ -194,7 +195,7 @@ class Organization &lt; Profile
   end
  
   def already_request_membership?(person)
-    self.tasks.pending.find_by_requestor_id(person.id, :conditions => { :type => 'AddMember' })
+    self.tasks.pending.where(type: 'AddMember', requestor_id: person.id).first
   end
  
   def jid(options = {})
@@ -19,45 +19,41 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
  
-
-  scope :members_of, lambda { |resources, extra_joins = nil|
-    resources = [resources] if !resources.kind_of?(Array)
+  scope :members_of, -> resources {
+    resources = Array(resources)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    joins = [:role_assignments]
-    joins += extra_joins if extra_joins.is_a? Array
-    { :select => 'DISTINCT profiles.*', :joins => joins, :conditions => [conditions] }
+    select('DISTINCT profiles.*').joins(:role_assignments).where([conditions])
   }
  
-  scope :not_members_of, lambda { |resources|
-    resources = [resources] if !resources.kind_of?(Array)
+  scope :not_members_of, -> resources {
+    resources = Array(resources)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] }
+    select('DISTINCT profiles.*').where('"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions)
   }
  
-  scope :by_role, lambda { |roles, extra_joins = nil|
-    roles = [roles] unless roles.kind_of?(Array)
-    joins = [:role_assignments]
-    joins += extra_joins if extra_joins.is_a? Array
-    { :select => 'DISTINCT profiles.*', :joins => joins, :conditions => ['role_assignments.role_id IN (?)',roles] }
+  scope :by_role, -> roles {
+    roles = Array(roles)
+    select('DISTINCT profiles.*').joins(:role_assignments).where('role_assignments.role_id IN (?)', roles)
   }
  
-  scope :not_friends_of, lambda { |resources|
+  scope :not_friends_of, -> resources {
     resources = Array(resources)
-    { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id)] }
+    select('DISTINCT profiles.*').where('"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "friendships" ON "friendships"."person_id" = "profiles"."id" WHERE "friendships"."friend_id" IN (%s))' % resources.map(&:id))
   }
  
   scope :visible_for_person, lambda { |person|
-   joins('LEFT JOIN "role_assignments" ON
-         "role_assignments"."resource_id" = "profiles"."environment_id" AND
-         "role_assignments"."resource_type" = \'Environment\'')
-   .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
-   .joins('LEFT JOIN "friendships" ON "friendships"."friend_id" = "profiles"."id"')
-   .where(
-     ['( roles.key = ? AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
-       ( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?) )', 'environment_administrator', Profile.name, person.id, person.id,  true, true]
-   ).uniq
+    joins('LEFT JOIN "role_assignments" ON
+          "role_assignments"."resource_id" = "profiles"."environment_id" AND
+          "role_assignments"."resource_type" = \'Environment\'')
+    .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
+    .joins('LEFT JOIN "friendships" ON "friendships"."friend_id" = "profiles"."id"')
+    .where(
+      ['( roles.key = ? AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
+        ( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?) )', 'environment_administrator', Profile.name, person.id, person.id,  true, true]
+    ).uniq
   }
  
+
   def has_permission_with_admin?(permission, resource)
     return true if resource.blank? || resource.admins.include?(self)
     return true if resource.kind_of?(Profile) && resource.environment.admins.include?(self)
@@ -74,6 +70,9 @@ class Person &lt; Profile
   end
   alias_method_chain :has_permission?, :plugins
  
+  # for eager loading
+  has_many :memberships, through: :role_assignments, source: :resource, source_type: 'Profile'
+
   def memberships
     scopes = []
     plugins_scopes = plugins.dispatch_scopes(:person_memberships, self)
@@ -95,7 +94,9 @@ class Person &lt; Profile
   has_many :friendships, :dependent => :destroy
   has_many :friends, :class_name => 'Person', :through => :friendships
  
-  scope :online, lambda { { :include => :user, :conditions => ["users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes] } }
+  scope :online, -> {
+    joins(:user).where("users.chat_status != '' AND users.chat_status_at >= ?", DateTime.now - User.expires_chat_status_every.minutes)
+  }
  
   has_many :requested_tasks, :class_name => 'Task', :foreign_key => :requestor_id, :dependent => :destroy
  
@@ -111,21 +112,31 @@ class Person &lt; Profile
   has_and_belongs_to_many :acepted_forums, :class_name => 'Forum', :join_table => 'terms_forum_people'
   has_and_belongs_to_many :articles_with_access, :class_name => 'Article', :join_table => 'article_privacy_exceptions'
  
-  has_many :suggested_profiles, :class_name => 'ProfileSuggestion', :foreign_key => :person_id, :order => 'score DESC', :dependent => :destroy
-  has_many :suggested_people, :through => :suggested_profiles, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true]
-  has_many :suggested_communities, :through => :suggested_profiles, :source => :suggestion, :conditions => ['profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true]
+  has_many :suggested_profiles, class_name: 'ProfileSuggestion', foreign_key: :person_id, order: 'score DESC', dependent: :destroy
+  has_many :suggested_people, -> {
+    where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Person', true
+  }, through: :suggested_profiles, source: :suggestion
+  has_many :suggested_communities, -> {
+    where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true
+  }, through: :suggested_profiles, source: :suggestion
  
-  scope :more_popular, :order => 'friends_count DESC'
+  scope :more_popular, -> { order 'friends_count DESC' }
  
-  scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
-  scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
+  scope :abusers, -> {
+    joins(:abuse_complaints).where('tasks.status = 3').select('DISTINCT profiles.*')
+  }
+  scope :non_abusers, -> {
+    select("DISTINCT profiles.*").
+    joins("LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'").
+    where("tasks.status != 3 OR tasks.id is NULL")
+  }
  
-  scope :admins, :joins => [:role_assignments => :role], :conditions => ['roles.key = ?', 'environment_administrator' ]
-  scope :activated, :joins => :user, :conditions => ['users.activation_code IS NULL AND users.activated_at IS NOT NULL']
-  scope :deactivated, :joins => :user, :conditions => ['NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)']
+  scope :admins, -> { joins(:role_assignments => :role).where('roles.key = ?', 'environment_administrator') }
+  scope :activated, -> { joins(:user).where('users.activation_code IS NULL AND users.activated_at IS NOT NULL') }
+  scope :deactivated, -> { joins(:user).where('NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)') }
  
   after_destroy do |person|
-    Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
+    Friendship.where(friend_id: person.id).each{ |friendship| friendship.destroy }
   end
  
   belongs_to :user, :dependent => :delete
@@ -188,7 +199,7 @@ class Person &lt; Profile
   end
  
   def remove_friend(friend)
-    Friendship.find(:first, :conditions => {:friend_id => friend, :person_id => id}).destroy
+    Friendship.where(friend_id: friend, person_id: id).first.destroy
   end
  
   FIELDS = %w[
@@ -205,6 +216,7 @@ class Person &lt; Profile
   district
   zip_code
   address
+  address_line2
   address_reference
   cell_phone
   comercial_phone
@@ -219,7 +231,7 @@ class Person &lt; Profile
   organization
   organization_website
   contact_phone
-  contact_informatioin
+  contact_information
   ]
  
   xss_terminate :only => [ :custom_footer, :custom_header, :description, :nickname, :sex, :nationality, :country, :district, :zip_code, :address, :address_reference, :cell_phone, :comercial_phone, :personal_website, :jabber_id, :schooling, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization, :organization_website, :contact_phone, :contact_information ], :with => 'white_list'
@@ -272,7 +284,7 @@ class Person &lt; Profile
   settings_items :formation, :custom_formation, :custom_area_of_study
  
   N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code'); N_('District'); N_('Address reference')
-  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_reference
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_line2, :address_reference
  
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -301,7 +313,7 @@ class Person &lt; Profile
   end
  
   validates_each :email, :on => :update do |record,attr,value|
-    if User.find(:first, :conditions => ['email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id])
+    if User.where('email = ? and id != ? and environment_id = ?', value, record.user.id, record.environment.id).first
       record.errors.add(attr, _('{fn} is already used by other user').fix_i18n)
     end
   end
@@ -410,7 +422,7 @@ class Person &lt; Profile
   def ask_to_join?(community)
     return false if !community.visible?
     return false if memberships.include?(community)
-    return false if AddMember.find(:first, :conditions => {:requestor_id => self.id, :target_id => community.id})
+    return false if AddMember.where(requestor_id: self.id, target_id: community.id).first
     !refused_communities.include?(community)
   end
  
+# FIXME needed by test/units/application_helper.rb
+require_dependency 'application_helper'
+
 class PersonNotifier
  
   def initialize(person)
@@ -28,7 +31,7 @@ class PersonNotifier
  
   def notify
     if @person.notification_time && @person.notification_time > 0
-      notifications = @person.tracked_notifications.find(:all, :conditions => ["created_at > ?", notify_from])
+      notifications = @person.tracked_notifications.where("created_at > ?", notify_from)
       tasks = Task.to(@person).without_spam.pending.where("created_at > ?", notify_from).order_by('created_at', 'asc')
  
       Noosfero.with_locale @person.environment.default_language do
@@ -74,9 +77,8 @@ class PersonNotifier
  
   end
  
-  class Mailer < ActionMailer::Base
+  class Mailer < ApplicationMailer
  
-    helper ApplicationHelper
     helper ActionTrackerHelper
  
     def session
@@ -85,8 +87,8 @@ class PersonNotifier
  
     def content_summary(person, notifications, tasks)
       if person.environment
-        ActionMailer::Base.asset_host = person.environment.top_url
-        ActionMailer::Base.default_url_options[:host] = person.environment.default_hostname
+        ApplicationMailer.asset_host = person.environment.top_url
+        ApplicationMailer.default_url_options[:host] = person.environment.default_hostname
       end
  
       @current_theme = 'default'
@@ -94,7 +96,7 @@ class PersonNotifier
       @recipient = @profile.nickname || @profile.name
       @notifications = notifications
       @tasks = tasks
-      @environment = @profile.environment.name
+      @environment = @profile.environment
       @url = @profile.environment.top_url
       mail(
         content_type: "text/html",
@@ -52,8 +52,8 @@ class Product &lt; ActiveRecord::Base
  
   scope :more_recent, :order => "created_at DESC"
  
-  scope :from_category, lambda { |category|
-    {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category
+  scope :from_category, -> category {
+    joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
   }
  
   scope :visible_for_person, lambda { |person|
@@ -6,22 +6,19 @@ class ProductCategory &lt; Category
   attr_accessible :name, :parent, :environment
  
   scope :unique, :select => 'DISTINCT ON (path) categories.*'
-  scope :by_enterprise, lambda { |enterprise| {
-    :joins => :products,
-    :conditions => ['products.profile_id = ?', enterprise.id]
-  }}
-  scope :by_environment, lambda { |environment| {
-    :conditions => ['environment_id = ?', environment.id]
-  }}
-
-  # updated scope method to avoid sql injection vunerabillity (http://brakemanscanner.org/docs/warning_types/sql_injection/)
-  # explicited to_i on level argument
-  scope :unique_by_level, lambda { |level| {
-    :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level.to_i}) AS filtered_category, categories.*"
-  }}
+  scope :by_enterprise, -> enterprise {
+    joins(:products).
+    where('products.profile_id = ?', enterprise.id)
+  }
+  scope :by_environment, -> environment {
+    where 'environment_id = ?', environment.id
+  }
+  scope :unique_by_level, -> level {
+    select "DISTINCT ON (filtered_category) split_part(path, '/', #{level}) AS filtered_category, categories.*"
+  }
  
   def all_products
-    Product.find(:all, :conditions => { :product_category_id => (all_children << self).map(&:id) })
+    Product.where(product_category_id: (all_children << self).map(&:id))
   end
  
   def self.menu_categories(top_category, env)
@@ -39,7 +39,7 @@ class ProductsBlock &lt; Block
     link_to(_('View all products'), owner.public_profile_url.merge(:controller => 'catalog', :action => 'index'))
   end
  
-  settings_items :product_ids, Array
+  settings_items :product_ids, type: Array
   def product_ids=(array)
     self.settings[:product_ids] = array
     if self.settings[:product_ids]
@@ -79,7 +79,7 @@ class Profile &lt; ActiveRecord::Base
       all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
     end
     def self.all_roles(env_id)
-      Role.all :conditions => { :environment_id => env_id }
+      Role.where(environment_id: env_id)
     end
     def self.method_missing(m, *args, &block)
       role = find_role(m, args[0])
@@ -114,23 +114,32 @@ class Profile &lt; ActiveRecord::Base
   }
  
   acts_as_accessible
+  acts_as_customizable
  
   include Noosfero::Plugin::HotSpot
  
-  scope :memberships_of, lambda { |person| { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id ] } }
+  scope :memberships_of, -> person {
+    select('DISTINCT profiles.*').
+    joins(:role_assignments).
+    where('role_assignments.accessor_type = ? AND role_assignments.accessor_id = ?', person.class.base_class.name, person.id)
+  }
   #FIXME: these will work only if the subclass is already loaded
-  scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
-  scope :templates, lambda { |template_id = nil|
-    conditions = {:conditions => {:is_template => true}}
-    conditions[:conditions].merge!({:id => template_id}) unless template_id.nil?
-    conditions
+  scope :enterprises, -> {
+    where((Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
+  }
+  scope :communities, -> {
+    where((Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR "))
+  }
+  scope :templates, -> template_id = nil {
+    s = where is_template: true
+    s = s.where id: template_id if template_id
+    s
   }
  
-  scope :with_templates, lambda { |templates|
-    {:conditions => {:template_id => templates}}
+  scope :with_templates, -> templates {
+    where template_id: templates
   }
-  scope :no_templates, {:conditions => {:is_template => false}}
+  scope :no_templates, -> { where is_template: false }
  
   # Returns a scoped object to select profiles in a given location or in a radius
   # distance from the given location center.
@@ -195,8 +204,8 @@ class Profile &lt; ActiveRecord::Base
     alias_method_chain :count, :distinct
   end
  
-  def members_by_role(roles, with_entities = nil)
-    Person.members_of(self, with_entities).by_role(roles, with_entities)
+  def members_by_role(roles)
+    Person.members_of(self).by_role(roles)
   end
  
   acts_as_having_boxes
@@ -207,10 +216,10 @@ class Profile &lt; ActiveRecord::Base
     Profile.column_names.map{|n| [Profile.table_name, n].join('.')}.join(',')
   end
  
-  scope :visible, :conditions => { :visible => true, :secret => false }
-  scope :disabled, :conditions => { :visible => false }
-  scope :public, :conditions => { :visible => true, :public_profile => true, :secret => false }
-  scope :enabled, :conditions => { :enabled => true }
+  scope :visible, -> { where visible: true, secret: false }
+  scope :disabled, -> { where visible: false }
+  scope :is_public, -> { where visible: true, public_profile: true, secret: false }
+  scope :enabled, -> { where enabled: true }
  
   # Subclasses must override this method
   scope :more_popular
@@ -262,7 +271,7 @@ class Profile &lt; ActiveRecord::Base
   validates_length_of :description, :maximum => 550, :allow_nil => true
  
   # Valid identifiers must match this format.
-  IDENTIFIER_FORMAT = /^#{Noosfero.identifier_format}$/
+  IDENTIFIER_FORMAT = /\A#{Noosfero.identifier_format}\Z/
  
   # These names cannot be used as identifiers for Profiles
   RESERVED_IDENTIFIERS = %w[
@@ -314,7 +323,7 @@ class Profile &lt; ActiveRecord::Base
     end
   end
  
-  has_many :profile_categorizations, :conditions => [ 'categories_profiles.virtual = ?', false ]
+  has_many :profile_categorizations, -> { where 'categories_profiles.virtual = ?', false }
   has_many :categories, :through => :profile_categorizations
  
   has_many :profile_categorizations_including_virtual, :class_name => 'ProfileCategorization'
@@ -541,14 +550,13 @@ class Profile &lt; ActiveRecord::Base
     self.articles.recent(limit, options, pagination)
   end
  
-  def last_articles(limit = 10, options = {})
-    options = { :limit => limit,
-                :conditions => ["advertise = ? AND published = ? AND
-                                 ((articles.type != ? and articles.type != ? and articles.type != ?) OR
-                                 articles.type is NULL)",
-                                 true, true, 'UploadedFile', 'RssFeed', 'Blog'],
-                :order => 'articles.published_at desc, articles.id desc' }.merge(options)
-    self.articles.find(:all, options)
+  def last_articles limit = 10
+    self.articles.limit(limit).where(
+      "advertise = ? AND published = ? AND
+      ((articles.type != ? and articles.type != ? and articles.type != ?) OR
+      articles.type is NULL)",
+      true, true, 'UploadedFile', 'RssFeed', 'Blog'
+    ).order('articles.published_at desc, articles.id desc')
   end
  
   def to_liquid
@@ -752,7 +760,7 @@ private :generate_url, :url_options
         num = num + 1
         new_name = original_article.name + ' ' + num.to_s
       end
-      original_article.update_attributes!(:name => new_name)
+      original_article.update!(:name => new_name)
     end
     article_copy = article.copy(:profile => self, :parent => parent, :advertise => false)
     if article.profile.home_page == article
@@ -942,11 +950,11 @@ private :generate_url, :url_options
     self.forums.count.nonzero?
   end
  
-  def admins(with_entities = nil)
+  def admins
     return [] if environment.blank?
     admin_role = Profile::Roles.admin(environment.id)
     return [] if admin_role.blank?
-    self.members_by_role(admin_role, with_entities)
+    self.members_by_role(admin_role)
   end
  
   def enable_contact?
@@ -25,8 +25,8 @@ class ProfileActivity &lt; ActiveRecord::Base
   protected
  
   def copy_timestamps
-    self.created_at = self.activity.created_at
-    self.updated_at = self.activity.updated_at
+    self.created_at = self.activity.created_at if self.activity.created_at
+    self.updated_at = self.activity.updated_at if self.activity.updated_at
   end
  
 end
 class ProfileCategorization < ActiveRecord::Base
-  set_table_name :categories_profiles
+  self.table_name = :categories_profiles
   belongs_to :profile
   belongs_to :category
  
@@ -13,7 +13,7 @@ class ProfileCategorization &lt; ActiveRecord::Base
   end
  
   def self.remove_region(profile)
-    region = profile.categories.find(:first, :conditions => { :type => [Region, State, City].map(&:name) })
+    region = profile.categories.where(type: [Region, State, City].map(&:name)).first
     if region
       ids = region.hierarchy.map(&:id)
       self.delete_all(:profile_id => profile.id, :category_id => ids)
@@ -16,7 +16,7 @@ class ProfileListBlock &lt; Block
  
   def profile_list
     result = nil
-    public_profiles = profiles.public.includes([:image,:domains,:preferred_domain,:environment])
+    public_profiles = profiles.is_public.includes([:image,:domains,:preferred_domain,:environment])
     if !prioritize_profiles_with_image
 result = public_profiles.all(:limit => get_limit, :order => 'profiles.updated_at DESC').sort_by{ rand }
     elsif profiles.visible.with_image.count >= get_limit
@@ -28,7 +28,7 @@ result = public_profiles.all(:limit =&gt; get_limit, :order =&gt; &#39;profiles.updated_at
   end
  
   def profile_count
-    profiles.public.length
+    profiles.is_public.length
   end
  
   # the title of the block. Probably will be overriden in subclasses.
@@ -26,9 +26,9 @@ class ProfileSuggestion &lt; ActiveRecord::Base
   end
  
   validates_uniqueness_of :suggestion_id, :scope => [ :person_id ]
-  scope :of_person, :conditions => { :suggestion_type => 'Person' }
-  scope :of_community, :conditions => { :suggestion_type => 'Community' }
-  scope :enabled, :conditions => { :enabled => true }
+  scope :of_person, -> { where suggestion_type: 'Person' }
+  scope :of_community, -> { where suggestion_type: 'Community' }
+  scope :enabled, -> { where enabled: true }
  
   # {:category_type => ['category-icon', 'category-label']}
   CATEGORIES = {
@@ -55,13 +55,13 @@ class ProfileSuggestion &lt; ActiveRecord::Base
       :threshold => 2, :weight => 1, :connection => 'Profile'
     },
     :people_with_common_tags => {
-      :threshold => 2, :weight => 1, :connection => 'ActsAsTaggableOn::Tag'
+      :threshold => 2, :weight => 1, :connection => 'Tag'
     },
     :communities_with_common_friends => {
       :threshold => 2, :weight => 1, :connection => 'Profile'
     },
     :communities_with_common_tags => {
-      :threshold => 2, :weight => 1, :connection => 'ActsAsTaggableOn::Tag'
+      :threshold => 2, :weight => 1, :connection => 'Tag'
     }
   }
  
@@ -127,17 +127,15 @@ class ProfileSuggestion &lt; ActiveRecord::Base
         rescue NoMethodError
           next
         end
-        connections = suggested_profile.send("#{rule}_connections")
-        if connections.present?
-          connections = connections[1..-2].split(',')
-        else
-          connections = []
-        end
-        suggestion.send("#{rule}=", value)
+
+        connections = suggested_profile.send("#{rule}_connections") || []
+        connections = connections[1..-2] if connections.present?
         connections.each do |connection_id|
           next if SuggestionConnection.where(:suggestion_id => suggestion.id, :connection_id => connection_id, :connection_type => options[:connection]).present?
-           SuggestionConnection.create!(:suggestion => suggestion, :connection_id => connection_id, :connection_type => options[:connection])
+          SuggestionConnection.create!(:suggestion => suggestion, :connection_id => connection_id, :connection_type => options[:connection])
         end
+
+        suggestion.send("#{rule}=", value)
         suggestion.score += value * options[:weight]
       end
       suggestion.save!
@@ -5,6 +5,7 @@ class ReportedImage &lt; ActiveRecord::Base
  
   has_attachment :content_type => :image,
     :storage     => :file_system,
-    :max_size => 5.megabytes
+    :max_size => 5.megabytes,
+    processor: 'Rmagick'
  
 end
@@ -40,7 +40,7 @@ class RssFeed &lt; Article
  
   # FIXME this should be validates_numericality_of, but Rails 2.0.2 does not
   # support validates_numericality_of with virtual attributes
-  validates_format_of :limit, :with => /^\d+$/, :if => :limit
+  validates_format_of :limit, :with => /\d+/, :if => :limit
  
   # determinates what to include in the feed. Possible values are +:all+
   # (include everything from the profile) and :parent_and_children (include
@@ -69,7 +69,7 @@ class RssFeed &lt; Article
   def fetch_articles
     if parent && parent.has_posts?
       language = self.language.blank? ? {} : { :language => self.language }
-      return parent.posts.find(:all, :conditions => { :published => true }.merge(language), :limit => self.limit, :order => 'id desc')
+      return parent.posts.where({published: true}.merge language).limit(self.limit).order('id desc')
     end
  
     articles =
@@ -18,9 +18,9 @@ class Scrap &lt; ActiveRecord::Base
   after_create :create_activity
   after_update :update_activity
  
-  scope :all_scraps, lambda {|profile| {:conditions => ["receiver_id = ? OR sender_id = ?", profile, profile], :limit => 30}}
+  scope :all_scraps, -> profile { limit(30).where("receiver_id = ? OR sender_id = ?", profile, profile) }
  
-  scope :not_replies, :conditions => {:scrap_id => nil}
+  scope :not_replies, -> { where scrap_id: nil }
  
   track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
  
 class SearchTermOccurrence < ActiveRecord::Base
+
   belongs_to :search_term
   validates_presence_of :search_term
   attr_accessible :search_term, :created_at, :total, :indexed
  
   EXPIRATION_TIME = 1.year
  
-  scope :valid, :conditions => ["search_term_occurrences.created_at > ?", DateTime.now - EXPIRATION_TIME]
+  scope :valid, -> { where "search_term_occurrences.created_at > ?", DateTime.now - EXPIRATION_TIME }
+
 end
@@ -13,7 +13,7 @@ class SlideshowBlock &lt; Block
   end
  
   def gallery
-    gallery_id ? Gallery.find(:first, :conditions => { :id => gallery_id }) : nil
+    if gallery_id then Gallery.where(id: gallery_id).first else nil end
   end
  
   def public_filename_for(image)
	1	+image: noosfero/ci
	2	+
1	3	before_script:
2		- - mkdir -p tmp/{pids,cache} log
3		- - bundle check \|\| bundle install
4		-# workaround for plugins with Gemfile
5		- - perl -pi -e 's/--local //' script/noosfero-plugins
6		- - script/noosfero-plugins disableall
7		- - bundle exec rake makemo &>/dev/null
8		-# database
9		- - cp config/database.yml.gitlab-ci config/database.yml
10		- - createdb gitlab_ci_test \|\| true
11		- - bundle exec rake db:schema:load &>/dev/null
12		- - bundle exec rake db:migrate &>/dev/null
	4	+ - mkdir -p locale # makes quick-start skip compiling translations
	5	+ - ./script/silent-quick-start
13	6
14	7	units:
15	8	script: bundle exec rake test:units
...	...
...	...	@@ -34,3 +34,6 @@
34	34	[submodule "plugins/serpro_captcha"]
35	35	path = plugins/serpro_captcha
36	36	url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/serpro_captcha.git
	37	+[submodule "plugins/insight"]
	38	+ path = plugins/insight
	39	+ url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/insight.git
...	...
...	...	@@ -8,8 +8,7 @@ notifications:
8	8
9	9	language: ruby
10	10	rvm:
11		-# for 2.2 support we need to upgrade the pg gem
12		- - 2.1.6
	11	+ - 2.2.3
13	12
14	13	sudo: false
15	14	addons:
...	...	@@ -26,19 +25,16 @@ addons:
26	25	- libsqlite3-dev
27	26	- libxslt1-dev
28	27
29		-before_install:
30		- - gem env
31		-
32	28	# workaround for https://github.com/travis-ci/travis-ci/issues/4536
33	29	before_install:
34		- - export GEM_HOME=$PWD/vendor/bundle/ruby/2.1.0
	30	+ - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0
35	31	- gem install bundler
36	32	cache: bundler
37	33
38	34	before_script:
39	35	- mkdir -p tmp/{pids,cache} log
40	36	- script/noosfero-plugins disableall
41		- - bundle exec rake makemo &>/dev/null
	37	+ #- bundle exec rake makemo &>/dev/null
42	38	# database
43	39	- cp config/database.yml.travis config/database.yml
44	40	- psql -c 'create database myapp_test;' -U postgres
...	...	@@ -49,7 +45,7 @@ env:
49	45	- TASK=test:units
50	46	- TASK=test:functionals
51	47	- TASK=test:integration
52		- - TASK=cucumber
	48	+ - TASK=cucumber LANG=en
53	49	- TASK=selenium
54	50	- TASK=test:noosfero_plugins BUNDLE_OPTS=install
55	51
...	...
1	1	source "https://rubygems.org"
2		-gem 'rails', '~> 3.2.22'
3		-gem 'minitest', '~> 3.2.0'
4		-gem 'fast_gettext', '~> 0.6.8'
5		-gem 'acts-as-taggable-on', '~> 3.4.2'
	2	+
	3	+platform :ruby do
	4	+ gem 'pg', '~> 0.17'
	5	+ gem 'rmagick', '~> 2.13'
	6	+end
	7	+platform :jruby do
	8	+ gem 'activerecord-jdbcpostgresql-adapter'
	9	+ gem 'rmagick4j'
	10	+end
	11	+
	12	+gem 'rails', '~> 4.2.4'
	13	+gem 'fast_gettext', '~> 0.9'
	14	+gem 'acts-as-taggable-on', '~> 3.5'
6	15	gem 'rails_autolink', '~> 1.1.5'
7		-gem 'pg', '~> 0.13.2'
8		-gem 'rmagick', '~> 2.13.1'
9		-gem 'RedCloth', '~> 4.2.9'
10		-gem 'will_paginate', '~> 3.0.3'
	16	+gem 'RedCloth', '~> 4.2'
11	17	gem 'ruby-feedparser', '~> 0.7'
12		-gem 'daemons', '~> 1.1.5'
13		-#gem 'thin', '~> 1.3.1'
14		-gem 'nokogiri', '~> 1.6.0'
	18	+gem 'daemons', '~> 1.1'
15	19	gem 'unicorn', '~> 4.8'
16		-#gem 'nokogiri', '~> 1.5.5'
	20	+gem 'nokogiri', '~> 1.6.0'
	21	+gem 'will_paginate'
	22	+gem 'pothoven-attachment_fu', '~> 3.2.16'
	23	+gem 'delayed_job'
	24	+gem 'delayed_job_active_record'
17	25	gem 'rake', :require => false
18		-gem 'rest-client', '~> 1.6.7'
	26	+gem 'rest-client', '~> 1.6'
19	27	gem 'exception_notification', '~> 4.0.1'
20		-gem 'gettext', '~> 2.2.1', :require => false
21		-gem 'locale', '~> 2.0.5'
	28	+gem 'gettext', '~> 3.1', :require => false
	29	+gem 'locale', '~> 2.1'
22	30	gem 'whenever', :require => false
23		-gem 'eita-jrails', '~> 0.9.5', require: 'jrails'
	31	+gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
	32	+gem 'diffy', '~> 3.0'
	33	+gem 'slim'
24	34
25	35	# API dependencies
26	36	gem 'grape', '~> 0.12'
27	37	gem 'grape-entity'
	38	+gem 'grape_logging'
28	39	gem 'grape-swagger'
29	40	gem 'swagger-ui_rails'
30	41	gem 'kramdown'
31		-
32		-#FIXME Get the Grape Loggin from master yo solve this issue https://github.com/intridea/grape/issues/1059
33		-#We have to remove this commit referenve code when update the next release of grape_logging. Actualy we are using (1.1.2)
34		-gem 'grape_logging', :git => 'https://github.com/aceunreal/grape_logging.git', :ref => 'f1755ae'
35		-#gem 'grape_logging'
36	42	gem 'rack-cors'
37	43	gem 'rack-contrib'
38	44	gem 'liquid', '~> 3.0.3'
39		-#gem 'grape-swagger-rails'
40		-gem 'rubyzip'
41		-
42		-gem 'execjs'
43		-gem 'therubyracer'
44		-
45		-# FIXME list here all actual dependencies (i.e. the ones in debian/control),
46		-# with their GEM names (not the Debian package names)
47	45
48	46	gem 'api-pagination', '~> 4.1.1'
49	47
50	48	# asset pipeline
51	49	gem 'uglifier', '>= 1.0.3'
52	50	gem 'sass-rails'
53		-gem 'sass', '~> 3.1.19'
	51	+
	52	+# gems to enable rails3 behaviour
	53	+gem 'protected_attributes'
	54	+gem 'rails-observers'
	55	+gem 'actionpack-page_caching'
	56	+gem 'actionpack-action_caching'
	57	+gem 'activerecord-session_store'
	58	+gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
54	59
55	60	group :production do
56	61	gem 'dalli', '~> 2.7.0'
57	62	end
58	63
	64	+group :development, :test do
	65	+ gem 'spring'
	66	+end
	67	+
59	68	group :test do
60		- gem 'rspec', '~> 2.14.0'
61		- gem 'rspec-rails', '~> 2.14.1'
	69	+ gem 'rspec', '~> 3.3', require: false
	70	+ gem 'rspec-rails', '~> 3.2', require: false
62	71	gem 'mocha', '~> 1.1.0', :require => false
	72	+ gem 'test-unit' if RUBY_VERSION >= '2.2.0'
	73	+ gem 'minitest'
	74	+ gem 'minitest-reporters'
63	75	end
64	76
65	77	group :cucumber do
66		- gem 'cucumber-rails', '~> 1.0.6', :require => false
67		- gem 'capybara', '~> 2.1.0'
68		- gem 'cucumber', '~> 1.0.6'
69		- gem 'database_cleaner', '~> 1.2.0'
70		- gem 'selenium-webdriver', '~> 2.47.0'
	78	+ gem 'capybara', '~> 2.2'
	79	+ gem 'launchy'
	80	+ gem 'cucumber'
	81	+ gem 'cucumber-rails', '~> 1.4.2', :require => false
	82	+ gem 'database_cleaner', '~> 1.3'
	83	+ gem 'selenium-webdriver'
71	84	end
72	85
73	86	# Requires custom dependencies
74	87	eval(File.read('config/Gemfile'), binding) rescue nil
75	88
	89	+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
	90	+vendor.each do \|dir\|
	91	+ plugin = File.basename dir
	92	+ version = if Dir.glob("#{dir}/*.gemspec").length > 0 then '> 0.0.0' else '0.0.0' end
	93	+
	94	+ gem plugin, version, path: dir
	95	+end
	96	+
76	97	# include gemfiles from enabled plugins
77	98	# plugins in baseplugins/ are not included on purpose. They should not have any
78	99	# dependencies.
...	...
1		-GIT
2		- remote: https://github.com/aceunreal/grape_logging.git
3		- revision: f1755ae4e1d897a65b20218d40681f59a9630f1b
4		- ref: f1755ae
	1	+PATH
	2	+ remote: vendor/contacts
5	3	specs:
6		- grape_logging (1.1.2)
7		- grape
	4	+ contacts (1.2.0)
	5	+ gdata (>= 1.1.1)
	6	+ json (>= 1.1.1)
	7	+
	8	+PATH
	9	+ remote: vendor/ezcrypto
	10	+ specs:
	11	+ ezcrypto (0.0.0)
	12	+
	13	+PATH
	14	+ remote: vendor/gdata
	15	+ specs:
	16	+ gdata (1.1.1)
	17	+
	18	+PATH
	19	+ remote: vendor/plugins/access_control
	20	+ specs:
	21	+ access_control (0.0.0)
	22	+
	23	+PATH
	24	+ remote: vendor/plugins/action_tracker
	25	+ specs:
	26	+ action_tracker (0.0.1)
	27	+
	28	+PATH
	29	+ remote: vendor/plugins/action_tracker_has_comments
	30	+ specs:
	31	+ action_tracker_has_comments (0.0.0)
	32	+
	33	+PATH
	34	+ remote: vendor/plugins/acts_as_list
	35	+ specs:
	36	+ acts_as_list (0.0.0)
	37	+
	38	+PATH
	39	+ remote: vendor/plugins/acts_as_tree
	40	+ specs:
	41	+ acts_as_tree (0.0.0)
	42	+
	43	+PATH
	44	+ remote: vendor/plugins/acts_as_versioned
	45	+ specs:
	46	+ acts_as_versioned (3.2.1)
	47	+ activerecord
	48	+
	49	+PATH
	50	+ remote: vendor/plugins/honeypot
	51	+ specs:
	52	+ honeypot (0.0.0)
	53	+
	54	+PATH
	55	+ remote: vendor/plugins/i18n_deprecation
	56	+ specs:
	57	+ i18n_deprecation (0.0.0)
	58	+
	59	+PATH
	60	+ remote: vendor/plugins/kandadaboggu-vote_fu
	61	+ specs:
	62	+ kandadaboggu-vote_fu (0.0.15)
	63	+
	64	+PATH
	65	+ remote: vendor/plugins/monkey_patches
	66	+ specs:
	67	+ monkey_patches (0.0.0)
	68	+
	69	+PATH
	70	+ remote: vendor/plugins/noosfero_caching
	71	+ specs:
	72	+ noosfero_caching (0.0.0)
	73	+
	74	+PATH
	75	+ remote: vendor/plugins/rails_rcov
	76	+ specs:
	77	+ rails_rcov (0.0.0)
	78	+
	79	+PATH
	80	+ remote: vendor/plugins/recaptcha
	81	+ specs:
	82	+ recaptcha (0.3.2)
	83	+ i18n
	84	+
	85	+PATH
	86	+ remote: vendor/plugins/ruby_bosh
	87	+ specs:
	88	+ ruby_bosh (0.5.4)
	89	+ builder
	90	+ rest-client
	91	+
	92	+PATH
	93	+ remote: vendor/plugins/validates_as_cnpj
	94	+ specs:
	95	+ validates_as_cnpj (0.0.0)
	96	+
	97	+PATH
	98	+ remote: vendor/plugins/validates_multiparameter_assignments
	99	+ specs:
	100	+ validates_multiparameter_assignments (0.0.0)
	101	+
	102	+PATH
	103	+ remote: vendor/plugins/xss_terminate
	104	+ specs:
	105	+ xss_terminate (0.0.0)
8	106
9	107	GEM
10	108	remote: https://rubygems.org/
11	109	specs:
12	110	RedCloth (4.2.9)
13		- actionmailer (3.2.22)
14		- actionpack (= 3.2.22)
15		- mail (~> 2.5.4)
16		- actionpack (3.2.22)
17		- activemodel (= 3.2.22)
18		- activesupport (= 3.2.22)
19		- builder (~> 3.0.0)
	111	+ actionmailer (4.2.5)
	112	+ actionpack (= 4.2.5)
	113	+ actionview (= 4.2.5)
	114	+ activejob (= 4.2.5)
	115	+ mail (~> 2.5, >= 2.5.4)
	116	+ rails-dom-testing (~> 1.0, >= 1.0.5)
	117	+ actionpack (4.2.5)
	118	+ actionview (= 4.2.5)
	119	+ activesupport (= 4.2.5)
	120	+ rack (~> 1.6)
	121	+ rack-test (~> 0.6.2)
	122	+ rails-dom-testing (~> 1.0, >= 1.0.5)
	123	+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
	124	+ actionpack-action_caching (1.1.1)
	125	+ actionpack (>= 4.0.0, < 5.0)
	126	+ actionpack-page_caching (1.0.2)
	127	+ actionpack (>= 4.0.0, < 5)
	128	+ actionview (4.2.5)
	129	+ activesupport (= 4.2.5)
	130	+ builder (~> 3.1)
20	131	erubis (~> 2.7.0)
21		- journey (~> 1.0.4)
22		- rack (~> 1.4.5)
23		- rack-cache (~> 1.2)
24		- rack-test (~> 0.6.1)
25		- sprockets (~> 2.2.1)
26		- activemodel (3.2.22)
27		- activesupport (= 3.2.22)
28		- builder (~> 3.0.0)
29		- activerecord (3.2.22)
30		- activemodel (= 3.2.22)
31		- activesupport (= 3.2.22)
32		- arel (~> 3.0.2)
33		- tzinfo (~> 0.3.29)
34		- activeresource (3.2.22)
35		- activemodel (= 3.2.22)
36		- activesupport (= 3.2.22)
37		- activesupport (3.2.22)
38		- i18n (~> 0.6, >= 0.6.4)
39		- multi_json (~> 1.0)
40		- acts-as-taggable-on (3.4.4)
	132	+ rails-dom-testing (~> 1.0, >= 1.0.5)
	133	+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
	134	+ activejob (4.2.5)
	135	+ activesupport (= 4.2.5)
	136	+ globalid (>= 0.3.0)
	137	+ activemodel (4.2.5)
	138	+ activesupport (= 4.2.5)
	139	+ builder (~> 3.1)
	140	+ activerecord (4.2.5)
	141	+ activemodel (= 4.2.5)
	142	+ activesupport (= 4.2.5)
	143	+ arel (~> 6.0)
	144	+ activerecord-deprecated_finders (1.0.4)
	145	+ activerecord-session_store (0.1.2)
	146	+ actionpack (>= 4.0.0, < 5)
	147	+ activerecord (>= 4.0.0, < 5)
	148	+ railties (>= 4.0.0, < 5)
	149	+ activesupport (4.2.5)
	150	+ i18n (~> 0.7)
	151	+ json (~> 1.7, >= 1.7.7)
	152	+ minitest (~> 5.1)
	153	+ thread_safe (~> 0.3, >= 0.3.4)
	154	+ tzinfo (~> 1.1)
	155	+ acts-as-taggable-on (3.5.0)
41	156	activerecord (>= 3.2, < 5)
	157	+ addressable (2.3.8)
	158	+ ansi (1.5.0)
42	159	api-pagination (4.1.1)
43		- arel (3.0.3)
	160	+ arel (6.0.3)
44	161	axiom-types (0.1.1)
45	162	descendants_tracker (~> 0.0.4)
46	163	ice_nine (~> 0.11.0)
47	164	thread_safe (~> 0.3, >= 0.3.1)
48		- builder (3.0.4)
49		- capybara (2.1.0)
	165	+ builder (3.2.2)
	166	+ capybara (2.5.0)
50	167	mime-types (>= 1.16)
51	168	nokogiri (>= 1.3.3)
52	169	rack (>= 1.0.0)
53	170	rack-test (>= 0.5.4)
54	171	xpath (~> 2.0)
55		- childprocess (0.5.6)
	172	+ childprocess (0.5.8)
56	173	ffi (~> 1.0, >= 1.0.11)
57	174	chronic (0.10.2)
58	175	coercible (1.0.0)
59	176	descendants_tracker (~> 0.0.1)
60		- cucumber (1.0.6)
	177	+ cucumber (1.3.20)
61	178	builder (>= 2.1.2)
62		- diff-lcs (>= 1.1.2)
63		- gherkin (~> 2.4.18)
64		- json (>= 1.4.6)
65		- term-ansicolor (>= 1.0.6)
66		- cucumber-rails (1.0.6)
67		- capybara (>= 1.1.1)
68		- cucumber (>= 1.0.6)
69		- nokogiri (>= 1.5.0)
70		- daemons (1.1.9)
	179	+ diff-lcs (>= 1.1.3)
	180	+ gherkin (~> 2.12)
	181	+ multi_json (>= 1.7.5, < 2.0)
	182	+ multi_test (>= 0.1.2)
	183	+ cucumber-rails (1.4.2)
	184	+ capybara (>= 1.1.2, < 3)
	185	+ cucumber (>= 1.3.8, < 2)
	186	+ mime-types (>= 1.16, < 3)
	187	+ nokogiri (~> 1.5)
	188	+ rails (>= 3, < 5)
	189	+ daemons (1.2.3)
71	190	dalli (2.7.4)
72		- database_cleaner (1.2.0)
	191	+ database_cleaner (1.5.1)
	192	+ delayed_job (4.1.1)
	193	+ activesupport (>= 3.0, < 5.0)
	194	+ delayed_job_active_record (4.1.0)
	195	+ activerecord (>= 3.0, < 5)
	196	+ delayed_job (>= 3.0, < 5)
73	197	descendants_tracker (0.0.4)
74	198	thread_safe (~> 0.3, >= 0.3.1)
75	199	diff-lcs (1.2.5)
76		- eita-jrails (0.9.8)
	200	+ diffy (3.0.7)
	201	+ domain_name (0.5.25)
	202	+ unf (>= 0.0.5, < 1.0.0)
	203	+ eita-jrails (0.10.0)
77	204	actionpack (>= 3.1.0)
78	205	activesupport (>= 3.0.0)
79	206	equalizer (0.0.11)
...	...	@@ -82,13 +209,16 @@ GEM
82	209	actionmailer (>= 3.0.4)
83	210	activesupport (>= 3.0.4)
84	211	execjs (2.6.0)
85		- fast_gettext (0.6.12)
	212	+ fast_gettext (0.9.2)
86	213	ffi (1.9.10)
87		- gettext (2.2.1)
88		- locale
89		- gherkin (2.4.21)
90		- json (>= 1.4.6)
	214	+ gettext (3.1.7)
	215	+ locale (>= 2.0.5)
	216	+ text (>= 1.3.0)
	217	+ gherkin (2.12.2)
	218	+ multi_json (~> 1.3)
91	219	git-version-bump (0.15.1)
	220	+ globalid (0.3.6)
	221	+ activesupport (>= 4.1.0)
92	222	grape (0.13.0)
93	223	activesupport
94	224	builder
...	...	@@ -105,125 +235,157 @@ GEM
105	235	grape-swagger (0.10.2)
106	236	grape (>= 0.8.0)
107	237	grape-entity
108		- hashie (3.4.2)
109		- hike (1.2.3)
	238	+ grape_logging (1.1.2)
	239	+ grape
	240	+ hashie (3.4.3)
	241	+ http-cookie (1.0.2)
	242	+ domain_name (~> 0.5)
110	243	i18n (0.7.0)
111	244	ice_nine (0.11.1)
112		- journey (1.0.4)
113	245	json (1.8.3)
114	246	kgio (2.10.0)
115	247	kramdown (1.9.0)
116		- libv8 (3.16.14.11)
	248	+ launchy (2.4.3)
	249	+ addressable (~> 2.3)
117	250	liquid (3.0.6)
118		- locale (2.0.9)
	251	+ locale (2.1.2)
	252	+ loofah (2.0.3)
	253	+ nokogiri (>= 1.5.9)
119	254	magic (0.2.9)
120	255	ffi (>= 0.6.3)
121		- mail (2.5.4)
122		- mime-types (~> 1.16)
123		- treetop (~> 1.4.8)
	256	+ mail (2.6.3)
	257	+ mime-types (>= 1.16, < 3)
124	258	metaclass (0.0.4)
125		- mime-types (1.25.1)
	259	+ mime-types (2.6.2)
126	260	mini_portile (0.6.2)
127		- minitest (3.2.0)
	261	+ minitest (5.8.2)
	262	+ minitest-reporters (1.1.5)
	263	+ ansi
	264	+ builder
	265	+ minitest (>= 5.0)
	266	+ ruby-progressbar
128	267	mocha (1.1.0)
129	268	metaclass (~> 0.0.1)
130	269	multi_json (1.11.2)
	270	+ multi_test (0.1.2)
131	271	multi_xml (0.5.5)
	272	+ netrc (0.11.0)
132	273	nokogiri (1.6.6.2)
133	274	mini_portile (~> 0.6.0)
134		- pg (0.13.2)
135		- polyglot (0.3.5)
136		- rack (1.4.7)
	275	+ pg (0.18.4)
	276	+ pothoven-attachment_fu (3.2.16)
	277	+ power_assert (0.2.6)
	278	+ protected_attributes (1.1.3)
	279	+ activemodel (>= 4.0.1, < 5.0)
	280	+ rack (1.6.4)
137	281	rack-accept (0.4.5)
138	282	rack (>= 0.4)
139		- rack-cache (1.5.0)
140		- rack (>= 0.4)
141	283	rack-contrib (1.4.0)
142	284	git-version-bump (~> 0.15)
143	285	rack (~> 1.4)
144	286	rack-cors (0.4.0)
145	287	rack-mount (0.8.3)
146	288	rack (>= 1.0.0)
147		- rack-ssl (1.3.4)
148		- rack
149	289	rack-test (0.6.3)
150	290	rack (>= 1.0)
151		- rails (3.2.22)
152		- actionmailer (= 3.2.22)
153		- actionpack (= 3.2.22)
154		- activerecord (= 3.2.22)
155		- activeresource (= 3.2.22)
156		- activesupport (= 3.2.22)
157		- bundler (~> 1.0)
158		- railties (= 3.2.22)
	291	+ rails (4.2.5)
	292	+ actionmailer (= 4.2.5)
	293	+ actionpack (= 4.2.5)
	294	+ actionview (= 4.2.5)
	295	+ activejob (= 4.2.5)
	296	+ activemodel (= 4.2.5)
	297	+ activerecord (= 4.2.5)
	298	+ activesupport (= 4.2.5)
	299	+ bundler (>= 1.3.0, < 2.0)
	300	+ railties (= 4.2.5)
	301	+ sprockets-rails
	302	+ rails-deprecated_sanitizer (1.0.3)
	303	+ activesupport (>= 4.2.0.alpha)
	304	+ rails-dom-testing (1.0.7)
	305	+ activesupport (>= 4.2.0.beta, < 5.0)
	306	+ nokogiri (~> 1.6.0)
	307	+ rails-deprecated_sanitizer (>= 1.0.1)
	308	+ rails-html-sanitizer (1.0.2)
	309	+ loofah (~> 2.0)
	310	+ rails-observers (0.1.2)
	311	+ activemodel (~> 4.0)
159	312	rails_autolink (1.1.6)
160	313	rails (> 3.1)
161		- railties (3.2.22)
162		- actionpack (= 3.2.22)
163		- activesupport (= 3.2.22)
164		- rack-ssl (~> 1.3.2)
	314	+ railties (4.2.5)
	315	+ actionpack (= 4.2.5)
	316	+ activesupport (= 4.2.5)
165	317	rake (>= 0.8.7)
166		- rdoc (~> 3.4)
167		- thor (>= 0.14.6, < 2.0)
	318	+ thor (>= 0.18.1, < 2.0)
168	319	raindrops (0.15.0)
169	320	rake (10.4.2)
170		- rdoc (3.12.2)
171		- json (~> 1.4)
172		- ref (2.0.0)
173		- rest-client (1.6.9)
174		- mime-types (~> 1.16)
175		- rmagick (2.13.4)
176		- rspec (2.14.1)
177		- rspec-core (~> 2.14.0)
178		- rspec-expectations (~> 2.14.0)
179		- rspec-mocks (~> 2.14.0)
180		- rspec-core (2.14.8)
181		- rspec-expectations (2.14.5)
182		- diff-lcs (>= 1.1.3, < 2.0)
183		- rspec-mocks (2.14.6)
184		- rspec-rails (2.14.2)
185		- actionpack (>= 3.0)
186		- activemodel (>= 3.0)
187		- activesupport (>= 3.0)
188		- railties (>= 3.0)
189		- rspec-core (~> 2.14.0)
190		- rspec-expectations (~> 2.14.0)
191		- rspec-mocks (~> 2.14.0)
	321	+ rest-client (1.8.0)
	322	+ http-cookie (>= 1.0.2, < 2.0)
	323	+ mime-types (>= 1.16, < 3.0)
	324	+ netrc (~> 0.7)
	325	+ rmagick (2.15.4)
	326	+ rspec (3.4.0)
	327	+ rspec-core (~> 3.4.0)
	328	+ rspec-expectations (~> 3.4.0)
	329	+ rspec-mocks (~> 3.4.0)
	330	+ rspec-core (3.4.0)
	331	+ rspec-support (~> 3.4.0)
	332	+ rspec-expectations (3.4.0)
	333	+ diff-lcs (>= 1.2.0, < 2.0)
	334	+ rspec-support (~> 3.4.0)
	335	+ rspec-mocks (3.4.0)
	336	+ diff-lcs (>= 1.2.0, < 2.0)
	337	+ rspec-support (~> 3.4.0)
	338	+ rspec-rails (3.4.0)
	339	+ actionpack (>= 3.0, < 4.3)
	340	+ activesupport (>= 3.0, < 4.3)
	341	+ railties (>= 3.0, < 4.3)
	342	+ rspec-core (~> 3.4.0)
	343	+ rspec-expectations (~> 3.4.0)
	344	+ rspec-mocks (~> 3.4.0)
	345	+ rspec-support (~> 3.4.0)
	346	+ rspec-support (3.4.0)
192	347	ruby-feedparser (0.9.3)
193	348	magic
	349	+ ruby-progressbar (1.7.5)
194	350	rubyzip (1.1.7)
195		- sass (3.1.21)
196		- sass-rails (3.2.6)
197		- railties (~> 3.2.0)
198		- sass (>= 3.1.10)
199		- tilt (~> 1.3)
200		- selenium-webdriver (2.47.1)
	351	+ sass (3.4.19)
	352	+ sass-rails (5.0.4)
	353	+ railties (>= 4.0.0, < 5.0)
	354	+ sass (~> 3.1)
	355	+ sprockets (>= 2.8, < 4.0)
	356	+ sprockets-rails (>= 2.0, < 4.0)
	357	+ tilt (>= 1.1, < 3)
	358	+ selenium-webdriver (2.48.1)
201	359	childprocess (~> 0.5)
202	360	multi_json (~> 1.0)
203	361	rubyzip (~> 1.0)
204	362	websocket (~> 1.0)
205		- sprockets (2.2.3)
206		- hike (~> 1.2)
207		- multi_json (~> 1.0)
208		- rack (~> 1.0)
209		- tilt (~> 1.1, != 1.3.0)
	363	+ slim (3.0.6)
	364	+ temple (~> 0.7.3)
	365	+ tilt (>= 1.3.3, < 2.1)
	366	+ spring (1.4.1)
	367	+ sprockets (3.4.0)
	368	+ rack (> 1, < 3)
	369	+ sprockets-rails (2.3.3)
	370	+ actionpack (>= 3.0)
	371	+ activesupport (>= 3.0)
	372	+ sprockets (>= 2.8, < 4.0)
210	373	swagger-ui_rails (0.1.7)
211		- term-ansicolor (1.3.2)
212		- tins (~> 1.0)
213		- therubyracer (0.12.2)
214		- libv8 (~> 3.16.14.0)
215		- ref
	374	+ temple (0.7.6)
	375	+ test-unit (3.1.5)
	376	+ power_assert
	377	+ text (1.3.1)
216	378	thor (0.19.1)
217	379	thread_safe (0.3.5)
218		- tilt (1.4.1)
219		- tins (1.6.0)
220		- treetop (1.4.15)
221		- polyglot
222		- polyglot (>= 0.3.1)
223		- tzinfo (0.3.45)
	380	+ tilt (2.0.1)
	381	+ tzinfo (1.2.2)
	382	+ thread_safe (~> 0.1)
224	383	uglifier (2.7.2)
225	384	execjs (>= 0.3.0)
226	385	json (>= 1.8.0)
	386	+ unf (0.1.4)
	387	+ unf_ext
	388	+ unf_ext (0.0.7.1)
227	389	unicorn (4.9.0)
228	390	kgio (~> 2.6)
229	391	rack
...	...	@@ -244,48 +406,81 @@ PLATFORMS
244	406	ruby
245	407
246	408	DEPENDENCIES
247		- RedCloth (~> 4.2.9)
248		- acts-as-taggable-on (~> 3.4.2)
	409	+ RedCloth (~> 4.2)
	410	+ access_control (= 0.0.0)!
	411	+ action_tracker (> 0.0.0)!
	412	+ action_tracker_has_comments (= 0.0.0)!
	413	+ actionpack-action_caching
	414	+ actionpack-page_caching
	415	+ activerecord-deprecated_finders
	416	+ activerecord-jdbcpostgresql-adapter
	417	+ activerecord-session_store
	418	+ acts-as-taggable-on (~> 3.5)
	419	+ acts_as_list (= 0.0.0)!
	420	+ acts_as_tree (= 0.0.0)!
	421	+ acts_as_versioned (> 0.0.0)!
249	422	api-pagination (~> 4.1.1)
250		- capybara (~> 2.1.0)
251		- cucumber (~> 1.0.6)
252		- cucumber-rails (~> 1.0.6)
253		- daemons (~> 1.1.5)
	423	+ capybara (~> 2.2)
	424	+ contacts (> 0.0.0)!
	425	+ cucumber
	426	+ cucumber-rails (~> 1.4.2)
	427	+ daemons (~> 1.1)
254	428	dalli (~> 2.7.0)
255		- database_cleaner (~> 1.2.0)
256		- eita-jrails (~> 0.9.5)
	429	+ database_cleaner (~> 1.3)
	430	+ delayed_job
	431	+ delayed_job_active_record
	432	+ diffy (~> 3.0)
	433	+ eita-jrails (~> 0.10.0)
257	434	exception_notification (~> 4.0.1)
258		- execjs
259		- fast_gettext (~> 0.6.8)
260		- gettext (~> 2.2.1)
	435	+ ezcrypto (= 0.0.0)!
	436	+ fast_gettext (~> 0.9)
	437	+ gdata (> 0.0.0)!
	438	+ gettext (~> 3.1)
261	439	grape (~> 0.12)
262	440	grape-entity
263	441	grape-swagger
264		- grape_logging!
	442	+ grape_logging
	443	+ honeypot (= 0.0.0)!
	444	+ i18n_deprecation (= 0.0.0)!
	445	+ kandadaboggu-vote_fu (> 0.0.0)!
265	446	kramdown
	447	+ launchy
266	448	liquid (~> 3.0.3)
267		- locale (~> 2.0.5)
268		- minitest (~> 3.2.0)
	449	+ locale (~> 2.1)
	450	+ minitest
	451	+ minitest-reporters
269	452	mocha (~> 1.1.0)
	453	+ monkey_patches (= 0.0.0)!
270	454	nokogiri (~> 1.6.0)
271		- pg (~> 0.13.2)
	455	+ noosfero_caching (= 0.0.0)!
	456	+ pg (~> 0.17)
	457	+ pothoven-attachment_fu (~> 3.2.16)
	458	+ protected_attributes
272	459	rack-contrib
273	460	rack-cors
274		- rails (~> 3.2.22)
	461	+ rails (~> 4.2.4)
	462	+ rails-observers
275	463	rails_autolink (~> 1.1.5)
	464	+ rails_rcov (= 0.0.0)!
276	465	rake
277		- rest-client (~> 1.6.7)
278		- rmagick (~> 2.13.1)
279		- rspec (~> 2.14.0)
280		- rspec-rails (~> 2.14.1)
	466	+ recaptcha (> 0.0.0)!
	467	+ rest-client (~> 1.6)
	468	+ rmagick (~> 2.13)
	469	+ rmagick4j
	470	+ rspec (~> 3.3)
	471	+ rspec-rails (~> 3.2)
281	472	ruby-feedparser (~> 0.7)
282		- rubyzip
283		- sass (~> 3.1.19)
	473	+ ruby_bosh (> 0.0.0)!
284	474	sass-rails
285		- selenium-webdriver (~> 2.47.0)
	475	+ selenium-webdriver
	476	+ slim
	477	+ spring
286	478	swagger-ui_rails
287		- therubyracer
	479	+ test-unit
288	480	uglifier (>= 1.0.3)
289	481	unicorn (~> 4.8)
	482	+ validates_as_cnpj (= 0.0.0)!
	483	+ validates_multiparameter_assignments (= 0.0.0)!
290	484	whenever
291		- will_paginate (~> 3.0.3)
	485	+ will_paginate
	486	+ xss_terminate (= 0.0.0)!
...	...
...	...	@@ -3,7 +3,7 @@
3	3
4	4	VAGRANTFILE_API_VERSION = "2"
5	5	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|
6		- config.vm.box = ENV.fetch('VAGRANT_BOX', "debian-wheezy")
	6	+ config.vm.box = ENV.fetch('VAGRANT_BOX', "debian/jessie64")
7	7	config.vm.network :forwarded_port, host: 3000, guest: 3000
8	8	config.vm.provision :shell do \|shell\|
9	9	shell.inline = 'su vagrant -c /vagrant/script/vagrant'
...	...
...	...	@@ -12,7 +12,7 @@ class AdminPanelController < AdminController
12	12	if params[:environment][:languages]
13	13	params[:environment][:languages] = params[:environment][:languages].map {\|lang, value\| lang if value=='true'}.compact
14	14	end
15		- if @environment.update_attributes(params[:environment])
	15	+ if @environment.update(params[:environment])
16	16	session[:notice] = _('Environment settings updated')
17	17	redirect_to :action => 'index'
18	18	end
...	...	@@ -54,7 +54,7 @@ class AdminPanelController < AdminController
54	54
55	55	if request.post?
56	56	env = environment
57		- folders = params[:folders].map{\|fid\| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} if params[:folders]
	57	+ folders = env.portal_community.folders.where(id: params[:folders]).order(params[:folders].reverse.map{ \|f\| "id=#{f}" }) if params[:folders]
58	58	env.portal_folders = folders
59	59	if env.save
60	60	session[:notice] = _('Saved the portal folders')
...	...	@@ -65,7 +65,7 @@ class AdminPanelController < AdminController
65	65
66	66	def set_portal_news_amount
67	67	if request.post?
68		- if @environment.update_attributes(params[:environment])
	68	+ if @environment.update(params[:environment])
69	69	session[:notice] = _('Saved the number of news on folders')
70	70	redirect_to :action => 'index'
71	71	end
...	...
1	1	class CategoriesController < AdminController
2	2
3	3	protect 'manage_environment_categories', :environment
4		-
	4	+
5	5	helper :categories
6	6
7	7	def index
8		- @categories = environment.categories.find(:all, :conditions => "parent_id is null AND type is null")
9		- @regions = environment.regions.find(:all, :conditions => {:parent_id => nil})
10		- @product_categories = environment.product_categories.find(:all, :conditions => {:parent_id => nil})
	8	+ @categories = environment.categories.where("parent_id is null AND type is null")
	9	+ @regions = environment.regions.where(:parent_id => nil)
	10	+ @product_categories = environment.product_categories.where(:parent_id => nil)
11	11	end
12	12
13	13	def get_children
...	...	@@ -43,7 +43,7 @@ class CategoriesController < AdminController
43	43	begin
44	44	@category = environment.categories.find(params[:id])
45	45	if request.post?
46		- @category.update_attributes!(params[:category])
	46	+ @category.update!(params[:category])
47	47	@saved = true
48	48	session[:notice] = _("Category %s saved." % @category.name)
49	49	redirect_to :action => 'index'
...	...
...	...	@@ -2,7 +2,7 @@ class EnvironmentRoleManagerController < AdminController
2	2	protect 'manage_environment_roles', :environment
3	3
4	4	def index
5		- @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments )
	5	+ @admins = Person.where('role_assignments.resource_type = ?', 'Environment').includes(:role_assignments)
6	6	end
7	7
8	8	def change_roles
...	...
1	1	class FeaturesController < AdminController
2	2
3	3	protect 'edit_environment_features', :environment
	4	+ helper CustomFieldsHelper
4	5
5	6	def index
6	7	@features = Environment.available_features.sort_by{\|k,v\|v}
...	...	@@ -36,7 +37,7 @@ class FeaturesController < AdminController
36	37
37	38	post_only :update
38	39	def update
39		- if @environment.update_attributes(params[:environment])
	40	+ if @environment.update(params[:environment])
40	41	session[:notice] = _('Features updated successfully.')
41	42	redirect_to :action => 'index'
42	43	else
...	...	@@ -91,9 +92,37 @@ class FeaturesController < AdminController
91	92	redirect_to :action => 'manage_fields'
92	93	end
93	94
	95	+ def manage_custom_fields
	96	+ custom_field_list = params[:custom_fields] \|\| {}
	97	+
	98	+ custom_fields_to_destroy =
	99	+ params[:customized_type].constantize.custom_fields(environment).map(&:id) - custom_field_list.keys.map(&:to_i)
	100	+ CustomField.destroy(custom_fields_to_destroy)
	101	+
	102	+ custom_field_list.each_pair do \|id, custom_field\|
	103	+ field = CustomField.find_by_id(id)
	104	+ if not field.blank?
	105	+ params_to_update = custom_field.except(:format, :extras, :customized_type,:environment)
	106	+ field.update_attributes(params_to_update)
	107	+ else
	108	+ if !custom_field[:extras].nil?
	109	+ tmp = []
	110	+ custom_field[:extras].each_pair do \|k, v\|
	111	+ tmp << v
	112	+ end
	113	+ custom_field[:extras] = tmp
	114	+ end
	115	+ field = CustomField.new custom_field.except(:environment)
	116	+ field.environment=environment
	117	+ field.save if field.valid?
	118	+ end
	119	+ end
	120	+ redirect_to :action => 'manage_fields'
	121	+ end
	122	+
94	123	def search_members
95	124	arg = params[:q].downcase
96		- result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%"])
	125	+ result = environment.people.where('LOWER(name) LIKE ? OR identifier LIKE ?', "%#{arg}%", "%#{arg}%")
97	126	render :text => prepare_to_token_input(result).to_json
98	127	end
99	128
...	...