diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-05-01 12:28:59 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2014-05-01 12:28:59 +0000 |
| commit | 8e50e4940b96642707a63413a320c97598183b9e (patch) | |
| tree | c21d3b9d9a5dd592301b671426a6c62b1b83973d | |
| parent | 11f5a159a7f2a274ab0d091641da4b4afe15ef2b (diff) | |
| download | redmine-8e50e4940b96642707a63413a320c97598183b9e.tar.gz redmine-8e50e4940b96642707a63413a320c97598183b9e.zip | |
Merged r13117 from trunk to 2.4-stable (#16685)
Gemfile: upgrade mocha version.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13119 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -79,7 +79,7 @@ end group :test do gem "shoulda", "~> 3.3.2" - gem "mocha", ">= 0.14", :require => 'mocha/api' + gem "mocha", "~> 1.0.0", :require => 'mocha/api' if RUBY_VERSION >= '1.9.3' gem "capybara", "~> 2.1.0" gem "selenium-webdriver" |