Download as
Browse Code »

Commit da5cf9d085e148b44945640cd25eec3f172caf28

Authored by Nihad Abbasov
1 parent b3246571
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

downgrade raphael js to 1.5.2

Showing 3 changed files with 5 additions and 11 deletions   Show diff stats
@@ -43,7 +43,7 @@ gem 'chosen-rails' @@ -43,7 +43,7 @@ gem 'chosen-rails'
43 gem "jquery-rails", "2.0.2" 43 gem "jquery-rails", "2.0.2"
44 gem "jquery-ui-rails", "0.5.0" 44 gem "jquery-ui-rails", "0.5.0"
45 gem "modernizr", "2.5.3" 45 gem "modernizr", "2.5.3"
46 -gem "graphael-rails", "0.1.4" 46 +gem "raphael-rails", "1.5.2"
47 47
48 group :assets do 48 group :assets do
49 gem "sass-rails", "3.2.5" 49 gem "sass-rails", "3.2.5"
@@ -151,8 +151,6 @@ GEM @@ -151,8 +151,6 @@ GEM
151 gherkin (2.11.0) 151 gherkin (2.11.0)
152 json (>= 1.4.6) 152 json (>= 1.4.6)
153 git (1.2.5) 153 git (1.2.5)
154 - graphael-rails (0.1.4)  
155 - jeweler  
156 haml (3.1.6) 154 haml (3.1.6)
157 haml-rails (0.3.4) 155 haml-rails (0.3.4)
158 actionpack (~> 3.0) 156 actionpack (~> 3.0)
@@ -166,11 +164,6 @@ GEM @@ -166,11 +164,6 @@ GEM
166 multi_json (~> 1.0) 164 multi_json (~> 1.0)
167 multi_xml 165 multi_xml
168 i18n (0.6.0) 166 i18n (0.6.0)
169 - jeweler (1.8.3)  
170 - bundler (~> 1.0)  
171 - git (>= 1.2.5)  
172 - rake  
173 - rdoc  
174 journey (1.0.3) 167 journey (1.0.3)
175 jquery-rails (2.0.2) 168 jquery-rails (2.0.2)
176 railties (>= 3.2.0, < 5.0) 169 railties (>= 3.2.0, < 5.0)
@@ -249,6 +242,7 @@ GEM @@ -249,6 +242,7 @@ GEM
249 thor (>= 0.14.6, < 2.0) 242 thor (>= 0.14.6, < 2.0)
250 raindrops (0.9.0) 243 raindrops (0.9.0)
251 rake (0.9.2.2) 244 rake (0.9.2.2)
  245 + raphael-rails (1.5.2)
252 rdoc (3.12) 246 rdoc (3.12)
253 json (~> 1.4) 247 json (~> 1.4)
254 redcarpet (2.1.1) 248 redcarpet (2.1.1)
@@ -370,7 +364,6 @@ DEPENDENCIES @@ -370,7 +364,6 @@ DEPENDENCIES
370 foreman 364 foreman
371 git 365 git
372 gitolite! 366 gitolite!
373 - graphael-rails (= 0.1.4)  
374 grit! 367 grit!
375 haml-rails 368 haml-rails
376 httparty 369 httparty
@@ -388,6 +381,7 @@ DEPENDENCIES @@ -388,6 +381,7 @@ DEPENDENCIES
388 pygments.rb! 381 pygments.rb!
389 rails (= 3.2.5) 382 rails (= 3.2.5)
390 rails-footnotes 383 rails-footnotes
  384 + raphael-rails (= 1.5.2)
391 redcarpet (~> 2.1.1) 385 redcarpet (~> 2.1.1)
392 resque (~> 1.20.0) 386 resque (~> 1.20.0)
393 resque_mailer 387 resque_mailer
app/assets/javascripts/application.js
  Diff comments   View file @da5cf9d
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 //= require bootstrap-modal 15 //= require bootstrap-modal
16 //= require modernizr 16 //= require modernizr
17 //= require chosen-jquery 17 //= require chosen-jquery
18 -//= require raphael/raphael 18 +//= require raphael
19 //= require branch-graph 19 //= require branch-graph
20 //= require_tree . 20 //= require_tree .
21 21
@@ -56,7 +56,7 @@ $(document).ready(function(){ @@ -56,7 +56,7 @@ $(document).ready(function(){
56 56
57 /** 57 /**
58 * Commit show suppressed diff 58 * Commit show suppressed diff
59 - * 59 + *
60 */ 60 */
61 $(".supp_diff_link").bind("click", function() { 61 $(".supp_diff_link").bind("click", function() {
62 showDiff(this); 62 showDiff(this);