diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-14 15:14:01 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-14 15:14:01 +0000 |
| commit | 8a26ce6a75e308a6d5a034f8c33925ae509185c3 (patch) | |
| tree | a5759727f01d2e1deb0b65285a7628a0be5fc361 | |
| parent | b956621b013b75d51a00da39993b1fe463291d57 (diff) | |
| download | redmine-8a26ce6a75e308a6d5a034f8c33925ae509185c3.tar.gz redmine-8a26ce6a75e308a6d5a034f8c33925ae509185c3.zip | |
Merged r14078.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14096 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -14,6 +14,9 @@ gem "protected_attributes" gem "actionpack-action_caching" gem "actionpack-xml_parser" +# building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414 +gem "ffi", "1.9.6" + # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby] gem "rbpdf", "~> 1.18.5" |