mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
91,399 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

824 Commits

Author SHA1 Message Date
Yuji Yaginuma 83bfe07583 Use v3 of the AWS SDK 2017-09-09 23:22:10 -04:00
yuuji.yaginuma 75a921828c Do not install unused gem 
`qu-redis` is need for qu adapter test.
However, since 8ecc5ab, qu adapter test has not been executed,
it is unnecessary now.
 2017-09-08 08:00:30 +09:00
Matthew Draper bb7775736c Add stopgap_13632 workaround 
I'm not sure this is the problem we're seeing on Travis (occasional
unexpected IOError exceptions), but it's worth a try.
 2017-08-29 21:10:49 +09:30
Robin Dupret 6db4cf9beb Temporarily point to a fork of SDoc 
This fork brings:

* A tiny refresh of the default theme.
* SEO tags to class files.
* The removal of HTML tags from search results.
* Some general template clean-up (HTML 5, removal of the jQuery
  effect library, etc.).
* A speed up of the generation time (by ~30 seconds).
 2017-08-17 14:49:31 +02:00
Rafael Mendonça França d2f493c7ed Test with released thor 
thor 0.20.0 was released so we can test with the released version.
 2017-08-16 14:03:24 -04:00
Koichi ITO d17264d93f Use frozen string literal in root files 2017-08-13 22:14:24 +09:00
Koichi ITO 7f33b8afa2 Simplify `git_source` in Gemfile 
Follow up of 0b8441bd41
 2017-08-07 17:46:48 +09:00
dixpac 053e556df1 Depend on offical azure-core 
No need to depend on my fork anymore, they've just release fix
officially.
 2017-08-03 12:12:58 +02:00
Ryuta Kamizono 815d1abf39 Fix `Style/StringLiterals` violations for Active Storage 
```
% be rubocop -a --only Style/StringLiterals activestorage
Inspecting 74 files
........................................CCCCCCCCCC.C........CC.......C.C..

(snip)

74 files inspected, 31 offenses detected, 31 offenses corrected
```
 2017-08-03 03:13:11 +09:00
David Heinemeier Hansson c6974229d0 Merge branch 'master' into active-storage-import 2017-08-02 09:52:14 -05:00
Rafael Mendonça França feb1ddae02 Merge remote-tracking branch 'origin/master' into unlock-minitest 2017-08-01 17:34:14 -04:00
claudiob 98bb99ef61 Don't depend on HTTParty 
"httparty" is only added in #30020 to write two tests to make PUT requests
against S3 and GCS.

The same requests can be made with net/http, removing a dependency from the Gemfile.
 2017-08-01 10:56:39 -07:00
David Heinemeier Hansson 16d00247f3 Bring activestorage dependencies into the general Gemfile 2017-07-31 15:53:09 -05:00
David Rodríguez 0c2c32d3d6 Fix warnings in railties tests 
This warning has been fixed in sass-rails. This change picks up the fix.
 2017-07-24 12:55:08 +02:00
Kasper Timm Hansen 5c16dd35a2 Move back to @matthewd's close io fixed rb-inotify. 2017-07-19 19:45:42 +02:00
Burke Libbey 0312a5c67e
Add bootsnap to default Gemfile: 
Bootsnap precomputes load path resolution and caches ruby ISeq
and YAML parsing/compilation, reducing application boot time by
approximately 50% on supported configurations.
 2017-07-17 13:17:45 -04:00
Kasper Timm Hansen 0391bbc01b Bump minitest; Use double quotes 2017-07-15 21:19:13 +02:00
Kasper Timm Hansen aad42dce10 Merge branch 'master' into unlock-minitest 2017-07-15 21:17:27 +02:00
Rafael Mendonça França 44f3ecbe5f Test thor master 2017-07-07 15:16:39 -04:00
Matthew Draper 87b3e226d6 Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" 
This reverts commit 3420a14590, reversing
changes made to afb66a5a59.
 2017-07-02 02:15:17 +09:30
Kir Shatrov cfade1ec7e Enforce frozen string in Rubocop 2017-07-01 02:11:03 +03:00
Matthew Draper 67a579419b Merge pull request #29488 from utilum/update_gemfile 
Fixes FIXME: rb-inotify 0.99 has been released
 2017-06-18 05:23:53 +09:30
utilum 96d58433c9 Fixes FIXME: rb-inotify 0.99 has been released 2017-06-17 18:59:41 +02:00
Rafael Mendonça França 62d316c6d8
Merge branch 'master' into unlock-minitest 2017-06-02 12:24:31 -04:00
Rafael França eb804ad5a7 Merge pull request #29187 from robin850/remove-mathn 
Remove requirement on mathn
 2017-05-30 11:37:15 -04:00
Robin Dupret ba84867549 Remove requirement on mathn 
The test using mathn was first introduced in f1d9179 to check that the
`distance_of_time_in_words` properly doesn't use the `Fixnum#/` method
by explicitly requiring this library as it redefines this method.

Given that `mathn` has been gemified in Ruby 2.5 and is deprecated since
version 2.2, we can certainly safely assume that people will most-likely
not require this library in their application.

However, to make sure that we don't regress, let's add a test similar to
the one before f1d9179.
 2017-05-30 13:46:21 +02:00
Kasper Timm Hansen e1758b5e8c Merge branch 'master' into unlock-minitest 2017-05-29 20:37:35 +02:00
Matthew Draper d93cd4357b Switch to rb-inotify master 
https://github.com/guard/rb-inotify/pull/49 has been merged.
 2017-05-27 09:38:08 +09:30
