aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Add branch to arel in Gemfile so that we can use local repos [ci skip]Carlos Antonio da Silva2013-11-261-1/+1
|
* Properly fix Rubinius dependencies in Gemfile & Travis integration.Federico Ravasio2013-11-241-4/+2
| | | | | | | | | | | | | | | Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even if not included in the Gemfile. Now it's 100% required to include the gem 'rubysl', otherwise the stdlib is not available entirely, breaking everything. Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing conflicts with Rails's dependency on minitest 5. That is not the case anymore since rubysl-test-unit 2.0.2, so it is completely safe to include it fully. When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2, thus picking new versions automatically.
* use arel `master` and update activerecord to depend on arel `5.0.0`.Yves Senn2013-11-191-1/+1
| | | | | | This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5. > The `master` branch should use the `master` branch.
* use `4-0-stable` arel branch to get bundle working again.Yves Senn2013-11-191-1/+1
| | | | | | | | | | | | | | | | this resolves the following error when running `bundle install` ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` The build is still broken with lots of: ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ```
* Set branch for arel in Gemfile so that we can use bundle local config [ci skip]Carlos Antonio da Silva2013-11-141-1/+1
|
* More Warnings removed for ruby trunkArun Agrawal2013-11-011-1/+1
| | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
* Added rubysl-rexml to Rubinius deps.Federico Ravasio2013-11-011-0/+1
|
* Added Rubinius 2 specific dependencies.Federico Ravasio2013-10-311-0/+6
|
* Merge pull request #12107 from kares/masterRafael Mendonça França2013-10-311-5/+12
|\ | | | | allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
| * allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)kares2013-09-031-5/+12
| |
* | Try arel masterRafael Mendonça França2013-10-221-0/+1
| | | | | | | | | | Conflicts: Gemfile
* | bcrypt-ruby v3.1.2 supports Ruby 2.0 on WindowsT.J. Schuck2013-09-231-1/+1
|/
* upgrade jruby dependenciesKassio Borges2013-08-311-6/+6
|
* Fix the indentation :scissors:Rafael Mendonça França2013-08-201-6/+6
|
* Upgrade ActiveRecord-JDBC-Adapter to master branchGaurish Sharma2013-08-121-6/+7
| | | | | Switch to master branch which provides Version 1.3.x of AR-JDBC adapter. It strives to provide ActiveRecord 4.x compatibility (as well as still supporting 2.3 and 3.x) from a single code base. It's a recommended update for all AR-JDBC 1.2.x users.
* Use latest mysql2.Josef Šimánek2013-07-181-3/+1
| | | | Fixes #11457
* bcrypt-ruby stable is 3.1Burkhard Vogel-Kreykenbohm2013-07-171-1/+1
|
* Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check ↵Guillermo Iguaran2013-07-161-1/+3
| | | | #11457 for details
* 'json' gem is no more required under JRubyArun Agrawal2013-06-151-1/+0
|
* Don't autorequire mocha to avoid deprecation warningsPrathamesh Sonpatki2013-05-181-1/+5
| | | | | | | | | | - https://travis-ci.org/rails/rails/jobs/7264822 contains deprecated warnings given by Mocha version 0.14 - 632f215da added Mocha 0.14 to Gemfile - But with the version, require: false was removed - So Mocha started giving deprecation warnings - Acc.to Mocha documentation(https://github.com/freerange/mocha#bundler) it should not be auto required.
* Mocha 0.14.0 was released with MT5 support. Switch back to gemRyan Davis2013-05-161-1/+1
|
* Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-161-1/+1
|\ | | | | Squishy minitest5
| * tweak dependenciesRyan Davis2013-05-081-1/+1
| |
* | Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-101-5/+0
|/
* Use the same uglifier version that the generated applicationsRafael Mendonça França2013-04-181-1/+1
|
* Use latest coffee-rails releaseRafael Mendonça França2013-04-181-1/+1
|
* Forgot to lock the uglifier version in our GemfileRafael Mendonça França2013-04-061-1/+1
| | | | Related with 575838795019f7402992e3bfa83a0c5048cf143d
* Use released sdocSantiago Pastorino2013-04-021-1/+1
|
* Revert "Use jquery-rails from github (fix Gem::Version error)"Santiago Pastorino2013-04-011-1/+1
| | | | This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.
* Use last released version of thorGuillermo Iguaran2013-03-301-1/+0
|
* Use thor master since 0.18.0 has a regressionRafael Mendonça França2013-03-271-0/+1
| | | | | | | See https://github.com/wycats/thor/commit/08265a380d0ff3fce014e98e87bb8c2330858e4a for the discussion and https://github.com/wycats/thor/pull/316 for the fix
* Use jquery-rails from github (fix Gem::Version error)Guillermo Iguaran2013-03-231-1/+1
|
* oops!Aaron Patterson2013-03-141-1/+0
|
* hide more data in the schema cacheAaron Patterson2013-03-141-0/+1
|
* There's no need to install test group in travisSantiago Pastorino2013-03-111-1/+1
|
* Move benchmark-ips to test groupSantiago Pastorino2013-03-111-2/+2
|
* Use platforms instead of conditionals in GemfileSantiago Pastorino2013-03-111-4/+7
|
* debugger does not work on trunkAaron Patterson2013-03-111-1/+1
|
* Merge pull request #9609 from arunagw/using-latest-arjdbcCarlos Antonio da Silva2013-03-081-3/+3
| | | | Using latest AR-JDBC for JRuby
* debugger 1.4.0 works in Ruby 2.0Santiago Pastorino2013-03-061-1/+1
|
* JRuby does not support racc, include it only in ruby platformFrancesco Rodriguez2013-02-261-3/+3
|
* Are was releaseRafael Mendonça França2013-02-251-2/+0
|
* Bump sass-rails and coffee-rails to 4.0.0.beta1 in GemfileGuillermo Iguaran2013-02-251-1/+1
|
* sprockets 2.0.0.rc3 is in rails gemspec alreadyGuillermo Iguaran2013-02-251-2/+0
|
* ar-deprecated_finders is already in the gemspecJosé Valim2013-02-251-2/+0
|
* I released 0.0.3 some time agoRafael Mendonça França2013-02-251-1/+1
|
* jquery-rails 2.2.1 was releasedRafael Mendonça França2013-02-251-1/+1
|
* Remove rack-test git dependencyJosé Valim2013-02-251-1/+0
| | | | | | | | The dependency was introduced in this commit: 002713c64568114f3754799acc0723ea0d442f7a which has been released a long time ago
* Depend on thor >= 0.17.0Carlos Antonio da Silva2013-01-231-3/+0
|
* Updated version of jQuery rails in gemfileSherwin Wu2013-01-191-1/+1
|