diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-01 02:04:22 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-01 02:04:22 +0400 |
| commit | 84992cd0fac36846ebfde5800d52158258107ecc (patch) | |
| tree | 61d9ed51a3480a7b3f5be292e1f18e40f93fd2b5 | |
| parent | cafe181b5487891453f0ead532b026e80579ec1e (diff) | |
Use original raphael-rails v2.1.2
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
3 files changed, 5 insertions, 10 deletions
@@ -134,7 +134,7 @@ group :assets do gem "jquery-rails", "2.1.3" gem "jquery-ui-rails", "2.0.2" gem "modernizr", "2.6.2" - gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" + gem "raphael-rails", "~> 2.1.2" gem 'bootstrap-sass' gem "font-awesome-rails" gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' diff --git a/Gemfile.lock b/Gemfile.lock index e608afad1e7..d71988e13e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,12 +6,6 @@ GIT activerecord (>= 2.3.0) rake (>= 0.8.7) -GIT - remote: https://github.com/gitlabhq/raphael-rails.git - revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 - specs: - raphael-rails (2.1.0) - GEM remote: https://rubygems.org/ specs: @@ -380,6 +374,7 @@ GEM thor (>= 0.14.6, < 2.0) raindrops (0.11.0) rake (10.1.0) + raphael-rails (2.1.2) rb-fsevent (0.9.3) rb-inotify (0.9.0) ffi (>= 0.5.0) @@ -611,7 +606,7 @@ DEPENDENCIES rails (= 3.2.13) rails-dev-tweaks rails_best_practices - raphael-rails! + raphael-rails (~> 2.1.2) rb-fsevent rb-inotify redcarpet (~> 2.2.2) diff --git a/db/schema.rb b/db/schema.rb index 5020230d831..654f2b1e8f7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -144,8 +144,8 @@ ActiveRecord::Schema.define(:version => 20130821090531) do t.text "note" t.string "noteable_type" t.integer "author_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.string "attachment" t.string "line_code" |