Download as
Browse Code »

Commit c1acd8ab292042f5cfa0d842846b2205bddf94f0

Authored by Fernando Brito
1 parent b174b1de
Exists in master and in 2 other branches v2, wikilibras

Add some dependencies

Showing 2 changed files with 27 additions and 4 deletions   Show diff stats
@@ -12,11 +12,13 @@ gem 'sass-rails', '~> 4.0.3' @@ -12,11 +12,13 @@ gem 'sass-rails', '~> 4.0.3'
12 gem 'twitter-bootstrap-rails' 12 gem 'twitter-bootstrap-rails'
13 gem 'less-rails' 13 gem 'less-rails'
14 14
  15 +gem 'httparty'
  16 +
15 gem 'uglifier', '>= 1.3.0' 17 gem 'uglifier', '>= 1.3.0'
16 gem 'coffee-rails', '~> 4.0.0' 18 gem 'coffee-rails', '~> 4.0.0'
17 gem 'jquery-rails' 19 gem 'jquery-rails'
18 gem 'therubyracer', :platform => :ruby 20 gem 'therubyracer', :platform => :ruby
19 -gem 'turbolinks' 21 +# gem 'turbolinks'
20 22
21 gem 'devise' 23 gem 'devise'
22 gem 'cancan' 24 gem 'cancan'
@@ -26,6 +28,9 @@ gem 'simple_form' @@ -26,6 +28,9 @@ gem 'simple_form'
26 28
27 gem 'inherited_resources' 29 gem 'inherited_resources'
28 30
  31 +gem 'delayed_job_active_record'
  32 +gem 'foreman'
  33 +
29 group :development do 34 group :development do
30 gem 'better_errors' 35 gem 'better_errors'
31 gem 'binding_of_caller', :platforms=>[:mri_21] 36 gem 'binding_of_caller', :platforms=>[:mri_21]
@@ -42,6 +47,7 @@ group :development do @@ -42,6 +47,7 @@ group :development do
42 gem 'rb-fsevent', :require=>false 47 gem 'rb-fsevent', :require=>false
43 gem 'rb-inotify', :require=>false 48 gem 'rb-inotify', :require=>false
44 gem 'awesome_print' 49 gem 'awesome_print'
  50 + gem 'annotate'
45 end 51 end
46 52
47 group :development, :test do 53 group :development, :test do
@@ -45,6 +45,9 @@ GEM @@ -45,6 +45,9 @@ GEM
45 thread_safe (~> 0.1) 45 thread_safe (~> 0.1)
46 tzinfo (~> 1.1) 46 tzinfo (~> 1.1)
47 addressable (2.3.6) 47 addressable (2.3.6)
  48 + annotate (2.6.3)
  49 + activerecord (>= 2.3.0)
  50 + rake (>= 0.8.7)
48 arbre (1.0.1) 51 arbre (1.0.1)
49 activesupport (>= 3.0.0) 52 activesupport (>= 3.0.0)
50 arel (5.0.1.20140414130214) 53 arel (5.0.1.20140414130214)
@@ -92,6 +95,11 @@ GEM @@ -92,6 +95,11 @@ GEM
92 debugger-ruby_core_source (~> 1.3.2) 95 debugger-ruby_core_source (~> 1.3.2)
93 debugger-linecache (1.2.0) 96 debugger-linecache (1.2.0)
94 debugger-ruby_core_source (1.3.4) 97 debugger-ruby_core_source (1.3.4)
  98 + delayed_job (4.0.1)
  99 + activesupport (>= 3.0, < 4.2)
  100 + delayed_job_active_record (4.0.1)
  101 + activerecord (>= 3.0, < 4.2)
  102 + delayed_job (>= 3.0, < 4.1)
95 devise (3.2.4) 103 devise (3.2.4)
96 bcrypt (~> 3.0) 104 bcrypt (~> 3.0)
97 orm_adapter (~> 0.1) 105 orm_adapter (~> 0.1)
@@ -99,6 +107,7 @@ GEM @@ -99,6 +107,7 @@ GEM
99 thread_safe (~> 0.1) 107 thread_safe (~> 0.1)
100 warden (~> 1.2.3) 108 warden (~> 1.2.3)
101 diff-lcs (1.2.5) 109 diff-lcs (1.2.5)
  110 + dotenv (0.7.0)
