Commit d773db8d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #959 from NARKOZ/raphael-js

Downgrade Raphael.js
parents b3246571 fd44b6b6
......@@ -35,21 +35,21 @@ gem "httparty"
gem "charlock_holmes"
gem "foreman"
gem "omniauth-ldap"
gem 'bootstrap-sass', "2.0.3.1"
gem "colored"
gem 'resque_mailer'
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"
group :assets do
gem "sass-rails", "3.2.5"
gem "coffee-rails", "3.2.2"
gem "uglifier", "1.0.3"
gem "therubyracer"
gem 'chosen-rails'
gem "jquery-rails", "2.0.2"
gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3"
gem "raphael-rails", "1.5.2"
gem 'bootstrap-sass', "2.0.3.1"
end
group :development do
......
......@@ -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
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment