Commit cfebd5207d26b8fc8397c8b7c9f467e45805f0cb

Authored by David Silva
1 parent 6226e703
Exists in master

Increases prezento-deps version

Showing 59 changed files with 96 additions and 79 deletions   Show diff stats
Gemfile
1 1 source 'https://rubygems.org'
2 2  
3 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4   -gem 'rails', '4.2.2'
5   -
6   -# Use sqlite3 as the database for Active Record
7   -gem 'sqlite3'
  4 +gem 'rails', '4.2.4'
8 5  
9 6 # Use SCSS for stylesheets
10 7 gem 'sass-rails', '~> 5.0.0'
... ... @@ -31,13 +28,14 @@ gem 'jbuilder', '~> 2.0'
31 28 gem 'devise', '~> 3.5.1'
32 29  
33 30 # Kalibro integration
34   -gem 'kalibro_client', '~> 0.4.0'
  31 +gem 'kalibro_client', '~> 1.3.0'
35 32  
36 33 # PostgreSQL integration
37 34 gem "pg", "~> 0.18.1"
38 35  
39 36 # Twitter Bootstrap for layout
40   -gem 'twitter-bootstrap-rails', :git => 'https://github.com/seyhunak/twitter-bootstrap-rails.git'
  37 +gem 'less-rails', '~> 2.7.0'
  38 +gem 'railsstrap', '~> 3.3.4'
41 39  
42 40 # Chart generation
43 41 gem "chart-js-rails", "~> 0.0.6"
... ... @@ -66,6 +64,15 @@ gem 'google-analytics-rails', '~> 0.0.6'
66 64 # Browser language detection
67 65 gem 'http_accept_language'
68 66  
  67 +# Routes for JS files
  68 +gem 'js-routes', '~> 1.1.0'
  69 +
  70 +# External logins with OmniAuth
  71 +gem 'omniauth'
  72 +
  73 +# Colab integration for Omniauth
  74 +gem 'omniauth-remote-user'
  75 +
69 76 group :test do
70 77 # Easier test writing
71 78 gem "shoulda-matchers", '~> 2.8.0'
... ... @@ -119,6 +126,9 @@ group :development, :test do
119 126  
120 127 # Mocks and stubs for javascript tests
121 128 gem 'sinon-rails'
  129 +
  130 + # Use sqlite3 as the database for Active Record
  131 + gem 'sqlite3'
122 132 end
123 133  
124 134 # Acceptance tests
... ...
Gemfile.lock
1   -GIT
2   - remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
3   - revision: 935f53bb55ef736260fa2ef04e29da2fc3fb2b3f
4   - specs:
5   - twitter-bootstrap-rails (3.2.1)
6   - actionpack (>= 3.1)
7   - execjs (>= 2.2.2, >= 2.2)
8   - less-rails (>= 2.5.0)
9   - railties (>= 3.1)
10   -
11 1 GEM
12 2 remote: https://rubygems.org/
13 3 specs:
14   - actionmailer (4.2.2)
15   - actionpack (= 4.2.2)
16   - actionview (= 4.2.2)
17   - activejob (= 4.2.2)
  4 + actionmailer (4.2.4)
  5 + actionpack (= 4.2.4)
  6 + actionview (= 4.2.4)
  7 + activejob (= 4.2.4)
18 8 mail (~> 2.5, >= 2.5.4)
19 9 rails-dom-testing (~> 1.0, >= 1.0.5)
20   - actionpack (4.2.2)
21   - actionview (= 4.2.2)
22   - activesupport (= 4.2.2)
  10 + actionpack (4.2.4)
  11 + actionview (= 4.2.4)
  12 + activesupport (= 4.2.4)
23 13 rack (~> 1.6)
24 14 rack-test (~> 0.6.2)
25 15 rails-dom-testing (~> 1.0, >= 1.0.5)
26   - rails-html-sanitizer (~> 1.0, >= 1.0.1)
27   - actionview (4.2.2)
28   - activesupport (= 4.2.2)
  16 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
  17 + actionview (4.2.4)
  18 + activesupport (= 4.2.4)
29 19 builder (~> 3.1)
30 20 erubis (~> 2.7.0)
31 21 rails-dom-testing (~> 1.0, >= 1.0.5)
32   - rails-html-sanitizer (~> 1.0, >= 1.0.1)
33   - activejob (4.2.2)
34   - activesupport (= 4.2.2)
  22 + rails-html-sanitizer (~> 1.0, >= 1.0.2)
  23 + activejob (4.2.4)
  24 + activesupport (= 4.2.4)