102 em-websocket (0.5.1) 111 em-websocket (0.5.1)
103 eventmachine (>= 0.12.9) 112 eventmachine (>= 0.12.9)
104 http_parser.rb (~> 0.6.0) 113 http_parser.rb (~> 0.6.0)
@@ -113,6 +122,9 @@ GEM @@ -113,6 +122,9 @@ GEM
113 faker (1.3.0) 122 faker (1.3.0)
114 i18n (~> 0.5) 123 i18n (~> 0.5)
115 ffi (1.9.3) 124 ffi (1.9.3)
  125 + foreman (0.66.0)
  126 + dotenv (~> 0.7.0)
  127 + thor (~> 0.19.1)
116 formatador (0.2.4) 128 formatador (0.2.4)
117 formtastic (2.3.0.rc3) 129 formtastic (2.3.0.rc3)
118 actionpack (>= 3.0) 130 actionpack (>= 3.0)
@@ -152,6 +164,9 @@ GEM @@ -152,6 +164,9 @@ GEM
152 hpricot (~> 0.8.6) 164 hpricot (~> 0.8.6)
153 ruby_parser (~> 3.1.1) 165 ruby_parser (~> 3.1.1)
154 http_parser.rb (0.6.0) 166 http_parser.rb (0.6.0)
  167 + httparty (0.13.1)
  168 + json (~> 1.8)
  169 + multi_xml (>= 0.5.2)
155 i18n (0.6.9) 170 i18n (0.6.9)
156 inherited_resources (1.4.1) 171 inherited_resources (1.4.1)
157 has_scope (~> 0.6.0.rc) 172 has_scope (~> 0.6.0.rc)
@@ -188,6 +203,7 @@ GEM @@ -188,6 +203,7 @@ GEM
188 mini_portile (0.5.3) 203 mini_portile (0.5.3)
189 minitest (5.3.3) 204 minitest (5.3.3)
190 multi_json (1.10.0) 205 multi_json (1.10.0)
  206 + multi_xml (0.5.5)
191 mysql2 (0.3.15) 207 mysql2 (0.3.15)
192 nio4r (1.0.0) 208 nio4r (1.0.0)
193 nokogiri (1.6.2) 209 nokogiri (1.6.2)
@@ -313,8 +329,6 @@ GEM @@ -313,8 +329,6 @@ GEM
313 treetop (1.4.15) 329 treetop (1.4.15)
314 polyglot 330 polyglot
315 polyglot (>= 0.3.1) 331 polyglot (>= 0.3.1)
316 - turbolinks (2.2.2)  
317 - coffee-rails  
318 twitter-bootstrap-rails (2.0.9) 332 twitter-bootstrap-rails (2.0.9)
319 actionpack (>= 3.1) 333 actionpack (>= 3.1)
320 less-rails (~> 2.2.2) 334 less-rails (~> 2.2.2)
@@ -336,6 +350,7 @@ PLATFORMS @@ -336,6 +350,7 @@ PLATFORMS
336 350
337 DEPENDENCIES 351 DEPENDENCIES
338 activeadmin! 352 activeadmin!
  353 + annotate
339 awesome_print 354 awesome_print
340 better_errors 355 better_errors
341 binding_of_caller 356 binding_of_caller
@@ -343,15 +358,18 @@ DEPENDENCIES @@ -343,15 +358,18 @@ DEPENDENCIES
343 capybara 358 capybara
344 coffee-rails (~> 4.0.0) 359 coffee-rails (~> 4.0.0)
345 database_cleaner 360 database_cleaner
  361 + delayed_job_active_record
346 devise 362 devise
347 factory_girl_rails 363 factory_girl_rails
348 faker 364 faker
  365 + foreman
349 guard-bundler 366 guard-bundler
350 guard-livereload 367 guard-livereload
351 guard-rails 368 guard-rails
352 guard-rspec 369 guard-rspec
353 haml-rails 370 haml-rails
354 html2haml 371 html2haml
  372 + httparty
355 inherited_resources 373 inherited_resources
356 jquery-rails 374 jquery-rails
357 launchy 375 launchy
@@ -376,6 +394,5 @@ DEPENDENCIES @@ -376,6 +394,5 @@ DEPENDENCIES
376 sqlite3 394 sqlite3
377 therubyracer 395 therubyracer
378 thin 396 thin
379 - turbolinks  
380 twitter-bootstrap-rails 397 twitter-bootstrap-rails
381 uglifier (>= 1.3.0) 398 uglifier (>= 1.3.0)