bogdanvlviv 40bdbce191
Define path with __dir__ 
".. with __dir__ we can restore order in the Universe." - by @fxn

Related to 5b8738c2df
 2017-05-23 00:53:51 +03:00
Akira Matsuda 45d7d80ea6 mathn has been gemified in ruby 2.5 2017-05-19 18:42:43 +09:00
Justin Coyne 673a5644ac Allow capybara minor releases 
Capybara 2.14.0 was released. Loosen the tight constraint in the
generated Gemfile, so that Rails applications can take advantage of the
new version
 2017-05-05 10:26:59 -05:00
Rafael Mendonça França 1421950512
Add minitest-bisect as part of the gemfile 2017-04-26 22:54:54 -07:00
Rafael Mendonça França 2883d2dff6
Release minitest lock so we can fix the order dependent tests 2017-04-26 22:53:55 -07:00
Zachary Scott 8e98cdfe63 Ask for a sane version of SDoc 
This will allow me to push a release, including bug fixes,
without having to update Rails everytime.
 2017-04-23 16:32:57 +09:00
Matthew Draper 19ae6597b8 Revert "Avoid broken faraday 0.12.0 release" 
This reverts commit 82a7593e3a.
 2017-04-02 21:32:33 +09:30
Matthew Draper 82a7593e3a Avoid broken faraday 0.12.0 release 2017-04-02 18:18:52 +09:30
Matthew Draper 6c08d480f1 Start Rails 5.2 development 2017-03-22 10:11:39 +10:30
eileencodes eadbc82c47 Bump Capybara and include Minitest::Assertions 
Capybara was updated in teamcapybara/capybara#1841 to use Minitest style
assertions so that system test output shows x number of assertions, x
numbe of failures, etc.

Before:

```
6 runs, 0 assertions, 0 failures, 0 errors, 0 skips
```

After:

```
6 runs, 7 assertions, 1 failures, 0 errors, 0 skips
```

This change bumps Capybara from 2.7.0 to 2.13.0 and includes the
required minitest assertion file in the test case. 🎉
 2017-03-17 08:22:22 -04:00
Javan Makhmali 2d2b3025ec Restore action_cable.js UMD module support. Fixes #28366 2017-03-11 16:12:36 -05:00
Rafael Mendonça França ea9566f6cd
Use released arel 2017-02-21 11:46:42 -05:00
eileencodes 1a0ca84a06 Move and rename system tests 
* Move system tests back into Action Pack
* Rename `ActionSystemTest` to `ActionDispatch::SystemTestCase`
* Remove private base module and only make file for public
`SystemTestCase` class, name private module `SystemTesting`
* Rename `ActionSystemTestCase` to `ApplicationSystemTestCase`
* Update corresponding documentation and guides
* Delete old `ActionSystemTest` files
 2017-02-20 15:07:35 -05:00
yuuji.yaginuma 4a694c19e2 Use released resque 2017-02-10 15:31:41 +09:00
Akira Matsuda 6a1c0218df delayed_job and delayed_job_active_record gems with AR5 support are available 2017-01-29 09:05:06 +09:00
Jeremy Evans 7da8d76206
Change ActionView ERB Handler from Erubis to Erubi 
Erubi offers the following advantages for Rails:

* Works with ruby's --enable-frozen-string-literal option
* Has 88% smaller memory footprint
* Does no freedom patching (Erubis adds a method to Kernel)
* Has simpler internals (1 file, <150 lines of code)
* Has an open development model (Erubis doesn't have a
  public source control repository or bug tracker)