35 25 globalid (>= 0.3.0)
36   - activemodel (4.2.2)
37   - activesupport (= 4.2.2)
  26 + activemodel (4.2.4)
  27 + activesupport (= 4.2.4)
38 28 builder (~> 3.1)
39   - activerecord (4.2.2)
40   - activemodel (= 4.2.2)
41   - activesupport (= 4.2.2)
  29 + activerecord (4.2.4)
  30 + activemodel (= 4.2.4)
  31 + activesupport (= 4.2.4)
42 32 arel (~> 6.0)
43   - activesupport (4.2.2)
  33 + activesupport (4.2.4)
44 34 i18n (~> 0.7)
45 35 json (~> 1.7, >= 1.7.7)
46 36 minitest (~> 5.1)
47 37 thread_safe (~> 0.3, >= 0.3.4)
48 38 tzinfo (~> 1.1)
49   - arel (6.0.0)
  39 + arel (6.0.3)
50 40 bcrypt (3.1.10)
51 41 better_errors (2.1.1)
52 42 coderay (>= 1.0.0)
... ... @@ -55,8 +45,7 @@ GEM
55 45 binding_of_caller (0.7.2)
56 46 debug_inspector (>= 0.0.1)
57 47 builder (3.2.2)
58   - byebug (5.0.0)
59   - columnize (= 0.9.0)
  48 + byebug (6.0.2)
60 49 capistrano (3.4.0)
61 50 i18n
62 51 rake (>= 10.0.0)
... ... @@ -70,7 +59,7 @@ GEM
70 59 capistrano-rvm (0.1.2)
71 60 capistrano (~> 3.0)
72 61 sshkit (~> 1.2)
73   - capybara (2.4.4)
  62 + capybara (2.5.0)
74 63 mime-types (>= 1.16)
75 64 nokogiri (>= 1.3.3)
76 65 rack (>= 1.0.0)
... ... @@ -91,7 +80,6 @@ GEM
91 80 coffee-script-source (1.9.1.1)
92 81 colorize (0.7.7)
93 82 colorpicker (0.0.5)
94   - columnize (0.9.0)
95 83 commonjs (0.2.7)
96 84 cucumber (1.3.20)
97 85 builder (>= 2.1.2)
... ... @@ -109,7 +97,7 @@ GEM
109 97 dalli (2.7.4)
110 98 database_cleaner (1.4.1)
111 99 debug_inspector (0.0.2)
112   - devise (3.5.1)
  100 + devise (3.5.2)
113 101 bcrypt (~> 3.0)
114 102 orm_adapter (~> 0.1)
115 103 railties (>= 3.2.6, < 5)
... ... @@ -121,11 +109,11 @@ GEM
121 109 domain_name (0.5.24)
122 110 unf (>= 0.0.5, < 1.0.0)
123 111 erubis (2.7.0)
124   - eventmachine (1.0.7)
  112 + eventmachine (1.0.8)
125 113 exception_notification (4.1.1)
126 114 actionmailer (>= 3.0.4)
127 115 activesupport (>= 3.0.4)
128   - execjs (2.5.2)
  116 + execjs (2.6.0)
129 117 factory_girl (4.5.0)
130 118 activesupport (>= 3.0.0)
131 119 factory_girl_rails (4.5.0)
... ... @@ -133,21 +121,22 @@ GEM
133 121 railties (>= 3.0.0)
134 122 faraday (0.9.1)
135 123 multipart-post (>= 1.2, < 3)
136   - faraday_middleware (0.9.1)
  124 + faraday_middleware (0.9.2)
137 125 faraday (>= 0.7.4, < 0.10)
138 126 gherkin (2.12.2)
139 127 multi_json (~> 1.3)
140   - globalid (0.3.5)
  128 + globalid (0.3.6)
141 129 activesupport (>= 4.1.0)
142 130 google-analytics-rails (0.0.6)
  131 + hashie (3.4.1)
143 132 http-cookie (1.0.2)
144 133 domain_name (~> 0.5)
145 134 http_accept_language (2.0.5)
146 135 i18n (0.7.0)
147   - i18n_generators (1.2.1)
  136 + i18n_generators (2.0.0)
148 137 mechanize
149 138 rails (>= 3.0.0)
150   - jbuilder (2.3.0)
  139 + jbuilder (2.3.1)
151 140 activesupport (>= 3.0.0, < 5)
152 141 multi_json (~> 1.2)
153 142 jquery-rails (4.0.4)
... ... @@ -156,8 +145,11 @@ GEM
156 145 thor (>= 0.14, < 2.0)
157 146 jquery-ui-rails (5.0.5)
158 147 railties (>= 3.2.16)
  148 + js-routes (1.1.0)
  149 + railties (>= 3.2)
  150 + sprockets-rails
159 151 json (1.8.3)
160   - kalibro_client (0.4.0)
  152 + kalibro_client (1.3.0)
161 153 activesupport (>= 2.2.1)
162 154 faraday_middleware (~> 0.9.0)
163 155 konacha (3.5.1)
... ... @@ -174,8 +166,8 @@ GEM
174 166 less (~> 2.6.0)
175 167 sprockets (> 2, < 4)
176 168 tilt
177   - libv8 (3.16.14.7)
178   - loofah (2.0.2)
  169 + libv8 (3.16.14.11)
  170 + loofah (2.0.3)
179 171 nokogiri (>= 1.5.9)
180 172 mail (2.6.3)
181 173 mime-types (>= 1.16, < 3)
... ... @@ -191,10 +183,10 @@ GEM
191 183 metaclass (0.0.4)
192 184 mime-types (2.6.1)
193 185 mini_portile (0.6.2)
194   - minitest (5.7.0)
  186 + minitest (5.8.0)
195 187 mocha (1.1.0)
196 188 metaclass (~> 0.0.1)
197   - multi_json (1.11.1)
  189 + multi_json (1.11.2)
198 190 multi_test (0.1.2)
199 191 multipart-post (2.0.0)
200 192 net-http-digest_auth (1.4)
... ... @@ -205,6 +197,11 @@ GEM
205 197 nokogiri (1.6.6.2)
206 198 mini_portile (~> 0.6.0)
207 199 ntlm-http (0.1.1)
  200 + omniauth (1.2.2)
  201 + hashie (>= 1.2, < 4)
  202 + rack (~> 1.0)
  203 + omniauth-remote-user (0.0.6)
  204 + omniauth (~> 1.0)
208 205 orm_adapter (0.5.0)
209 206 pg (0.18.2)
210 207 poltergeist (1.6.0)
... ... @@ -215,44 +212,47 @@ GEM
215 212 rack (1.6.4)
216 213 rack-test (0.6.3)
217 214 rack (>= 1.0)
218   - rails (4.2.2)
219   - actionmailer (= 4.2.2)
220   - actionpack (= 4.2.2)
221   - actionview (= 4.2.2)
222   - activejob (= 4.2.2)
223   - activemodel (= 4.2.2)
224   - activerecord (= 4.2.2)
225   - activesupport (= 4.2.2)
  215 + rails (4.2.4)
  216 + actionmailer (= 4.2.4)
  217 + actionpack (= 4.2.4)
  218 + actionview (= 4.2.4)
  219 + activejob (= 4.2.4)
  220 + activemodel (= 4.2.4)
  221 + activerecord (= 4.2.4)
  222 + activesupport (= 4.2.4)
226 223 bundler (>= 1.3.0, < 2.0)
227   - railties (= 4.2.2)
  224 + railties (= 4.2.4)
228 225 sprockets-rails
229 226 rails-deprecated_sanitizer (1.0.3)
230 227 activesupport (>= 4.2.0.alpha)
231   - rails-dom-testing (1.0.6)
  228 + rails-dom-testing (1.0.7)
232 229 activesupport (>= 4.2.0.beta, < 5.0)
233 230 nokogiri (~> 1.6.0)
234 231 rails-deprecated_sanitizer (>= 1.0.1)
235 232 rails-html-sanitizer (1.0.2)
236 233 loofah (~> 2.0)
237   - railties (4.2.2)
238   - actionpack (= 4.2.2)
239   - activesupport (= 4.2.2)
  234 + railsstrap (3.3.4)
  235 + actionpack (>= 3.1)
  236 + therubyracer
  237 + railties (4.2.4)
  238 + actionpack (= 4.2.4)
  239 + activesupport (= 4.2.4)
