diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-05 23:17:50 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-05 23:17:50 +0200 |
| commit | 47dd9e42f79ba6190d344d1dbf0baa2c348f7239 (patch) | |
| tree | 2bc763f9854a1c55f33ed5345d7c83c5a5a929bb /Gemfile.lock | |
| parent | e142ebde5cb9600f25dd844030318c51dcadb54b (diff) | |
| parent | 47bb945caf22f422ba86a6a91a77bb24ffd01f29 (diff) | |
| download | gitlab-ce-47dd9e42f79ba6190d344d1dbf0baa2c348f7239.tar.gz | |
Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fe8af818830..0965974051e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,12 @@ GIT yajl-ruby (~> 1.1.0) GIT + remote: https://github.com/gitlabhq/raphael-rails.git + revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58 + specs: + raphael-rails (2.1.0) + +GIT remote: https://github.com/gitlabhq/resque.git revision: 9ef4700306dd946a3ac000612428967ce0c32213 ref: 9ef4700306dd946a3ac000612428967ce0c32213 @@ -355,7 +361,6 @@ GEM thor (>= 0.14.6, < 2.0) raindrops (0.10.0) rake (10.0.3) - raphael-rails (1.5.2) rb-fsevent (0.9.2) rb-inotify (0.8.8) ffi (>= 0.5.0) @@ -525,7 +530,7 @@ DEPENDENCIES rails (= 3.2.10) rails-dev-tweaks rails_best_practices - raphael-rails (= 1.5.2) + raphael-rails! rb-fsevent rb-inotify redcarpet (~> 2.2.2) |