Commit d773db8dbe6cc074a25ccbd2ff58e4b1dadb82a7
Exists in
master
and in
4 other branches
Merge pull request #959 from NARKOZ/raphael-js
Downgrade Raphael.js
Showing
3 changed files
with
11 additions
and
17 deletions
Show diff stats
Gemfile
| ... | ... | @@ -35,21 +35,21 @@ gem "httparty" |
| 35 | 35 | gem "charlock_holmes" |
| 36 | 36 | gem "foreman" |
| 37 | 37 | gem "omniauth-ldap" |
| 38 | -gem 'bootstrap-sass', "2.0.3.1" | |
| 39 | 38 | gem "colored" |
| 40 | 39 | gem 'resque_mailer' |
| 41 | -gem 'chosen-rails' | |
| 42 | - | |
| 43 | -gem "jquery-rails", "2.0.2" | |
| 44 | -gem "jquery-ui-rails", "0.5.0" | |
| 45 | -gem "modernizr", "2.5.3" | |
| 46 | -gem "graphael-rails", "0.1.4" | |
| 47 | 40 | |
| 48 | 41 | group :assets do |
| 49 | 42 | gem "sass-rails", "3.2.5" |
| 50 | 43 | gem "coffee-rails", "3.2.2" |
| 51 | 44 | gem "uglifier", "1.0.3" |
| 52 | 45 | gem "therubyracer" |
| 46 | + | |
| 47 | + gem 'chosen-rails' | |
| 48 | + gem "jquery-rails", "2.0.2" | |
| 49 | + gem "jquery-ui-rails", "0.5.0" | |
| 50 | + gem "modernizr", "2.5.3" | |
| 51 | + gem "raphael-rails", "1.5.2" | |
| 52 | + gem 'bootstrap-sass', "2.0.3.1" | |
| 53 | 53 | end |
| 54 | 54 | |
| 55 | 55 | group :development do | ... | ... |
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); | ... | ... |