240 240 rake (>= 0.8.7)
241 241 thor (>= 0.18.1, < 2.0)
242 242 rake (10.4.2)
243 243 rdoc (4.2.0)
244   - ref (1.0.5)
  244 + ref (2.0.0)
245 245 responders (2.1.0)
246 246 railties (>= 4.2.0, < 5)
247   - rspec-core (3.3.1)
  247 + rspec-core (3.3.2)
248 248 rspec-support (~> 3.3.0)
249   - rspec-expectations (3.3.0)
  249 + rspec-expectations (3.3.1)
250 250 diff-lcs (>= 1.2.0, < 2.0)
251 251 rspec-support (~> 3.3.0)
252   - rspec-mocks (3.3.1)
  252 + rspec-mocks (3.3.2)
253 253 diff-lcs (>= 1.2.0, < 2.0)
254 254 rspec-support (~> 3.3.0)
255   - rspec-rails (3.3.2)
  255 + rspec-rails (3.3.3)
256 256 actionpack (>= 3.0, < 4.3)
257 257 activesupport (>= 3.0, < 4.3)
258 258 railties (>= 3.0, < 4.3)
... ... @@ -261,7 +261,7 @@ GEM
261 261 rspec-mocks (~> 3.3.0)
262 262 rspec-support (~> 3.3.0)
263 263 rspec-support (3.3.0)
264   - sass (3.4.15)
  264 + sass (3.4.18)
265 265 sass-rails (5.0.3)
266 266 railties (>= 4.0.0, < 5.0)
267 267 sass (~> 3.1)
... ... @@ -281,7 +281,7 @@ GEM
281 281 sinon-rails (1.15.0)
282 282 railties (>= 3.1)
283 283 spring (1.3.6)
284   - sprockets (3.2.0)
  284 + sprockets (3.3.3)
285 285 rack (~> 1.0)
286 286 sprockets-rails (2.3.2)
287 287 actionpack (>= 3.0)
... ... @@ -306,7 +306,7 @@ GEM
306 306 coffee-rails
307 307 tzinfo (1.2.2)
308 308 thread_safe (~> 0.1)
309   - uglifier (2.7.1)
  309 + uglifier (2.7.2)
310 310 execjs (>= 0.3.0)
311 311 json (>= 1.8.0)
312 312 unf (0.1.4)
... ... @@ -320,7 +320,7 @@ GEM
320 320 railties (~> 4.0)
321 321 sprockets-rails (>= 2.0, < 4.0)
322 322 webrobots (0.1.1)
323   - websocket-driver (0.5.4)
  323 + websocket-driver (0.6.2)
324 324 websocket-extensions (>= 0.1.0)
325 325 websocket-extensions (0.1.2)
326 326 xpath (2.0.0)
... ... @@ -353,13 +353,18 @@ DEPENDENCIES
353 353 jbuilder (~> 2.0)
354 354 jquery-rails
355 355 jquery-ui-rails (~> 5.0.0)
356   - kalibro_client (~> 0.4.0)
  356 + js-routes (~> 1.1.0)
  357 + kalibro_client (~> 1.3.0)
357 358 konacha
  359 + less-rails (~> 2.7.0)
358 360 mocha
  361 + omniauth
  362 + omniauth-remote-user
359 363 pg (~> 0.18.1)
360 364 poltergeist (~> 1.6.0)
361   - rails (= 4.2.2)
  365 + rails (= 4.2.4)
362 366 rails-html-sanitizer (~> 1.0)
  367 + railsstrap (~> 3.3.4)
363 368 rspec-rails (~> 3.3.2)
364 369 sass-rails (~> 5.0.0)
365 370 sdoc (~> 0.4.0)
... ... @@ -372,6 +377,8 @@ DEPENDENCIES
372 377 therubyracer
373 378 thin
374 379 turbolinks
375   - twitter-bootstrap-rails!
376 380 uglifier (>= 1.3.0)
377 381 web-console (~> 2.0.0)
  382 +
  383 +BUNDLED WITH
  384 + 1.10.6
... ...
Makefile
1 1 NAME = prezento-spb
2   -VERSION = 0.8
  2 +VERSION = 0.8.3.colab
3 3 TARBALL = $(NAME)-deps-$(VERSION).tar.gz
4 4 PREFIX = /usr
5 5 WGET = wget
6   -BRANCH = v0.8.1.colab
  6 +BRANCH = v0.8.3.colab
