Commit Graph

315 Commits

Author SHA1 Message Date
José Valim
d2ed433b0a Only build a ConnectionSpecification if required 2013-12-24 10:02:07 +01:00
Rafael Mendonça França
18be17ac43 Use the released arel gem 2013-12-05 00:28:57 -02:00
Godfrey Chan
1a09ceeea8 Dropped yajl from Gemfile 2013-11-26 22:12:06 -08:00
Carlos Antonio da Silva
42c28544e1 Add branch to arel in Gemfile so that we can use local repos [ci skip] 2013-11-26 13:58:55 -02:00
Federico Ravasio
5541cdcf88 Properly fix Rubinius dependencies in Gemfile & Travis integration.
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.
2013-11-24 14:38:18 +01:00
Yves Senn
a6f58a535e use arel master and update activerecord to depend on arel 5.0.0.
This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5.

> The `master` branch should use the `master` branch.
2013-11-19 15:34:20 +01:00
Yves Senn
3053fee954 use 4-0-stable arel branch to get bundle working again.
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'
```
2013-11-19 14:25:37 +01:00
Carlos Antonio da Silva
11673a7977 Set branch for arel in Gemfile so that we can use bundle local config [ci skip] 2013-11-14 23:21:56 -02:00
Arun Agrawal
c10a78124c More Warnings removed for ruby trunk
Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
2013-11-01 13:47:23 +01:00
Federico Ravasio
ae27dd6aff Added rubysl-rexml to Rubinius deps. 2013-11-01 11:25:10 +01:00
Federico Ravasio
6bb56b2c19 Added Rubinius 2 specific dependencies. 2013-10-31 21:21:48 +01:00
Rafael Mendonça França
1428131f64 Merge pull request #12107 from kares/master
allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`)
2013-10-31 10:05:02 -07:00
Rafael Mendonça França
dc8a20677d Try arel master
Conflicts:
	Gemfile
2013-10-22 20:02:48 -02:00
T.J. Schuck
4a99e10199 bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows 2013-09-23 14:28:26 -04:00
kares
0a4683055d allow to test AR master against AR-JDBC master (with ENV['AR_JDBC']) 2013-09-03 08:33:00 +02:00
Kassio Borges
160e0786a3 upgrade jruby dependencies 2013-08-31 12:54:37 -03:00
Rafael Mendonça França
3ec6cc70f3 Fix the indentation ✂️ 2013-08-20 15:33:34 -03:00
Gaurish Sharma
53d682b132 Upgrade ActiveRecord-JDBC-Adapter to master branch
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.
2013-08-12 09:39:46 +05:30
Josef Šimánek
d97269dac7 Use latest mysql2.
Fixes #11457
2013-07-18 00:43:55 +02:00
Burkhard Vogel-Kreykenbohm
ad62cf68f8 bcrypt-ruby stable is 3.1 2013-07-17 16:39:07 +02:00
Guillermo Iguaran
8df284a0e9 Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check #11457 for details 2013-07-16 02:27:13 -05:00
Arun Agrawal
f50459000a 'json' gem is no more required under JRuby 2013-06-15 13:05:07 +02:00
Prathamesh Sonpatki
2b66b32a4c Don't autorequire mocha to avoid deprecation warnings
- 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.
2013-05-18 13:29:43 +05:30
Ryan Davis
632f215da0 Mocha 0.14.0 was released with MT5 support. Switch back to gem 2013-05-16 15:51:35 -07:00
Aaron Patterson
9fef7c8dc9 Merge pull request #10527 from zenspider/squishy_minitest5
Squishy minitest5
2013-05-16 13:41:54 -07:00
Joe Kutner
430e5dce42 Removed jruby-openssl gem from default template Gemfile 2013-05-10 13:04:40 -05:00
Ryan Davis
0809c09c34 tweak dependencies 2013-05-08 16:44:05 -07:00
Rafael Mendonça França
ee686d3ca6 Use the same uglifier version that the generated applications 2013-04-18 14:21:28 -03:00
Rafael Mendonça França
fe495c9488 Use latest coffee-rails release 2013-04-18 14:21:28 -03:00
Rafael Mendonça França
16b4c3f1fa Forgot to lock the uglifier version in our Gemfile
Related with 575838795019f7402992e3bfa83a0c5048cf143d
2013-04-06 15:31:30 -03:00
Santiago Pastorino
299ddbd83c Use released sdoc 2013-04-02 10:28:47 -03:00
Santiago Pastorino
3b6f61175f Revert "Use jquery-rails from github (fix Gem::Version error)"
This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.
2013-04-01 23:59:52 -03:00
Guillermo Iguaran
d98ab530cb Use last released version of thor 2013-03-30 11:47:26 -05:00
Rafael Mendonça França
22caf3983f Use thor master since 0.18.0 has a regression
See
08265a380d
for the discussion and https://github.com/wycats/thor/pull/316 for the
fix
2013-03-27 10:50:41 -03:00
Guillermo Iguaran
6f3f0f8633 Use jquery-rails from github (fix Gem::Version error) 2013-03-23 23:52:37 -05:00
Aaron Patterson
ab379b5025 oops! 2013-03-14 22:49:22 -07:00
Aaron Patterson
8d3e5c8c52 hide more data in the schema cache 2013-03-14 22:45:46 -07:00
Santiago Pastorino
5da8c1627c There's no need to install test group in travis 2013-03-11 15:51:24 -03:00
Santiago Pastorino
4076288a83 Move benchmark-ips to test group 2013-03-11 15:51:24 -03:00
Santiago Pastorino
de1354f0ba Use platforms instead of conditionals in Gemfile 2013-03-11 15:51:23 -03:00
Aaron Patterson
b98efa2652 debugger does not work on trunk 2013-03-11 11:10:33 -07:00
Carlos Antonio da Silva
de28157468 Merge pull request #9609 from arunagw/using-latest-arjdbc
Using latest AR-JDBC for JRuby
2013-03-08 09:43:10 -03:00
Santiago Pastorino
b956771e82 debugger 1.4.0 works in Ruby 2.0 2013-03-06 18:26:04 -02:00
Francesco Rodriguez
066ae49fb7 JRuby does not support racc, include it only in ruby platform 2013-02-26 00:10:03 -05:00
Rafael Mendonça França
bd36f185a8 Are was release 2013-02-25 18:44:19 -03:00
Guillermo Iguaran
94bebde8a7 Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile 2013-02-25 16:40:35 -05:00
Guillermo Iguaran
e75ce25f39 sprockets 2.0.0.rc3 is in rails gemspec already 2013-02-25 14:45:56 -05:00
José Valim
612ebbcbb2 ar-deprecated_finders is already in the gemspec 2013-02-25 12:35:20 -07:00
Rafael Mendonça França
efabcb4cb4 I released 0.0.3 some time ago 2013-02-25 16:29:20 -03:00
Rafael Mendonça França
cf863ce27c jquery-rails 2.2.1 was released 2013-02-25 16:27:25 -03:00