diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-06-22 01:57:05 -0700 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-06-22 01:57:05 -0700 |
| commit | da5cf9d085e148b44945640cd25eec3f172caf28 (patch) | |
| tree | 8d225e5a2fd475bc0ec47b3288c280818417b7dc | |
| parent | b32465712becfbcf83d63b1e6eff7d1483fdabea (diff) | |
| download | gitlab-ce-da5cf9d085e148b44945640cd25eec3f172caf28.tar.gz | |
downgrade raphael js to 1.5.2
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 4 |
3 files changed, 5 insertions, 11 deletions
@@ -43,7 +43,7 @@ gem 'chosen-rails' gem "jquery-rails", "2.0.2" gem "jquery-ui-rails", "0.5.0" gem "modernizr", "2.5.3" -gem "graphael-rails", "0.1.4" +gem "raphael-rails", "1.5.2" group :assets do gem "sass-rails", "3.2.5" diff --git a/Gemfile.lock b/Gemfile.lock index bdf78c46e01..7f252a66d12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,8 +151,6 @@ GEM gherkin (2.11.0) json (>= 1.4.6) git (1.2.5) - graphael-rails (0.1.4) - jeweler haml (3.1.6) haml-rails (0.3.4) actionpack (~> 3.0) @@ -166,11 +164,6 @@ GEM multi_json (~> 1.0) multi_xml i18n (0.6.0) - jeweler (1.8.3) - bundler (~> 1.0) - git (>= 1.2.5) - rake - rdoc journey (1.0.3) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) @@ -249,6 +242,7 @@ GEM thor (>= 0.14.6, < 2.0) raindrops (0.9.0) rake (0.9.2.2) + raphael-rails (1.5.2) rdoc (3.12) json (~> 1.4) redcarpet (2.1.1) @@ -370,7 +364,6 @@ DEPENDENCIES foreman git gitolite! - graphael-rails (= 0.1.4) grit! haml-rails httparty @@ -388,6 +381,7 @@ DEPENDENCIES pygments.rb! rails (= 3.2.5) rails-footnotes + raphael-rails (= 1.5.2) redcarpet (~> 2.1.1) resque (~> 1.20.0) resque_mailer diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8b8c4291f5d..42290f8e154 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,7 +15,7 @@ //= require bootstrap-modal //= require modernizr //= require chosen-jquery -//= require raphael/raphael +//= require raphael //= require branch-graph //= require_tree . @@ -56,7 +56,7 @@ $(document).ready(function(){ /** * Commit show suppressed diff - * + * */ $(".supp_diff_link").bind("click", function() { showDiff(this); |