Download as
Browse Code »

Commit 02421245256a145a2b29a81f210585b15d1f2b67

Authored by Dmitriy Zaporozhets
1 parent 87c397f5
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Fix 404 on jquery ui images 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 13 additions and 16 deletions   Show diff stats
@@ -161,8 +161,8 @@ gem &#39;jquery-turbolinks&#39; @@ -161,8 +161,8 @@ gem &#39;jquery-turbolinks&#39;
161 161
162 gem 'select2-rails' 162 gem 'select2-rails'
163 gem 'jquery-atwho-rails', "~> 0.3.3" 163 gem 'jquery-atwho-rails', "~> 0.3.3"
164 -gem "jquery-rails", "2.1.3"  
165 -gem "jquery-ui-rails", "2.0.2" 164 +gem "jquery-rails"
  165 +gem "jquery-ui-rails"
166 gem "raphael-rails", "~> 2.1.2" 166 gem "raphael-rails", "~> 2.1.2"
167 gem 'bootstrap-sass', '~> 3.0' 167 gem 'bootstrap-sass', '~> 3.0'
168 gem "font-awesome-rails", '~> 3.2' 168 gem "font-awesome-rails", '~> 3.2'
@@ -34,7 +34,6 @@ GEM @@ -34,7 +34,6 @@ GEM
34 rake (>= 0.8.7) 34 rake (>= 0.8.7)
35 arel (4.0.2) 35 arel (4.0.2)
36 asciidoctor (0.1.4) 36 asciidoctor (0.1.4)
37 - atomic (1.1.16)  
38 awesome_print (1.2.0) 37 awesome_print (1.2.0)
39 axiom-types (0.0.5) 38 axiom-types (0.0.5)
40 descendants_tracker (~> 0.0.1) 39 descendants_tracker (~> 0.0.1)
@@ -248,15 +247,14 @@ GEM @@ -248,15 +247,14 @@ GEM
248 rake 247 rake
249 jasmine-core (2.0.0.rc5) 248 jasmine-core (2.0.0.rc5)
250 jquery-atwho-rails (0.3.3) 249 jquery-atwho-rails (0.3.3)
251 - jquery-rails (2.1.3)  
252 - railties (>= 3.1.0, < 5.0)  
253 - thor (~> 0.14) 250 + jquery-rails (3.1.0)
  251 + railties (>= 3.0, < 5.0)
  252 + thor (>= 0.14, < 2.0)
254 jquery-turbolinks (2.0.1) 253 jquery-turbolinks (2.0.1)
255 railties (>= 3.1.0) 254 railties (>= 3.1.0)
256 turbolinks 255 turbolinks
257 - jquery-ui-rails (2.0.2)  
258 - jquery-rails  
259 - railties (>= 3.1.0) 256 + jquery-ui-rails (4.2.1)
  257 + railties (>= 3.2.16)
260 json (1.8.1) 258 json (1.8.1)
261 jwt (0.1.8) 259 jwt (0.1.8)
262 multi_json (>= 1.5) 260 multi_json (>= 1.5)
@@ -281,7 +279,7 @@ GEM @@ -281,7 +279,7 @@ GEM
281 mime-types (1.25.1) 279 mime-types (1.25.1)
282 mini_portile (0.5.3) 280 mini_portile (0.5.3)
283 minitest (4.7.5) 281 minitest (4.7.5)
284 - multi_json (1.9.2) 282 + multi_json (1.9.3)
285 multi_xml (0.5.5) 283 multi_xml (0.5.5)
286 multipart-post (1.2.0) 284 multipart-post (1.2.0)
287 mysql2 (0.3.11) 285 mysql2 (0.3.11)
@@ -376,7 +374,7 @@ GEM @@ -376,7 +374,7 @@ GEM
376 rake (>= 0.8.7) 374 rake (>= 0.8.7)
377 thor (>= 0.18.1, < 2.0) 375 thor (>= 0.18.1, < 2.0)
378 raindrops (0.12.0) 376 raindrops (0.12.0)
379 - rake (10.1.1) 377 + rake (10.3.1)
380 raphael-rails (2.1.2) 378 raphael-rails (2.1.2)
381 rb-fsevent (0.9.3) 379 rb-fsevent (0.9.3)
382 rb-inotify (0.9.2) 380 rb-inotify (0.9.2)
@@ -503,9 +501,8 @@ GEM @@ -503,9 +501,8 @@ GEM
503 daemons (>= 1.0.9) 501 daemons (>= 1.0.9)
504 eventmachine (>= 1.0.0) 502 eventmachine (>= 1.0.0)
505 rack (>= 1.0.0) 503 rack (>= 1.0.0)
506 - thor (0.18.1)  
507 - thread_safe (0.3.1)  
508 - atomic (>= 1.1.7, < 2) 504 + thor (0.19.1)
  505 + thread_safe (0.3.3)
509 tilt (1.4.1) 506 tilt (1.4.1)
510 timers (1.1.0) 507 timers (1.1.0)
511 tinder (1.9.3) 508 tinder (1.9.3)
@@ -608,9 +605,9 @@ DEPENDENCIES @@ -608,9 +605,9 @@ DEPENDENCIES
608 httparty 605 httparty
609 jasmine (= 2.0.0.rc5) 606 jasmine (= 2.0.0.rc5)
610 jquery-atwho-rails (~> 0.3.3) 607 jquery-atwho-rails (~> 0.3.3)
611 - jquery-rails (= 2.1.3) 608 + jquery-rails
612 jquery-turbolinks 609 jquery-turbolinks
613 - jquery-ui-rails (= 2.0.2) 610 + jquery-ui-rails
614 kaminari (~> 0.15.1) 611 kaminari (~> 0.15.1)
615 launchy 612 launchy
616 letter_opener 613 letter_opener
app/assets/images/ui-icons_222222_256x240.png
View file @87c397f

4.09 KB
app/assets/images/ui-icons_454545_256x240.png
View file @87c397f

4.09 KB