Download as
Browse Code »

Commit 553a5c2f5513bcfc1f1fe366c47e5219af21d7bf

Authored by Victor Costa
2 parents 2ba09a89 eaa94bb4
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'staging' into login-captcha

Showing 1497 changed files with 19942 additions and 65211 deletions   Show diff stats

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 1497 files displayed.

.gitlab-ci.yml
  Diff comments   View file @553a5c2
  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
... ...
.gitmodules
  Diff comments   View file @553a5c2
... ... @@ -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
... ...
.ruby-version 0 → 100644
  Diff comments   View file @553a5c2
... ... @@ -0,0 +1 @@
  1 +ruby-2.2.1@noosfero
... ...
.travis.yml
  Diff comments   View file @553a5c2
... ... @@ -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  
... ...
Gemfile
  Diff comments   View file @553a5c2
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.
... ...
Gemfile.lock
  Diff comments   View file @553a5c2
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)