* Is not dead (Erubis hasn't been updated since 2011)

Erubi is a simplified fork of Erubis that contains just the
parts that are generally needed (which includes the parts
that Rails uses).  The only intentional difference in
behavior is that it does not include support for <%=== tags
for debug output.  That could be added to the ActionView ERB
handler if it is desired.

The Erubis template handler remains in a deprecated state
so that code that accesses it directly does not break.  It
can be removed after Rails 5.1.
 2017-01-25 01:41:27 -07:00
Akira Matsuda 641a490e56 Revert "I guess we're ready for the randomized tests now" 
This reverts commit 8c155c932f.

Not really 😢
 2017-01-18 20:52:21 +09:00
Akira Matsuda 8c155c932f I guess we're ready for the randomized tests now 2017-01-18 18:27:05 +09:00
toshimaru 6e30114c0a update rubocop to 0.47 2017-01-16 15:34:30 +09:00
Akira Matsuda 46fdbc5290 Revert "bundle u mocha" 
This reverts commit 66e5b9d3f4.

We're seeing some test failures in AR postgresql tests
 2017-01-16 00:16:41 +09:00
Akira Matsuda 66e5b9d3f4 bundle u mocha 
I see no reason not to use the newest stable version.
 2017-01-15 22:58:40 +09:00
Rafael Mendonça França e646bad5b7
Remove deprecated support to passing a column to #quote 2016-12-29 17:53:03 -05:00
Matthew Draper 774be3ea3b bundle update 2016-12-26 23:17:54 +10:30
Zachary Scott eeb1926158 Bump sdoc to rc1 which includes zzak/sdoc#98 2016-12-25 17:55:21 +09:00
Bian Jiaping 88792b1b2e Fix rake guides:generate:kindle error 2016-12-18 23:13:50 +08:00
Guillermo Iguaran ffb81ad6e3 rails-ujs is now shipped with Action View 2016-11-29 09:48:19 -05:00
Rafael França 06d2049618 Merge pull request #27196 from kirs/rubocop-gem 
Add rubocop to Gemfile
 2016-11-28 17:32:48 +01:00
Kir Shatrov 61fa0a8675 Add rubocop to Gemfile 2016-11-28 10:28:21 -05:00
Guillermo Iguaran 277b5f9af8 Add rails-ujs as dependency in the rails Gemfile 2016-11-21 18:58:36 -05:00
Jon Moss 3256dcd8b9 Install libxml-ruby gem so full XMLMini test suite can be run 2016-11-19 10:46:28 -05:00
Akira Matsuda 3a558aa2bc Make sure to bundle json 2.x on CI 
Without this, bundler tries to bundle json 1.8 on Ruby 2.4 in some cases
https://travis-ci.org/rails/rails/jobs/175874852
 2016-11-15 09:26:03 +09:00
Gaurav Sharma f0bacbc2c4 update kindlerb gem 
Ruby Kindle periodical-format ebook generator
 2016-10-21 09:37:24 +05:30
Zachary Scott db85fa1db4 Include sdoc 1.0.0.beta2 which includes updated rdoc w/o hard json dep 2016-10-07 18:51:27 +09:00
Zachary Scott 91efc4fc0b Bump sdoc to 1.0.0.beta1 which includes fix to support Ruby 2.4 2016-10-07 18:42:22 +09:00
Matthew Draper acd7ba795e Use a branch of websocket-client-simple, to work around read/close race 2016-10-06 12:51:26 +10:30
Esteban Santana Santana ddddedc487 Allow the use of listen's 3.1.x branch. 
When the initial evented monitor feature was written, the latest version of listen
was the 3.0.x series. Since then the listen project has moved on to the 3.1.x series.
This patch allows the use of the new versions.
 2016-10-03 16:58:17 +05:30
Matthew Draper 7c812c2401 Use websocket-client-simple instead of Faye as a websockets client 
Mostly, this is just to avoid EventMachine. But there's also an argument
to be made that we're better off using a different protocol library for
our test suite than the one we use to implement the server.
 2016-10-02 12:25:33 +10:30
Rafael Mendonça França 12d5c21031
Override the github git source instead of changing manually all entries 2016-09-14 10:58:21 -03:00
Prathamesh Sonpatki cc769d03dc
Use :git for specifying dependencies from github with https protocol 
- This is required for bundler 1.13.0 because of which lot of specs are
  failing on Travis CI.
- Similar to https://travis-ci.org/rails/rails/jobs/158905576#L559
 2016-09-10 20:15:53 +05:30
Xavier Noria 9ed7404498 applies new string literal convention in Gemfile 
The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.
 2016-08-06 19:23:19 +02:00
Sean Griffin ca0b6d0d41 Don't require C dependencies on Windows/JRuby 2016-08-03 10:14:26 -04:00
Rafael Mendonça França ab503f72c5
Do not require rb-inotify 2016-07-27 23:47:26 -03:00
Rafael Mendonça França 5859cbddc3
Use a form of rb-inotify to fix broken tests with Ruby 2.2.5 
See https://github.com/nex3/rb-inotify/pull/49
 2016-07-27 23:39:10 -03:00
yuuji.yaginuma 8c46abfd70 test with latest resque 
When run test of Active Job with resque 1.26, occurs following error.

```
QueuingTest#test_current_locale_is_kept_while_running_perform_later:
NoMethodError: undefined method `current_tags' for #<Resque::QuietFormatter:0x0055b44f63ed50>
    /home/yaginuma/program/rails/master_y_yagi/rails/activejob/lib/active_job/logging.rb:51:in `logger_tagged_by_active_job?'
```

This was happening for the formatter class of resque not the formatter class of
Rails is they've been used to logger.formatter.
This was happening because become fomatter is changed during the instantiation
of worker in the resque 1.26.
In the master, unless the environment variable is set, fomatter is so as not to
be changed, test will pass.

Ref: https://github.com/resque/resque/pull/1439
 2016-07-05 10:02:41 +09:00
Rafael Mendonça França 14dc9b9cd9
Use sass-rails in our test suite 2016-06-30 19:39:37 -03:00
Rafael Mendonça França 19ba6b8d4e
Merge pull request #25607 from sstephenson/turbolinks-5-final 
Update to Turbolinks 5.0.0 final
 2016-06-30 14:39:36 -03:00
Rafael Mendonça França e4c8aae643
Point to released coffee-rails 2016-06-30 14:35:25 -03:00
Sam Stephenson 10ba790124 Update to Turbolinks 5.0.0 final 2016-06-30 12:22:16 -05:00
Jon Moss 0c330888d6
Require Nokogiri >= 1.6.8 
per security release today --> https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
 2016-06-06 23:10:37 -04:00
Javan Makhmali 0e9c340d6f Update Blade and its Sauce Labs plugin for EventMachine 1.2 compatibility 2016-06-04 18:54:34 -04:00
Javan Makhmali 20c14c5f13 Lock Faye version to avoid bug with its Promise polyfill, use mainline blade-sauce_labs_plugin gem 2016-05-31 10:44:09 -04:00
Jon Moss 8cfce058d9
CI: run Action Cable browser tests in Sauce Labs 
Allow failures until test runs are consistently stable, not hanging.

Closes #24943.

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
 2016-05-25 09:21:28 -07:00
Javan Makhmali 11078dddbb Build action_cable.js with Blade 2016-05-24 13:11:10 -04:00
Vipul A M 61483b18bc
Remove Blade gem dependency 
Apps that depend on Action Cable don't need Blade for app development,
so we can remove the gem dependency.

We do need Blade for Action Cable dev, so we bundle it in the Gemfile.

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
 2016-05-21 12:41:01 -07:00
Rafael Mendonça França 8ecc5ab1d8 Start Rails 5.1 development 🎉 2016-05-10 03:46:56 -03:00
Jeremy Daer ab56c92f3c
Merge pull request #23461 from kamipo/prepared_statements_for_mysql2_adapter 
Add prepared statements support for `Mysql2Adapter`
 2016-04-23 22:28:52 -07:00
Sean Griffin 1f47c4b0df Make file update checker tests more resilient on Windows 
Without the `wdm` gem, it appears that `listen` keeps an open handle to
each of these files, causing them not to be removed when the tempdir
tries to clean iteslf up, and then directory to fail to unlink. In
addition to fixing that particular failure, we now construct OS agnostic
paths, and capture exceptions if the directory fails to unlink so that
minitest will report it rather than crash
 2016-04-21 10:54:54 -06:00
Ryuta Kamizono 3f6574efb1 Add prepared statements support for `Mysql2Adapter` 2016-04-21 09:17:42 +09:00
Benjamin Fleischer 3027970464 Run latest precompiled JRuby on CI only against ActionPack 
Uses latest precompiled JRuby so that
we don't spend time downloading versions Travis has
not already compiled. http://rubies.travis-ci.org/

Uses latest jdk: oraclejdk8
per
https://docs.travis-ci.com/user/build-environment-updates/2015-02-03/#Ruby-VM
and
https://docs.travis-ci.com/user/languages/ruby/#Supported-Ruby-Versions-and-RVM

Follows on work in https://github.com/rails/rails/pull/23927 which was reverted
26fe5fa08d

JRUBY_OPTS minimize GC, disable JIT, for max test speed
  - https://github.com/rails/rails/pull/16613
  - https://github.com/rails/rails/pull/17088

Have Rails use JRuby-compatible Rake 11.1
  - The Rake task was passing --verbose, an invalid option, to contemporary JRuby
  - https://github.com/ruby/rake/pull/120
  - https://github.com/rails-api/active_model_serializers/pull/1585
  - https://github.com/jruby/jruby/issues/3653#issuecomment-195883717

No advantage to directly mounting JRuby over installing from cache; both on S3
  - b2d5b336b5
  - f4fad041b2
 2016-03-30 02:11:45 -05:00
Rafael Mendonça França 92f869a0c8 Ping the resque version while we can't investigate the failure 2016-03-11 17:11:59 -03:00
T.J. Schuck efbfdd4049 Version 3.1.11 works on Windows again 
This undoes 7241498e51

https://github.com/codahale/bcrypt-ruby/issues/128 is fixed and closed.
 2016-03-10 14:13:21 -05:00
Sarah A f667f0aa04 Update Gemfile 
Changes "as has to be loaded" to "as it has to be loaded"
 2016-03-03 23:42:53 -08:00
Prathamesh Sonpatki 2669f3753d Update turbolinks-rails for passing railties test 
Ref - https://github.com/turbolinks/turbolinks-rails/pull/3
 2016-02-05 17:02:22 +05:30
Rafael Mendonça França dd67df6136 Test with Turbolinks 5 2016-02-04 14:24:36 -02:00
Mike Perham f3433f7c75 Remove json gem dependency 
All modern Rubies ship JSON as part of stdlib.  Using the gem actually hurts multi-platform support due to build difficulties on Windows.
 2016-02-03 10:49:14 -08:00
Matthew Draper e77368637e Switch the default redis adapter to a single-stream model 
This new adapter does get a little more intimate with the redis-rb gem's
implementation than I would like, but it's the least bad of the
approaches I've come up with.
 2016-02-01 01:56:47 +10:30
Matthew Draper ce37de4a19 Add a couple of tests that connect with a WS client 2016-01-30 03:46:37 +10:30
Rafael Mendonça França 2c131141ca Remove celluloid from the Gemfile 2016-01-27 15:44:26 -05:00
Jon Moss a9a64c490d Update ActiveJob adapter for sucker_punch 2.0 
This PR includes two changes for 2.0.0:

- Breaking API change around `async.perform` --> `perform_async`
- New addition of `perform_in`, which now allows end users of the
  adapter to use the `enqueued_at` public API method.
 2016-01-27 12:49:35 -05:00
Matthew Draper 9ff28c10eb Add tests for the ActionCable adapters 2016-01-24 21:13:40 +10:30
Brandon Hilkert bc194937ad Ensure sucker_punch < v2 is installed due to the change in public API 2016-01-02 14:54:15 -05:00
Rafael Mendonça França 477bed8871 Use released rack 2015-12-18 04:54:50 -02:00
Rafael Mendonça França 8f8cb1baa3 Install jquery-rails 
It will make sure that the generated application in the tests get the
gem.
 2015-12-18 04:13:53 -02:00
Matthew Draper 4a58aef7e3 Merge pull request #22642 from seuros/remove-mysql-adapter 
Remove legacy mysql adapter
 2015-12-18 13:51:04 +10:30
Jeremy Daer 7a6772c0e7 Use released GlobalID now that it provides URI::GID::MissingModelIdError for Active Job 2015-12-17 17:20:19 -07:00
Jon Moss 5d8ee1250f Require Nokogiri >= 1.6.7.1 
Many CVEs released: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 2015-12-17 17:35:25 -05:00
Rafael Mendonça França af5b05a4c0 Use release sprockets-rails 2015-12-17 18:22:58 -02:00
Rafael Mendonça França d41386d788 Use released jquery-rails 2015-12-17 18:17:52 -02:00
Rafael Mendonça França b611350e7c Use released arel 2015-12-17 18:11:29 -02:00
Rafael Mendonça França 9b28b252e2 Use released mail gem 2015-12-17 17:16:08 -02:00
Abdelkader Boudih fb24d0ed6c Remove legacy mysql adapter 2015-12-17 15:54:57 +00:00
Rafael Mendonça França 606c435450 Use released turbolinks in the test suite 2015-12-17 13:31:49 -02:00
Rafael Mendonça França 4b669dbb91 Merge branch 'master' into merge-action-cable 2015-12-16 17:05:16 -02:00
Rafael Mendonça França b1c19eb052 Merge branch 'sprockets-3' 2015-12-16 16:57:11 -02:00
Rafael Mendonça França 877a411d0c Use sprockets 3 in the Rails 5 release 2015-12-16 16:30:58 -02:00
Sean Griffin 48c4edc4a6 Avoid conditionals in the Gemfile 
"conditionals in the gemfile creates conditional code in the Gemfile.lock.
Since it is checked in the repository I think it is better to avoid it"
 2015-12-16 10:33:09 -07:00
Sean Griffin 7241498e51 Require a version of bcrypt that works on Windows when needed 
bcrypt 3.1.0 doesn't load on Windows. See
https://github.com/codahale/bcrypt-ruby/issues/128
for details.
 2015-12-16 09:44:46 -07:00
Sean Griffin 371e357065 Add additional platforms for Windows 
It appears that MRI on Windows can also appear as `:mingw`, if it was
installed via RubyInstaller.
 2015-12-16 09:33:33 -07:00
Sean Griffin 3dd1f554ee Ensure we install the database backend gems on Windows 
platform `:ruby` is only MRI on Linux or Mac. Windows MRI shows up as
`:mswin` or `:mswin64` depending on if it was installed as 32 or 64 bit. I
am unsure if this will cause conflicts with JRuby on Windows, but I don't
have the means to test this at the moment.
 2015-12-16 09:19:17 -07:00
Rafael Mendonça França 2e701a04d4 Remove action cable gems that are already in the gemspec 2015-12-14 14:28:13 -02:00
David Heinemeier Hansson 760de782f7 Initial stab at adding Action Cable to rails/master 2015-12-14 16:38:37 +01:00
David Heinemeier Hansson bf40bddfce Get ready to merge into Rails 2015-12-14 15:48:54 +01:00
Xavier Noria a94d404510 lazy load listen in core 
See the rationale in the comment present in this patch.
 2015-12-13 18:59:34 +01:00
Tamir Duberstein 991d83f8ed Update nokogiri to 1.6.7 
This picks up https://github.com/sparklemotion/nokogiri/pull/1218
which allows nokogiri to compile on Xcode-only OS X systems.
 2015-12-10 13:46:08 -05:00
Sean Griffin b5bbdbd3bc Revert "Add prepared statements support for `Mysql2Adapter`" 2015-11-26 11:53:10 -07:00
Godfrey Chan 14b20ce9b3 Upgrade to listen 3.0.5, re-enable tests 
In listen 3.0.4 and below, the `#stop` method on the notification
backends are a no-op, meaning that we are leaking them per test. This
ended up triggering another bug in Ruby that causes our builds to fail
randomly on CI.

listen bug: https://github.com/guard/listen/issues/353
ruby bug: https://bugs.ruby-lang.org/issues/11744
 2015-11-26 10:35:20 -08:00
Ryuta Kamizono 38746d085b Add prepared statements support for `Mysql2Adapter` 2015-11-26 11:16:26 +09:00
Xavier Noria d47b982268 upgrade listen to 3.0.4 
3.0.3 has a bug in OS X.
 2015-11-08 22:49:50 -08:00
Xavier Noria 785adabc4b implements an evented file update checker [Puneet Agarwal] 
This is the implementation of the file update checker written
by Puneet Agarwal for GSoC 2015 (except for the tiny version
of the listen gem, which was 3.0.2 in the original patch).

Puneet's branch became too out of sync with upstream. This is
the final work in one single clean commit.

Credit goes in the first line using a convention understood
by the contrib app.
 2015-11-08 22:49:49 -08:00
Jeremy Daer d7ab5c8f1f Test against Rails edge by default. CI against 4.2 also. 
* Don't deep-require to AD::Http::Request since it misses Mime autoload
 2015-10-16 00:58:06 -07:00
Xavier Noria 96b1fbdeb1 edit pass over the project Gemfile [ci skip] 
* Revises the name of Rails components (they have a space).

* Uniform word wrap at column 80..

* Uniform punctuation, according to our guidelines.

* Minor edits of details seen in passing.
 2015-10-12 13:50:24 +02:00
Gaurav Sharma 03f4b9468e update to ruby-oci8 - 2.2.0 
It stopped `ruby 1.8` support, we already switched to `ruby >= 2.2.2`
 2015-10-10 00:34:49 +05:30
Jeremy Daer 24b1850130 Missed Gemfile change in f849cfe36c 2015-10-03 19:30:02 -07:00
Aaron Patterson ff30db1372 run against edge sass to eliminate circular require warnings 2015-09-30 07:42:58 -07:00
Jerry D'Antonio 33e506cb4a Fixed concurrent-ruby warnings. 
Bumped version of concurrent-ruby to 1.0.0.pre3, which fixes all
interpreter warnings.
 2015-09-29 21:31:49 -04:00
Jeremy Daer 20ec1e922c Eliminate overlapping `app/assets` load path 
* Move `app/assets/manifest.js` to `app/assets/config/manifest.js`.
  Avoid the suggestion that you can/should deep-link `stylesheets/foo`.
* Pull in all toplevel stylesheets and JavaScripts, not just
  `application.js` and `.css`. Demonstrate how to use `link_directory`
  with a specified `.js`/`.css` type.
* Fix RAILS_ENV handling in assets tests.
* Shush warnings spam from third-party libs that distract from tests.
 2015-09-29 11:56:58 -07:00
Andrew White 2b16816bc3 Use master version of Turbolinks gem 
Since `alias_method_chain` is deprecated we need to use the master version
of the Turbolinks gem as it has support for using `Module#prepend`.
 2015-09-21 14:02:41 +01:00
Rafael Mendonça França 5e3e5de48b Do not use conditionals at Gemfile 
This will make the Gemfile.lock be dirty in some environments
 2015-09-14 20:12:09 -03:00
Eric Guo bbfd17689b Ruby 2.2.3 in windows need nokogiri 1.6.7.rc3 as it's the only version having correct pre-compiled so 2015-09-12 23:46:37 +08:00
Rafael Mendonça França ed3d213eb6 Use released mysql2 2015-09-08 14:01:04 -03:00
Jeremy Daer 5da5e3772c Support mysql2 0.4.0, first release with prepared statements support 
Known failure on Ruby 2.3/trunk: brianmario/mysql2#671
 2015-09-07 16:37:25 -07:00
Carlos Antonio da Silva a90d79330b Add master branch to github gems to be able to use local clones 2015-09-01 08:44:32 -03:00
Aaron Patterson 51211a94bd point at rack master 2015-08-20 13:45:11 -07:00
Andrei Istratii d0e0fbafb2 Migrate to Sprockets 4. 2015-08-19 21:45:46 +03:00
Yves Senn 68e3279163 implement `provider_job_id` for `queue_classic`. 
The latest, currently unreleased, version of queue_classic is required
for this to work. See
https://github.com/QueueClassic/queue_classic/pull/262 for more details.
 2015-08-13 10:00:19 +02:00
Jeremy Kemper f1b9095bdc Move dev dependencies from Gemfile to the gemspec: rake, puma, mocha 2015-07-13 19:28:14 -07:00
Pratik Naik f207245cc7 Load mocha for tests 2015-07-12 11:44:56 -05:00
Kasper Timm Hansen 5294bf1ef6 Add gemfile entry for GlobalID until a new release is cut. 2015-07-05 14:50:33 +02:00
Semyon Pupkov ee68786953 Unlock sneakers adapter version 2015-04-28 14:52:29 +05:00
Arthur Neves ac98359c83
Use latest sprockets-rails on internal dev 2015-04-26 11:42:13 -04:00
Godfrey Chan 78b51a8071 Uncomment byebug in framework Gemfile 
History:

1. `debugger` was there until d2ed433b where it was commented out, and I
   couldn't figure out why

2. Since then we inherited that when switching to `byebug` in 93559da4

Reasons:

1. It's nice to have a debugger when working on framework bugs

2. It's an uncommented dependency in app Gemfiles since Rails 4.2 (see fbe38c9e)
 2015-04-24 01:24:50 -04:00
Toshi MARUYAMA 7008dfba66 Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on Linux 
Related: #19617, #19187, #19533, #19689, #19675.

This is POC (Proof Of Concept) which bundler does not remove mingw lines.
https://github.com/rails/rails/pull/19617#issuecomment-90293795
 2015-04-09 19:25:11 -03:00
Akira Matsuda 6c98100620 redcarpet 3.2.2 has an XSS vulnerability 
see: http://www.openwall.com/lists/oss-security/2015/04/07/11
 2015-04-09 18:20:53 +09:00
Carlos Antonio da Silva 4ba1376c60 Remove old mri platform entries from our Gemfile 
Since we now only support Ruby 2.2+, we can safely remove the old mri
entries from the Gemfile.

This also allows us not to lock to a specific bundler version, since
:mri_22 was defined only on 1.7.11.

Closes #19611.
 2015-04-01 17:09:58 -03:00
Rafael Mendonça França a8225eeec2 Test using sprockets 3 2015-03-29 22:58:32 -03:00
Arthur Neves 9afd9d232c method_source needs to be a hard dependency on railties 2015-03-19 10:15:03 -04:00
Arthur Neves d6ed046d30 Add method_source to gemfile 2015-03-18 09:52:16 +01:00
Rafael Mendonça França 2b2bf22e8d Use the released gem 2015-03-10 17:31:35 -03:00
Kasper Timm Hansen 37695b8aab Let strip_tags leave HTML escaping to Rails. 
Prevents double escaping errors, such as "&amp;" becoming "&amp;amp;".
 2015-03-10 20:04:01 +01:00
yui-knk 6bf2b83700 [ci skip] Fix `AS` and `AR` to full name 2015-03-07 13:49:08 +09:00
Cristian Bica cb786219f4 Fixed ActiveJob integration tests 2015-03-05 23:57:57 +02:00
Robin Dupret 5140c07c02 Test against the mail gem's edge 
The edge version ships with a patch that uses composition over
inheritance for the Mail::PartsList object (see mikel/mail#782).
Let's test Action Mailer against it to prevent eventual regressions
and experience it.

Moreover, this branch makes the Action Mailer suite green against
Rubinius.
 2015-03-02 16:55:27 +01:00
Ryuta Kamizono a088ee9691 Format the time string according to the precision of the time column 
It is also necessary to format a time column like a datetime column.
 2015-02-20 10:25:31 +09:00
Sean Griffin aafee233fb Remove most PG specific type subclasses 
The latest version of the PG gem can actually convert the primitives for
us in C code, which gives a pretty substantial speed up. A few cases
were only there to add the `infinity` method, which I just put on the
range type (which is the only place it was used). Floats also needed to
parse `Infinity` and `NaN`, but it felt reasonable enough to put that on
the generic form.
 2015-02-11 08:49:31 -07:00
Pratik Naik 7fef6b01a3 No cramp and use celluloid workers to run callbacks 2015-02-05 16:35:11 +05:30
Alex Grover e44cbfef0c Update queue_classic gem to use latest 
Remove '<3.0.0' requirement for queue_classic gem. This fixes the issue
that the gem was attempting to parse the queue name as a URI, causing
all of the tests to fail.
 2015-01-31 14:07:11 -08:00
Xavier Noria 8d15e072be fix kindlerb version [ci skip] 
This means we know generation works with this version, it does not
mean it does not work with the last releases (should be tested).
 2015-01-31 15:03:58 +01:00
Sean Griffin eac4f75b9f Include stackprof on ruby 2.2 as well as 2.1 2015-01-18 12:38:41 -07:00
Pratik Naik a5c3a8d3e3 Latest gems and fix a callback bug 2015-01-15 21:07:31 +05:30
Pratik Naik db568553d1 Action Cable take#1 2015-01-14 21:59:47 +05:30
Rafael Mendonça França 93559da482 Remove debugger support 
bebugger doesn't work with Ruby 2.2 so we don't need to support it
anymore
 2015-01-04 15:54:22 -03:00
Robin Dupret ece28185a8 Update Redcarpet to version 3.2.2 2015-01-03 12:57:22 +01:00
Carlos Antonio da Silva 58009ace37 Add branch to gems pointing to github so that we can use local checkouts 2015-01-02 10:26:10 -02:00
Sean Griffin b5242b6f95 Use arel master 2014-11-29 16:11:57 -07:00
Rafael Mendonça França 457fc61cec Use jquery-rails master to resolve dependencies 
delayed_job_active_record doesn't allow Rails 5 yet
 2014-11-28 17:10:32 -02:00
Santiago Pastorino 31815d7167 Revert "Test against rack master" 
This reverts commit 2a4e14db98.
 2014-11-27 16:53:58 -02:00
Rafael Mendonça França 2a4e14db98 Test against rack master 2014-11-26 16:17:51 -02:00
Rafael Mendonça França 75eacb00e0 Use jquery-rails 4.0.0 2014-11-25 22:34:10 -02:00
Rafael Mendonça França 25c85cb6f6 Use released arel 2014-11-25 19:58:08 -02:00
Rafael Mendonça França e3f7817cec Use released rails-dom-testing 2014-11-25 19:43:36 -02:00
Rafael Mendonça França 27a181f751 Use GitHub, not my local fork 😅 2014-11-17 16:38:30 -02:00
Rafael Mendonça França 5b7b98d590 document_root_element need to be public 2014-11-17 16:37:17 -02:00
Sean Griffin 7da5d8a5dc Add StackProf to the test group for 2.1 
Makes life easier for people profiling on master.
 2014-11-17 06:39:32 -08:00
Aaron Patterson aeb917d475 exec_prepared is GVL friendly, so lets use it. 
also increase the version of pg required so that people will get the
GVL friendly version
 2014-11-13 15:31:54 -08:00
Sean Griffin daab7e59a6 Correctly cast calculation results on PG 
MySQL reports the column name as `"MAX(developer_id)"`. PG will report
it as `"max"`
 2014-11-01 17:15:55 -06:00
Godfrey Chan c747d4c48c Use released arel 2014-10-30 14:07:24 -07:00
Sean Griffin b6a0255519 Use `#between`, rather than `#in` for passing Ranges to Arel 
Passing ranges to `#in` has been deprecated in Arel.
 2014-10-30 09:47:15 -06:00
Rafael Mendonça França be5521eb4e Use released rails-dom-testing 2014-10-16 16:53:46 -03:00
Rafael Mendonça França 74a9b3777e Always use latest turbolinks 2014-10-13 17:24:49 -03:00
Joshua Peek fa5a1b9345 Default generated Gemfile to coffee-rails ~> 4.1.0 2014-10-12 18:27:27 -07:00
Kasper Timm Hansen f939904f23 Parse HTML as document fragment. 
This is to match the changes in Rails Dom Testing rails/rails-dom-testing#20.
 2014-09-29 21:41:52 +02:00
Rafael Mendonça França b98c593bc8 No need to install the deprecated_sanitizer gem 
It is not being used in our tests
 2014-09-25 16:48:45 -03:00
Rafael Mendonça França 80990e2a0b rails-html-sanitizer is now the default 
Also add to upgrading guide a notice about the deprecated sanitizers
 2014-09-25 16:45:45 -03:00
Godfrey Chan b008e4bd8a Use released rails-html-sanitizer and rails-deprecated_sanitizer 2014-09-26 01:37:05 +09:00
Rafael Mendonça França 2c0cad8034 Use released rails-dom-testing 2014-09-25 12:31:42 -03:00
Jeremy Kemper 01ac23423d Pare down and simplify Active Job's rake tasks 2014-09-14 14:01:16 -07:00
Rafael Mendonça França fb0bd54def Globalid was released 2014-09-12 13:39:10 -03:00
Rafael Mendonça França 2dd6ec2c69 Use latest globalid 2014-09-12 13:11:18 -03:00
Brandon Hilkert 878d6c12a0 Remove version. No longer using Celluloid 0.16. 2014-09-12 09:59:39 -04:00
Abdelkader Boudih 558b6d0c3a lock suckerpunch version to 1.1 2014-09-12 12:01:08 +00:00
Cristian Bica 175ba66664 ActiveJob Integration Tests 2014-09-11 00:38:56 +03:00
Godfrey Chan 381f9931ec Dependencies: bump to jquery-rails 4.0.0.beta2 2014-09-05 20:20:26 -07:00
Godfrey Chan b1bc95bfa5 Use the released jquery-rails gem 2014-09-05 17:55:45 -07:00
Rafael Mendonça França dc8a759552 Add TODO to release the gems before the next Rails release 2014-09-05 19:41:02 -03:00
Rafael Mendonça França 67b42cb4aa Move implementation to the gems 
Now we keep only the common code and move the specific code to the gems
 2014-09-01 23:26:10 -03:00
Rafael Mendonça França c6f9cec1be Add test to assert the right sanitizer vendor is being used 2014-09-01 22:46:05 -03:00
Rafael Mendonça França dd1fb2d769 Use jquery-rails master 2014-09-01 21:41:48 -03:00
Rafael Mendonça França 5d81a7d5f8 Create a group to active job gems 2014-08-19 23:21:39 -03:00
Carlos Antonio da Silva 156ba1b5c7 Use the released turbolinks gem 2014-08-19 21:59:01 -03:00
Rafael Mendonça França d4f018fc25 Require sprockets-rails 3.0.0.beta1 2014-08-19 19:57:55 -03:00
Rafael Mendonça França 6986535a21 Add TODO note about the gems missing release 2014-08-19 16:50:29 -03:00
Rafael Mendonça França edfc36d336 Remove git dependecies 2014-08-19 16:49:04 -03:00
Rafael Mendonça França 091645116b Use released rails-html-sanitizer 2014-08-19 16:47:26 -03:00
Rafael Mendonça França 08f209614b Use released rails-deprecated_sanitizer 2014-08-19 16:45:31 -03:00
Rafael Mendonça França b8ef1d8abd loofah require dependecy is not needed anymore 2014-08-19 16:15:41 -03:00
Peter Suschlik 6cfb9bf22d Gem `queue_classic` does not support JRuby 2014-08-19 15:29:00 +02:00
Rafael Mendonça França 6956dfcaa2 Point to unreleased deprecated_sanitizer 2014-08-18 20:46:35 -03:00
Carlos Antonio da Silva c9cd532ba6 Use the released beta of i18n 2014-08-18 14:08:53 -03:00
Rafael Mendonça França cdc00aba62 Merge branch 'loofah' 
Conflicts:
	Gemfile
 2014-08-17 22:51:13 -03:00
Rafael Mendonça França cc9091c3e7 Use released arel 2014-08-17 22:50:06 -03:00
Rafael Mendonça França c78da4d5c4 Merge branch 'master' into loofah 
Conflicts:
	actionpack/CHANGELOG.md
 2014-08-17 22:38:22 -03:00
Rafael Mendonça França 4e49134621 Use the release gems and point application gemfile to right loofah 2014-08-17 22:34:44 -03:00
David Heinemeier Hansson 49c9f850fa Merge pull request #16485 from seuros/activejob 
Integrate ActiveJob / DeliverLater / GlobalID with Rails
 2014-08-17 16:44:30 -07:00
Abdelkader Boudih 2f7b239fca [ActiveJob] Use globalid gem 2014-08-17 23:10:45 +00:00
Carlos Antonio da Silva eb714d4460 Allow usage of bundle local config for rack by specifying the branch 
[ci skip]
 2014-08-17 13:16:04 -03:00
Abdelkader Boudih 9b209603d0 Clean adapter_test.rb and skip test for sidekiq in unsupported rubies 2014-08-13 13:55:08 +00:00
Rafael Mendonça França a2400308ea Merge branch 'master' into loofah 
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/integration_test.rb
	actionview/CHANGELOG.md
 2014-08-12 11:10:42 -03:00
Abdelkader Boudih 0c232779ec Remove activejob integration tests 2014-08-12 10:07:21 +00:00
Rafael Mendonça França ee255794b3 Test using turbolinks master 
See
153f1b0f04
 2014-08-06 22:48:22 -03:00
Robin Dupret 558f8aa2ee Set Psych as the YAML engine for Rubinius 
Since the rubysl-yaml gem doesn't ship with Psych by default because of
its dependency on libyaml, on Rubinius, the default engine is Syck.

However, if we want to be able to run the application safely on
different rubies, we need to make people using Rubinius rely on Psych.

See http://git.io/uuLVag for further information.
 2014-07-23 20:05:14 +02:00
Rafael Mendonça França 3229eda00c Merge pull request #11218 from kaspth/loofah-integration 
Loofah-integration

Conflicts:
	actionpack/CHANGELOG.md
	actionview/CHANGELOG.md
 2014-07-10 16:52:00 -03:00
Aaron Patterson 97d62a32f8 Merge pull request #13999 from jamox/update_rack 
This updates rails to use edge rack
 2014-07-08 11:46:56 -07:00
Timm 33c8bfce0c Point gems to all the right places. 2014-06-16 21:04:23 +02:00
Timm 94ca27b190 Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for assert_select_email. 2014-06-16 21:04:17 +02:00
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 b8f586a094.
 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 3053fee954.

> 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 4d4ff531b8
 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 5758387950
 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 6f3f0f8633.
 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