Commit Graph

492 Commits

Author SHA1 Message Date
Timm
c94e24fbe7 Added Loofah as a dependency in actionview.gemspec.
Implemented ActionView: FullSanitizer, LinkSanitizer and WhiteListSanitizer in sanitizers.rb.
Deprecated protocol_separator and bad_tags.
Added new tests in sanitizers_test.rb and reimplemented assert_dom_equal with Loofah.
2014-06-11 17:53:28 +02:00
Benjamin Fleischer
2af26960a8 Mail 2.6.1 silences excessive warnings; remove Gemfile hack
Completes https://github.com/rails/rails/pull/15493

Revert "For our build, stick with mail 2.5.x for now"

This reverts commit b8f586a094c104006d29a87fee0d8b48d0af2d14.
2014-06-08 10:08:41 -05:00
Matthew Draper
b8f586a094 For our build, stick with mail 2.5.x for now
2.6 currently has many warnings, which are failing the Travis build.
2014-06-05 03:32:42 +09:30
Jarmo Isotalo
adffea62b5 Upgraded rack
As Rack has some non backwards compatible changes added required
modifications to keep behaviour in rails close to same as before.

Also modified generators to include rack/rack for not yet released
version of rack
2014-05-19 00:03:08 +03:00
Dan Kang
f369bcf9a0 Default config.assets.digests to true in development 2014-05-17 23:01:22 -04:00
Guillermo Iguaran
8c48cd2206 Our test suite isn't ready to run in random order yet 😢 2014-05-16 11:18:38 -05:00
Yves Senn
0068dccfdc flexible ruby-oci8 version specification. [Gaurav Sharma]
Follow up to #15109.

/cc @Gaurav2728
2014-05-15 12:14:43 +02:00
Yves Senn
77a3cc4838 update ruby-oci8 version specification. Closes #15109. [ci skip]
/cc @yahonda
2014-05-15 12:11:41 +02:00
Rafael Mendonça França
1560370c3c Merge pull request #15108 from arthurnn/i18n_master
Use i18n master to run tests
2014-05-14 15:04:27 -03:00
Robin Dupret
ad3628b311 Update Redcarpet to 3.1.2
This version fixes an API breakage between 3.0 and 3.1 ; the header
method's arity should not have changed.

[ci skip]
2014-05-14 19:52:47 +02:00
Arthur Neves
b1d52a7409
Use i18n master to run tests 2014-05-13 13:19:53 -04:00
Nate Berkopec
220528548b Guides: output valid HTML5
[ci skip]
2014-05-05 17:42:04 -04:00
Carlos Antonio da Silva
882891653b Add branch to arel on Gemfile to allow local bundle config [ci skip] 2014-05-02 21:03:11 -03:00
Aaron Patterson
57ee6b0df9 oops! Fix Gemfile. 💣 2014-04-09 16:21:37 -07:00
Aaron Patterson
70bd5eb4bb fix bind collecting for mysql 2014-04-09 15:20:56 -07:00
Aaron Patterson
db5e578b64 Merge branch 'master' into adequaterecord
* master: (26 commits)
  Avoid URI parsing
  Add missing require so requiring `active_support/cache` works again.
  depend_on_asset is not required anymore on sprockets-rails 2.1.2
  upgrading section for 4.1 is no longer WIP. [ci skip]
  Expand explanation of how to set secrets.yml. [ci skip]
  Guides: minor typo fixed [ci skip]
  Fixed problem where `1.day.eql?(1.day)` is false
  new CHANGELOGs entries are in the top [ci skip]
  Updates the maintenance policy with new Rails versions
  Dont abbreviate that which needs no abbreviation
  Dont encourage aliases now that we have variants
  Use short-form for the scaffold render calls and drop the needless test
  Drop in @jeremy's new database.yml template text
  Don't deprecate after all
  Less ambition, more deprecation
  Ensure we correctly and immediately load all ENV entries
  Give a deprecation message even when the lookup fails
  Rearrange the config merger some more
  entry is always a Hash
  Check env_url only once
  ...

