Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add branch to arel in Gemfile so that we can use local repos [ci skip] | Carlos Antonio da Silva | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Properly fix Rubinius dependencies in Gemfile & Travis integration. | Federico Ravasio | 2013-11-24 | 1 | -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 Senn | 2013-11-19 | 1 | -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 Senn | 2013-11-19 | 1 | -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 Silva | 2013-11-14 | 1 | -1/+1 |
| | |||||
* | More Warnings removed for ruby trunk | Arun Agrawal | 2013-11-01 | 1 | -1/+1 |
| | | | | Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb | ||||
* | Added rubysl-rexml to Rubinius deps. | Federico Ravasio | 2013-11-01 | 1 | -0/+1 |
| | |||||
* | Added Rubinius 2 specific dependencies. | Federico Ravasio | 2013-10-31 | 1 | -0/+6 |
| | |||||
* | Merge pull request #12107 from kares/master | Rafael Mendonça França | 2013-10-31 | 1 | -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']`) | kares | 2013-09-03 | 1 | -5/+12 |
| | | |||||
* | | Try arel master | Rafael Mendonça França | 2013-10-22 | 1 | -0/+1 |
| | | | | | | | | | | Conflicts: Gemfile | ||||
* | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows | T.J. Schuck | 2013-09-23 | 1 | -1/+1 |
|/ | |||||
* | upgrade jruby dependencies | Kassio Borges | 2013-08-31 | 1 | -6/+6 |
| | |||||
* | Fix the indentation :scissors: | Rafael Mendonça França | 2013-08-20 | 1 | -6/+6 |
| | |||||
* | Upgrade ActiveRecord-JDBC-Adapter to master branch | Gaurish Sharma | 2013-08-12 | 1 | -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ánek | 2013-07-18 | 1 | -3/+1 |
| | | | | Fixes #11457 | ||||
* | bcrypt-ruby stable is 3.1 | Burkhard Vogel-Kreykenbohm | 2013-07-17 | 1 | -1/+1 |
| | |||||
* | Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check ↵ | Guillermo Iguaran | 2013-07-16 | 1 | -1/+3 |
| | | | | #11457 for details | ||||
* | 'json' gem is no more required under JRuby | Arun Agrawal | 2013-06-15 | 1 | -1/+0 |
| | |||||
* | Don't autorequire mocha to avoid deprecation warnings | Prathamesh Sonpatki | 2013-05-18 | 1 | -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 gem | Ryan Davis | 2013-05-16 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10527 from zenspider/squishy_minitest5 | Aaron Patterson | 2013-05-16 | 1 | -1/+1 |
|\ | | | | | Squishy minitest5 | ||||
| * | tweak dependencies | Ryan Davis | 2013-05-08 | 1 | -1/+1 |
| | | |||||
* | | Removed jruby-openssl gem from default template Gemfile | Joe Kutner | 2013-05-10 | 1 | -5/+0 |
|/ | |||||
* | Use the same uglifier version that the generated applications | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 |
| | |||||
* | Use latest coffee-rails release | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 |
| | |||||
* | Forgot to lock the uglifier version in our Gemfile | Rafael Mendonça França | 2013-04-06 | 1 | -1/+1 |
| | | | | Related with 575838795019f7402992e3bfa83a0c5048cf143d | ||||
* | Use released sdoc | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
| | |||||
* | Revert "Use jquery-rails from github (fix Gem::Version error)" | Santiago Pastorino | 2013-04-01 | 1 | -1/+1 |
| | | | | This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980. | ||||
* | Use last released version of thor | Guillermo Iguaran | 2013-03-30 | 1 | -1/+0 |
| | |||||
* | Use thor master since 0.18.0 has a regression | Rafael Mendonça França | 2013-03-27 | 1 | -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 Iguaran | 2013-03-23 | 1 | -1/+1 |
| | |||||
* | oops! | Aaron Patterson | 2013-03-14 | 1 | -1/+0 |
| | |||||
* | hide more data in the schema cache | Aaron Patterson | 2013-03-14 | 1 | -0/+1 |
| | |||||
* | There's no need to install test group in travis | Santiago Pastorino | 2013-03-11 | 1 | -1/+1 |
| | |||||
* | Move benchmark-ips to test group | Santiago Pastorino | 2013-03-11 | 1 | -2/+2 |
| | |||||
* | Use platforms instead of conditionals in Gemfile | Santiago Pastorino | 2013-03-11 | 1 | -4/+7 |
| | |||||
* | debugger does not work on trunk | Aaron Patterson | 2013-03-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #9609 from arunagw/using-latest-arjdbc | Carlos Antonio da Silva | 2013-03-08 | 1 | -3/+3 |
| | | | | Using latest AR-JDBC for JRuby | ||||
* | debugger 1.4.0 works in Ruby 2.0 | Santiago Pastorino | 2013-03-06 | 1 | -1/+1 |
| | |||||
* | JRuby does not support racc, include it only in ruby platform | Francesco Rodriguez | 2013-02-26 | 1 | -3/+3 |
| | |||||
* | Are was release | Rafael Mendonça França | 2013-02-25 | 1 | -2/+0 |
| | |||||
* | Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile | Guillermo Iguaran | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | sprockets 2.0.0.rc3 is in rails gemspec already | Guillermo Iguaran | 2013-02-25 | 1 | -2/+0 |
| | |||||
* | ar-deprecated_finders is already in the gemspec | José Valim | 2013-02-25 | 1 | -2/+0 |
| | |||||
* | I released 0.0.3 some time ago | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | jquery-rails 2.2.1 was released | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | Remove rack-test git dependency | José Valim | 2013-02-25 | 1 | -1/+0 |
| | | | | | | | | The dependency was introduced in this commit: 002713c64568114f3754799acc0723ea0d442f7a which has been released a long time ago | ||||
* | Depend on thor >= 0.17.0 | Carlos Antonio da Silva | 2013-01-23 | 1 | -3/+0 |
| | |||||
* | Updated version of jQuery rails in gemfile | Sherwin Wu | 2013-01-19 | 1 | -1/+1 |
| |