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