Conflicts:
	Gemfile
2014-04-09 11:03:10 -07:00
Aaron Patterson
3321d1a2d1 working against arel/collector branch 2014-04-09 10:56:42 -07:00
Rafael Mendonça França
b053a47b3e depend_on_asset is not required anymore on sprockets-rails 2.1.2 2014-04-09 14:07:31 -03:00
Rafael Mendonça França
f79881e2ad sprockets-rails was released 2014-04-04 19:47:40 -03:00
Rafael Mendonça França
a338b39f75 Make possible to use sprockets-rails 2.1 2014-04-04 16:25:46 -03:00
Aaron Patterson
bf3ddfa28d Merge branch 'master' into adequaterecord
* master: (55 commits)
  [ci skip] Move association class method notes
  extract common code in `uuid_test.rb`.
  move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.
  [ci skip] remove guide section on models in migrations
  test case for custom PostgreSQL enum type.
  Remove inclusion of rubysl gem for rbx on generated Gemfile
  let `insert_record` actuall save the object.
  [skip ci] Fix test name typo in app generator tests.
  travis s/2.1.0/2.1.1
  Bump version of bcrypt gem
  Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns
  Optimize getting started guide images, and use png instead of jpg
  ✂️ [ci skip]
  Point master changelogs to 4-1-stable branch
  Add missing parantheses in index_exists?
  `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.
  [skip ci] Standardized punctuation.
  [skip ci] Fix typo in link_to :method option description
  refactor, with_locale is not needed because I18n is mocked.
  Fix ActionView label translation for more than 10 nested elements
  ...
2014-02-26 10:14:40 -08:00
T.J. Schuck
53f1ab523b Bump version of bcrypt gem 2014-02-25 09:52:32 -05:00
Aaron Patterson
fe42effb11 Merge branch 'master' into adequaterecord
* master: (311 commits)
  Add a missing changelog entry for #13981 and #14035
  Revert "Fixed plugin_generator test"
  implements new option :month_format_string for date select helpers [Closes #13618]
  add factory methods for empty alias trackers
  guarantee a list in the alias tracker so we can remove a conditional
  stop exposing table_joins
  make most parameters to the AliasTracker required
  make a singleton for AssociationScope
  pass the association and connection to the scope method
  pass the tracker down the stack and construct it in the scope method
  clean up add_constraints signature
  remove the reflection delegate
  remove klass delegator
  remove railties changes. fixes #14054
  remove chain delegate
  remove scope_chain delegate
  Add verb to sanitization note
  fix path shown in mailer's templates
  updated Travis build status image url
  fix guide active_support_core_extensions. add Note to String#indent [ci skip]
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency.rb
	activerecord/test/cases/associations/association_scope_test.rb
2014-02-17 11:21:18 -08:00
Erik Michaels-Ober
af66c4697c Update Travis settings for Rubinius
/cc @brixen
2014-02-12 12:55:47 +01:00
Uday Kadaboina
c71e96b901 Upgraded jquery-rails gem version 2014-02-03 19:49:59 -05:00
Aaron Patterson
7fff71b357 use edge arel 2014-01-15 11:20:28 -08:00
Xavier Noria
6049249c6c upgrade SDoc
Kudos to @zzak for taking over SDoc and make it work with RDoc 4.
2014-01-12 22:18:44 +01:00
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
José Valim
67302727a9 Remove rack-test git dependency
The dependency was introduced in this commit:

002713c64568114f3754799acc0723ea0d442f7a

which has been released a long time ago
2013-02-25 12:23:48 -07:00
Carlos Antonio da Silva
fb3996f89d Depend on thor >= 0.17.0 2013-01-23 23:08:28 -02:00
Sherwin Wu
90995bab7d Updated version of jQuery rails in gemfile 2013-01-19 10:43:44 -08:00
Rafael Mendonça França
da97bfeb6e Use thor master to make rails work with Ruby 2.0 2013-01-11 02:40:01 -02:00
Rafael Mendonça França
12283dfa95 thread_safe is a dependency of active_support 2013-01-11 02:40:01 -02:00
Rafael Mendonça França
73a6a71add Revert "Do not install debugger in the pathlevel 362"
This reverts commit 9c18b6a818801a77a90c2768e436e4690537a3ab.
2012-12-31 14:55:59 -03:00
Rafael Mendonça França
9c18b6a818 Do not install debugger in the pathlevel 362 2012-12-31 14:40:43 -03:00
Guillermo Iguaran
1304298bd9 Revert "Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack master"
This reverts commit fba97c9620e709f0449ea9f3240b9e5174f72e1e.
2012-12-30 16:07:09 -05:00
Santiago Pastorino
fba97c9620 Rails 4.0 is going to depend on Rack 1.5.x so let's test against Rack master 2012-12-29 19:04:42 -02:00
Xavier Noria
7b5d466faf adds kindlerb to the :doc bundle group for guides generation 2012-12-22 22:43:10 +01:00
Andrew White
56fee39c39 Integrate Journey into Action Dispatch
Move the Journey code underneath the ActionDispatch namespace so
that we don't pollute the global namespace with names that may
be used for models.

Fixes rails/journey#49.
2012-12-19 22:13:08 +00:00
thedarkone
45448a5788 Replace some global Hash usages with the new thread safe cache.
Summary of the changes:
 * Add thread_safe gem.
 * Use thread safe cache for digestor caching.
 * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation.
 * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache.
 * Use TS::Cache to avoid the synchronisation overhead on listener retrieval.
 * Replace synchronisation with TS::Cache usage.
 * Use a preallocated array for performance/memory reasons.
 * Update the controllers cache to the new AS::Dependencies::ClassCache API.
   The original @controllers cache no longer makes much sense after @tenderlove's
   changes in 7b6bfe84f3 and f345e2380c.
 * Use TS::Cache in the connection pool to avoid locking overhead.
 * Use TS::Cache in ConnectionHandler.
2012-12-14 12:18:47 +01:00
Rafael Mendonça França
5b9c9026c4 Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"
This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing
changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0.

Reason:

https://github.com/rails/rails/pull/4684#commitcomment-920313
2012-11-27 14:59:58 -02:00
Akira Matsuda
4ed645b37e default source in Gemfiles to :rubygems rather than hardcoding the URL
* I guess this would be the preferrable default for Bundler
* current version of Bundler converts :rubygems into 'http://rubygems.org', not https://,
  and that will help those who are working on a very poor network environment that doesn't allow SSL
2012-11-28 01:15:02 +09:00
Carlos Antonio da Silva
af43e719ac Bump mysql gem version to the newly 2.9.0, fix build. 2012-11-17 22:50:58 -02:00
Santiago Pastorino
154fee2727 Revert "Debugger gem doesn't work with patchlevel >= 327"
This reverts commit 0ecd4640664c4723323d6fff5760dc4d833d7eb9.
2012-11-16 22:06:04 -02:00
Yasuo Honda
9c8252217e Revert "mysql does not build on Ruby 2.0.0 at the moment"
This reverts commit 8d8fd13179cacd86f307e87396474bdfab9f3462.

mysql 2.8.1 gem can be built on ruby 2.0.0-preview1.
2012-11-17 07:03:08 +09:00
Vijay Dev
5d239ac0ed Remove old comments about using our own sdoc fork [ci skip] 2012-11-17 02:00:43 +05:30
Carlos Antonio da Silva
c940aa6ed5 Use new mocha version and add changelog entry for #8180 2012-11-13 08:57:04 -02:00
Xavier Noria
5287d3678d depend on voloko/sdoc again
voloko/sdoc seems to be maintained again, in particular
the issues that made us fork it are resolved.
2012-11-12 22:51:59 +01:00
Santiago Pastorino
0ecd464066 Debugger gem doesn't work with patchlevel < 327 2012-11-12 13:13:27 -02:00
Carlos Antonio da Silva
a911d74a54 Update mocha github repo to new one 2012-11-06 01:07:38 -02:00
Jeremy Kemper
fc15139824 mocha_standalone is now deprecated. Switch to mocha/api. 2012-11-05 18:31:21 -07:00
Santiago Pastorino
e0fb16b92a Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now."
This reverts commit 7b290ad13c294005db062e746f8b79c8a192e4fa.
debugger gem is now working ok with p286
2012-10-30 16:42:51 -02:00
Carlos Antonio da Silva
a698175dfc Merge pull request #8047 from arunagw/json_only_in_18
Removing JSON for other ruby
2012-10-28 17:54:58 -02:00
Vinny Diehl
cadff7b73d Update redcarpet dependency
"~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the
Gemfile to the 1.9 syntax.
2012-10-25 21:50:55 -04:00
Joshua Peek
d88b65f986 Change back to official sprockets-rails 2012-10-17 21:51:37 -05:00
Rafael Mendonça França
f4c6ecc17c Merge pull request #7964 from josh/josh-sprockets-rails
Switch to new sprockets-rails plugin
2012-10-17 19:17:49 -07:00
Carlos Antonio da Silva
12a0383908 Merge pull request #7963 from arunagw/redcarpet_not_for_jruby
Add :platform to redcarpet gem, pointing to :ruby only.
2012-10-16 04:27:14 -07:00
Arun Agrawal
ea14e7624e redcarpet gem will not work with JRuby! 2012-10-16 16:42:14 +05:30
Joshua Peek
b8c7e31a57 Switch to new sprockets-rails plugin 2012-10-15 18:22:12 -05:00
Jeremy Kemper
46dc6e7786 ruby-prof isn't compatible with ruby trunk after 36925 2012-10-15 06:32:16 -07:00
Jeremy Kemper
7b290ad13c The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now. 2012-10-14 10:03:17 -07:00
Lee Reilly
7891cbf4c0 Replace double quotes with single quotes 2012-10-13 11:22:51 -07:00
Jeremy Kemper
1188fb1ecc Upgrade to a jquery-rails that doesn't expect config.action_view.javascript_expansions to exist 2012-10-10 14:47:20 -07:00
Rafael Mendonça França
5c078368c7 Fix the coffee-rails dependecy version 2012-10-05 10:35:03 -03:00
Rafael Mendonça França
f82244786e Add turbolinks as development dependency 2012-10-04 18:16:56 -03:00
Guillermo Iguaran
cbd26a803b Use Rack::Cache middleware only if is in Gemfile 2012-10-01 21:38:52 -05:00
Aaron Patterson
b59faa7f40 Revert "Use plaform mri_19 for debugger gem"
This reverts commit 2233f1456f6fb1b92e6c1bded70b89a3302c4306.
2012-09-25 15:18:48 -07:00
Santiago Pastorino
2233f1456f Use plaform mri_19 for debugger gem 2012-09-25 16:57:05 -03:00
Santiago Pastorino
b7918cce04 Use debugger gem if we are not Travis and Ruby < 2.0 2012-09-21 19:59:13 -03:00
Santiago Pastorino
44fa92129f Add debugger to mri:test section of the Gemfile 2012-09-21 19:45:55 -03:00
Rafael Mendonça França
3034489500 Remove the environment variables in the Gemfile
If you want to set a local path for the gems you can use the local git
repositories feature from the Bundler 1.2.

For example to set the local arel repository:

    bundle config local.arel ~/Work/git/arel

To unset it:

    bundle config --delete local.arel

Bundler will check if the branch of you local repository is the same
that specified in the Gemfile. If you want to disable these branch
checks you can override it by setting this option:

    bundle config disable_local_branch_check true

See more about this feature at http://gembundler.com/v1.2/git.html#local
2012-09-20 14:13:24 -03:00
Guillermo Iguaran
25d2b17a99 Allow to use a local copy of sprockets-rails during development 2012-09-19 18:02:37 -05:00
Dmitry Vorotilin
bbcb6257ee Since in sprockets-rails uglifier's version doesn't matter do the same in rails 2012-09-19 12:15:18 +04:00
Dmitry Vorotilin
d29283a268 Use last version of sprockets-rails and syncing tests for assets. 2012-09-19 12:15:18 +04:00
Prem Sichanugrist
5e2866cc34 No more Textile guide generation support 2012-09-17 15:55:17 -04:00
Prem Sichanugrist
544f6bcb90 Start rewriting 4.0 release note into Markdown 2012-09-17 15:54:21 -04:00
Guillermo Iguaran
032da37019 Use dalli 2.2.1 or prior to fix failing tests in memcache session store 2012-09-06 18:26:15 -05:00
Aaron Patterson
8d8fd13179 mysql does not build on Ruby 2.0.0 at the moment 2012-08-23 15:07:55 -07:00
Guillermo Iguaran
82663306f4 Replace deprecated memcache-client gem with dalli in ActiveSupport::Cache::MemCacheStore
memcache-client was deprecated in favour of dalli in 2010.
2012-08-17 22:22:55 -05:00
Jon Leighton
1411fc1986 Use benchmark/ips to measure AR performance
This means we can more easily compare numbers, and we don't have to
specify a single N for all reports, which previously meant that some
tests were running many more/fewer iterations than necessary.
2012-08-17 11:41:50 +01:00
Jon Leighton
17bb324f38 Renaming active_record_deprecated_finders to activerecord-deprecated_finders
For consistency with the other AR extension plugins we are creating.
2012-08-17 10:21:52 +01:00
Jon Leighton
4b4a85515b support relations created with a table alias 2012-07-13 11:44:45 +01:00
Aaron Patterson
6f74d36c42 activesupport gem dependencies should reflect the versions we actually use 2012-07-04 11:16:21 -07:00
Aaron Patterson
089da2e54d hook mocha in through m/t before_setup, after_teardown hooks 2012-07-03 14:28:28 -07:00
Santiago Pastorino
4903577b42 Bump minitest to 3.2.0 2012-06-28 09:36:21 -03:00
Santiago Pastorino
81d5d2730d Bump minitest to 3.1.0 2012-06-20 11:07:20 -03:00
Jeremy Kemper
709e432d1b Rake is in 1.9 stdlib, no need for gem dep 2012-05-31 10:01:59 -07:00
Aaron Patterson
476ef2df74 port some mocha to minitest/mock 2012-05-18 10:23:26 -07:00
Rafael Mendonça França
379b1107d3 Merge pull request #6343 from oscardelben/bump_sqlite3
Bump sqlite3 gem
2012-05-15 20:28:47 -07:00
Oscar Del Ben
2fac9156bf Bumo sqlite3 gem 2012-05-15 20:25:30 -07:00
Arun Agrawal
91c26e8e86 Fixed ruby-prof changes and let's use latest ruby-prof now. 2012-05-13 21:08:46 +05:30
Arun Agrawal
9250e24db3 Locking ruby-prof for now.
Need to investigate why build is failing because of 
ruby-prof.
2012-05-07 17:47:24 +05:30
Piotr Sarnacki
17f2958d85 Use :github option in Gemfile and make hashes consistent 2012-05-01 15:24:50 -07:00
Arun Agrawal
42b8bd5969 Upgrading mocha 0.11.2 2012-04-24 16:05:08 +05:30
Jon Leighton
dd2c9b9578 add active_record_deprecated_finders as a dep 2012-04-12 15:01:43 +01:00
Aaron Patterson
2e8129e87a Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0
sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
2012-03-26 12:03:37 -07:00
Guillermo Iguaran
dd74da7afc sprockets-rails 1.0.0 was released, remove git dependency from Gemfile 2012-03-26 13:49:52 -05:00
Luke Gruber
d80fcc9949 switch rack-test in Gemfile to using git protocol
can't run tests if git not compiled with libcurl
2012-03-16 21:48:25 -04:00
Guillermo Iguaran
78eed21576 Add sprockets-rails to rails project Gemfile 2012-03-13 18:00:31 -05:00
David Lee
002713c645 Add config.default_method_for_update to support PATCH
PATCH is the correct HTML verb to map to the #update action. The
semantics for PATCH allows for partial updates, whereas PUT requires a
complete replacement.

Changes:
* adds config.default_method_for_update you can set to :patch
* optionally use PATCH instead of PUT in resource routes and forms
* adds the #patch verb to routes to detect PATCH requests
* adds #patch? to Request
* changes documentation and comments to indicate support for PATCH

This change maintains complete backwards compatibility by keeping :put
as the default for config.default_method_for_update.
2012-02-22 08:47:10 -08:00
Sergey Nartimov
c075ca4600 use rack 1.4.1 2012-01-23 10:23:02 +03:00
Sergey Nartimov
23cb3d2f09 use rack from master branch
it's needed until new rack release with Rack::BodyProxy fixes
b06ef82876
2012-01-16 14:42:23 +03:00
Manu J
6248a20fed Remove MRI 1.8 specific gems 2012-01-13 22:43:31 +05:30
Bogdan Gusiev
c4ceee8316 Fixed path to local gemfile. 2012-01-02 15:08:37 +02:00
Aaron Patterson
d6d774063d switch to git journey 2011-12-21 13:56:20 -07:00
Arun Agrawal
ec26dd007a No need to check here now for < 1.9.3 2011-12-21 00:47:48 +05:30
Xavier Noria
dbfc6b8b3a removes Ruby constraint in RedCloth dependency 2011-12-15 15:22:14 -08:00
Aaron Patterson
b6105b0b59 updating arel and journey dependencies 2011-12-14 13:26:49 -08:00
Xavier Noria
800252ca71 let sdoc say which version of rdoc we depend on 2011-12-14 22:23:17 +01:00
Erik Michaels-Ober
3ffa01c426 Make quotes in Gemfile consistent (use single quotes) 2011-12-12 08:16:54 -08:00
Erik Michaels-Ober
efc74f5638 Use HTTPS rubygems source 2011-12-12 08:16:38 -08:00
José Valim
0008918059 Remove rb-fsevent from Gemfile. 2011-12-08 16:39:06 +01:00
Xavier Noria
4936fc35a0 use our own fork of sdoc while Vijay's fix is not applied to voloko/sdoc 2011-12-08 04:57:09 -08:00
Arun Agrawal
ac4763f5c0 SQlite3 Bump 2011-12-04 10:27:44 +05:30
Jon Leighton
3f23c049c2 Enable postgres on the CI ❤️ 🍺 2011-12-03 20:09:43 +00:00
Arun Agrawal
13847ccb43 Bump Mysql2! 2011-11-22 18:47:27 +05:30
Aaron Patterson
a437986f43 allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development 2011-11-17 14:41:53 -08:00
Aaron Patterson
df5ec41b89 bundler treats trunk ruby as ruby 1.9, hack around that for now 2011-11-16 10:42:56 -08:00
Santiago Pastorino
df300a754b Allow to use ruby-debug in 1.9.3 2011-11-12 15:16:53 -02:00
Jon Leighton
562583c766 Add ActiveRecord::Relation#uniq for toggling DISTINCT in the SQL query 2011-11-05 16:22:18 +00:00
Arun Agrawal
c930170581 No need to check ruby version here
As rake 0.9.2.2 is out with the same 
fix as 0.9.3.beta having
2011-10-22 22:29:38 +05:30
Yasuo Honda
8cc70cf32a Fix typo in Rakefile 2011-10-03 11:56:11 -04:00
Yasuo Honda
b564ffcad4 To support ActiveRecord unit tests for IBM DB2 2011-10-02 22:51:01 -04:00
Terence Lee
1de89e5e07 AR wants sqlite3 1.3.4 2011-09-22 20:01:57 +02:00
Arun Agrawal
b2bf725d79 Bump AR-JDBC version.
THis version is compatible with 3.1 and above
2011-09-17 18:39:30 +05:30
Aaron Patterson
5f0b37c486 Switching rack-mount to journey. 2011-09-12 16:50:47 -07:00
Arun Agrawal
5e35d62cf5 Uglifier bump 2011-09-05 15:07:45 +05:30
Guillermo Iguaran
6779064437 Remove hard dependency on bcrypt. 2011-09-02 10:01:47 -07:00
Xavier Noria
827a0fee07 use sdoc to generate the API 2011-08-27 03:55:01 -07:00
Santiago Pastorino
43e581ef7f Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 2011-08-06 09:16:17 -03:00
Santiago Pastorino
8962e96e39 This dep is already defined in activerecord.gemspec 2011-08-03 18:15:14 -03:00
Mitesh Jain
fe37b48f28 Bringing back the jquery-rails. One test is dependent. 2011-07-24 19:18:49 +05:30
Santiago Pastorino
410e75419d Remove unused gems from Gemfile 2011-07-23 18:38:42 -03:00
zhengjia
74eb8486da remove ruby-prof for rubinius in Gemfile 2011-07-22 07:55:48 -05:00
Josh Kalderimis
d664eba5b4 Added a .travis.yml config and travis specific ci script.
Don't install ruby-debug if running the test suite on Travis,
linecache19 is the main offender, very very slow.

And do not install pg if Travis is bundling the gems, pg will be setup
on Travis soon.
2011-07-15 10:47:50 +02:00
José Valim
2a24bcc6cf Don't raise on mass assignment for test 2011-07-07 18:58:04 -03:00
José Valim
2f6e3895a8 Make compressors lazily load. 2011-07-06 21:41:13 -03:00
Vijay Dev
8b25b55755 add w3c_validators gem to the doc group to fix failing validation of guides 2011-07-04 17:12:25 +05:30
Guillermo Iguaran
1c23887ab0 Bump ARel to 2.1.3 2011-06-27 15:58:40 -05:00
Guillermo Iguaran
d759d19507 Use uglifier from rubygems instead of git repo 2011-06-21 10:59:48 -05:00
Arun Agrawal
41aba82673 Removing require_relative gem. Linecache new version 0.46 is out and it's loading rbx-require-relative > 0.0.4 2011-06-19 15:05:38 +05:30
Guillermo Iguaran
301cad4476 Bump to mysql2 0.3.6 2011-06-17 11:27:37 -05:00
Alexey Gaziev
171491b1eb Change version of nokogiri gem 2011-06-17 01:01:49 +04:00
Arun Agrawal
536e1566b6 Bump mysql2 to 0.3.5 2011-06-16 10:45:58 +05:30
Santiago Pastorino and José Ignacio Costa
e445a79562 Bump mysql2 up 2011-06-16 01:05:45 -03:00
Jon Leighton
954359b9c2 Add Gemfile dependency for require_relative on mri18. This is a dependency of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream. 2011-06-13 22:18:31 +01:00
Santiago Pastorino
f2f63bf2ff ruby-prof doesn't work in 1.9.3 2011-06-08 00:25:57 -03:00
Daniel Schierbeck
ef8c2a89a5 Also use double quotes for #source 2011-05-24 13:29:29 -07:00
Daniel Schierbeck
962936c56b Use quotes consistently in Gemfile 2011-05-24 13:27:43 -07:00
José Valim
5eadb4d73d Temporarily ship with ContentLength middleware. 2011-05-20 22:20:51 +02:00
José Valim
6d3122445c Ensure Set-Cookie is not set on assets. 2011-05-17 17:44:06 -04:00