Commit Graph

467 Commits

Author SHA1 Message Date
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
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 f849cfe36c585fbc58c4a5fd91b0ae1571d38bcb 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 "&" becoming "&".
2015-03-10 20:04:01 +01:00