Download as
Browse Code »

Commit 520f02259c7076ca44f298dd401ef9df2ac8c0d3

Authored by Dmitriy Zaporozhets
1 parent 153a4c14
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

gems updated: unicorn, draper, github-markup

Showing 2 changed files with 12 additions and 10 deletions   Show diff stats
@@ -72,7 +72,7 @@ gem "redcarpet", "~> 2.2.2" @@ -72,7 +72,7 @@ gem "redcarpet", "~> 2.2.2"
72 gem "github-markup", "~> 0.7.4", require: 'github/markup' 72 gem "github-markup", "~> 0.7.4", require: 'github/markup'
73 73
74 # Servers 74 # Servers
75 -gem "unicorn", "~> 4.4.0" 75 +gem "unicorn"
76 76
77 # State machine 77 # State machine
78 gem "state_machine" 78 gem "state_machine"
@@ -81,7 +81,7 @@ gem "state_machine" @@ -81,7 +81,7 @@ gem "state_machine"
81 gem "acts-as-taggable-on", "2.3.3" 81 gem "acts-as-taggable-on", "2.3.3"
82 82
83 # Decorators 83 # Decorators
84 -gem "draper", "~> 0.18.0" 84 +gem "draper"
85 85
86 # Background jobs 86 # Background jobs
87 gem 'slim' 87 gem 'slim'
@@ -135,9 +135,10 @@ GEM @@ -135,9 +135,10 @@ GEM
135 railties (~> 3.1) 135 railties (~> 3.1)
136 warden (~> 1.2.1) 136 warden (~> 1.2.1)
137 diff-lcs (1.1.3) 137 diff-lcs (1.1.3)
138 - draper (0.18.0)  
139 - actionpack (~> 3.2)  
140 - activesupport (~> 3.2) 138 + draper (1.1.0)
  139 + actionpack (>= 3.0)
  140 + activesupport (>= 3.0)
  141 + request_store (~> 1.0.3)
141 email_spec (1.4.0) 142 email_spec (1.4.0)
142 launchy (~> 2.1) 143 launchy (~> 2.1)
143 mail (~> 2.2) 144 mail (~> 2.2)
@@ -173,7 +174,7 @@ GEM @@ -173,7 +174,7 @@ GEM
173 escape_utils (~> 0.2.3) 174 escape_utils (~> 0.2.3)
174 mime-types (~> 1.19) 175 mime-types (~> 1.19)
175 pygments.rb (>= 0.2.13) 176 pygments.rb (>= 0.2.13)
176 - github-markup (0.7.4) 177 + github-markup (0.7.5)
177 gitlab_meta (5.0) 178 gitlab_meta (5.0)
178 gitlab_omniauth-ldap (1.0.2) 179 gitlab_omniauth-ldap (1.0.2)
179 net-ldap (~> 0.2.2) 180 net-ldap (~> 0.2.2)
@@ -236,7 +237,7 @@ GEM @@ -236,7 +237,7 @@ GEM
236 kaminari (0.14.1) 237 kaminari (0.14.1)
237 actionpack (>= 3.0.0) 238 actionpack (>= 3.0.0)
238 activesupport (>= 3.0.0) 239 activesupport (>= 3.0.0)
239 - kgio (2.7.4) 240 + kgio (2.8.0)
240 launchy (2.1.2) 241 launchy (2.1.2)
241 addressable (~> 2.3) 242 addressable (~> 2.3)
242 letter_opener (1.0.0) 243 letter_opener (1.0.0)
@@ -351,6 +352,7 @@ GEM @@ -351,6 +352,7 @@ GEM
351 redis (3.0.2) 352 redis (3.0.2)
352 redis-namespace (1.2.1) 353 redis-namespace (1.2.1)
353 redis (~> 3.0.0) 354 redis (~> 3.0.0)
  355 + request_store (1.0.5)
354 rspec (2.12.0) 356 rspec (2.12.0)
355 rspec-core (~> 2.12.0) 357 rspec-core (~> 2.12.0)
356 rspec-expectations (~> 2.12.0) 358 rspec-expectations (~> 2.12.0)
@@ -439,7 +441,7 @@ GEM @@ -439,7 +441,7 @@ GEM
439 uglifier (1.3.0) 441 uglifier (1.3.0)
440 execjs (>= 0.3.0) 442 execjs (>= 0.3.0)
441 multi_json (~> 1.0, >= 1.0.2) 443 multi_json (~> 1.0, >= 1.0.2)
442 - unicorn (4.4.0) 444 + unicorn (4.6.2)
443 kgio (~> 2.6) 445 kgio (~> 2.6)
444 rack 446 rack
445 raindrops (~> 0.7) 447 raindrops (~> 0.7)
@@ -473,7 +475,7 @@ DEPENDENCIES @@ -473,7 +475,7 @@ DEPENDENCIES
473 colored 475 colored
474 database_cleaner 476 database_cleaner
475 devise 477 devise
476 - draper (~> 0.18.0) 478 + draper
477 email_spec 479 email_spec
478 enumerize 480 enumerize
479 factory_girl_rails 481 factory_girl_rails
@@ -541,5 +543,5 @@ DEPENDENCIES @@ -541,5 +543,5 @@ DEPENDENCIES
541 therubyracer 543 therubyracer
542 thin 544 thin
543 uglifier (~> 1.3.0) 545 uglifier (~> 1.3.0)
544 - unicorn (~> 4.4.0) 546 + unicorn
545 webmock 547 webmock