7 7 BUNDLE_OPTS = --verbose --without='development test cucumber'
8 8 GEMFILE_URL=https://portal.softwarepublico.gov.br/gitlab/mezuro/prezento/raw/
9 9  
... ...
vendor/cache/actionmailer-4.2.2.gem
No preview for this file type
vendor/cache/actionmailer-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/actionpack-4.2.2.gem
No preview for this file type
vendor/cache/actionpack-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/actionview-4.2.2.gem
No preview for this file type
vendor/cache/actionview-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/activejob-4.2.2.gem
No preview for this file type
vendor/cache/activejob-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/activemodel-4.2.2.gem
No preview for this file type
vendor/cache/activemodel-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/activerecord-4.2.2.gem
No preview for this file type
vendor/cache/activerecord-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/activesupport-4.2.2.gem
No preview for this file type
vendor/cache/activesupport-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/arel-6.0.0.gem
No preview for this file type
vendor/cache/arel-6.0.3.gem 0 → 100644
No preview for this file type
vendor/cache/devise-3.5.1.gem
No preview for this file type
vendor/cache/devise-3.5.2.gem 0 → 100644
No preview for this file type
vendor/cache/execjs-2.5.2.gem
No preview for this file type
vendor/cache/execjs-2.6.0.gem 0 → 100644
No preview for this file type
vendor/cache/faraday_middleware-0.9.1.gem
No preview for this file type
vendor/cache/faraday_middleware-0.9.2.gem 0 → 100644
No preview for this file type
vendor/cache/globalid-0.3.5.gem
No preview for this file type
vendor/cache/globalid-0.3.6.gem 0 → 100644
No preview for this file type
vendor/cache/hashie-3.4.1.gem 0 → 100644
No preview for this file type
vendor/cache/jbuilder-2.3.0.gem
No preview for this file type
vendor/cache/jbuilder-2.3.1.gem 0 → 100644
No preview for this file type
vendor/cache/js-routes-1.1.0.gem 0 → 100644
No preview for this file type
vendor/cache/kalibro_client-0.4.0.gem
No preview for this file type
vendor/cache/kalibro_client-1.3.0.gem 0 → 100644
No preview for this file type
vendor/cache/libv8-3.16.14.11-x86_64-linux.gem 0 → 100644
No preview for this file type
vendor/cache/libv8-3.16.14.7-x86_64-linux.gem
No preview for this file type
vendor/cache/loofah-2.0.2.gem
No preview for this file type
vendor/cache/loofah-2.0.3.gem 0 → 100644
No preview for this file type
vendor/cache/minitest-5.7.0.gem
No preview for this file type
vendor/cache/minitest-5.8.0.gem 0 → 100644
No preview for this file type
vendor/cache/multi_json-1.11.1.gem
No preview for this file type
vendor/cache/multi_json-1.11.2.gem 0 → 100644
No preview for this file type
vendor/cache/omniauth-1.2.2.gem 0 → 100644
No preview for this file type
vendor/cache/omniauth-remote-user-0.0.6.gem 0 → 100644
No preview for this file type
vendor/cache/rails-4.2.2.gem
No preview for this file type
vendor/cache/rails-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/rails-dom-testing-1.0.6.gem
No preview for this file type
vendor/cache/rails-dom-testing-1.0.7.gem 0 → 100644
No preview for this file type
vendor/cache/railsstrap-3.3.4.gem 0 → 100644
No preview for this file type
vendor/cache/railties-4.2.2.gem
No preview for this file type
vendor/cache/railties-4.2.4.gem 0 → 100644
No preview for this file type
vendor/cache/ref-1.0.5.gem
No preview for this file type
vendor/cache/ref-2.0.0.gem 0 → 100644
No preview for this file type
vendor/cache/sass-3.4.15.gem
No preview for this file type
vendor/cache/sass-3.4.18.gem 0 → 100644
No preview for this file type
vendor/cache/sprockets-3.2.0.gem
No preview for this file type
vendor/cache/sprockets-3.3.3.gem 0 → 100644
No preview for this file type
vendor/cache/sqlite3-1.3.10.gem
No preview for this file type
vendor/cache/uglifier-2.7.1.gem
No preview for this file type
vendor/cache/uglifier-2.7.2.gem 0 → 100644
No preview for this file type