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