deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

downgrade raphael js to 1.5.2

Browse source
This commit is contained in:
Nihad Abbasov 2012-06-22 01:57:05 -07:00
parent b32465712b
commit da5cf9d085
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -43,7 +43,7 @@ gem 'chosen-rails'
gem "jquery-rails", "2.0.2" gem "jquery-rails", "2.0.2"
gem "jquery-ui-rails", "0.5.0" gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3" gem "modernizr", "2.5.3"
gem "graphael-rails", "0.1.4" gem "raphael-rails", "1.5.2"
group :assets do group :assets do
gem "sass-rails", "3.2.5" gem "sass-rails", "3.2.5"

10
Gemfile.lock
View file

@ -151,8 +151,6 @@ GEM
gherkin (2.11.0) gherkin (2.11.0)
json (>= 1.4.6) json (>= 1.4.6)
git (1.2.5) git (1.2.5)
graphael-rails (0.1.4)
jeweler
haml (3.1.6) haml (3.1.6)
haml-rails (0.3.4) haml-rails (0.3.4)
actionpack (~> 3.0) actionpack (~> 3.0)
@ -166,11 +164,6 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
multi_xml multi_xml
i18n (0.6.0) i18n (0.6.0)
jeweler (1.8.3)
bundler (~> 1.0)
git (>= 1.2.5)
rake
rdoc
journey (1.0.3) journey (1.0.3)
jquery-rails (2.0.2) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
@ -249,6 +242,7 @@ GEM
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.9.0) raindrops (0.9.0)
rake (0.9.2.2) rake (0.9.2.2)
raphael-rails (1.5.2)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.1.1) redcarpet (2.1.1)
@ -370,7 +364,6 @@ DEPENDENCIES
foreman foreman
git git
gitolite! gitolite!
graphael-rails (= 0.1.4)
grit! grit!
haml-rails haml-rails
httparty httparty
@ -388,6 +381,7 @@ DEPENDENCIES
pygments.rb! pygments.rb!
rails (= 3.2.5) rails (= 3.2.5)
rails-footnotes rails-footnotes
raphael-rails (= 1.5.2)
redcarpet (~> 2.1.1) redcarpet (~> 2.1.1)
resque (~> 1.20.0) resque (~> 1.20.0)
resque_mailer resque_mailer

4
app/assets/javascripts/application.js
View file

@ -15,7 +15,7 @@
//= require bootstrap-modal //= require bootstrap-modal
//= require modernizr //= require modernizr
//= require chosen-jquery //= require chosen-jquery
//= require raphael/raphael //= require raphael
//= require branch-graph //= require branch-graph
//= require_tree . //= require_tree .
@ -56,7 +56,7 @@ $(document).ready(function(){
/** /**
* Commit show suppressed diff * Commit show suppressed diff
* *
*/ */
$(".supp_diff_link").bind("click", function() { $(".supp_diff_link").bind("click", function() {
showDiff(this); showDiff(this);