1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Commit graph

18 commits

Author SHA1 Message Date
Sean Griffin
0ef7e73f0a Ensure symbols passed to select are always quoted
Our general contract in Active Record is that strings are assumed to be
SQL literals, and symbols are assumed to reference a column. If a from
clause is given, we shouldn't include the table name, but we should
still quote the value as if it were a column.

Upon fixing this, the tests were still failing on SQLite. This was
because the column name being returned by the query was `"\"join\""`
instead of `"join"`. This is actually a bug in SQLite that was fixed a
long time ago, but I was using the version of SQLite included by OS X
which has this bug. Since I'm guessing this will be a common case for
contributors, I also added an explicit check with a more helpful error
message.

Fixes #20360
2015-05-30 12:35:51 -06:00
Samuel E. Giddins
783637eb20 Generate Bundler 1.10.1 lockfile 2015-05-28 22:40:29 -07: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
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
eileencodes
e1e2b54e85 Bump rack-test to fix nil values being sent to parse_nested_query
I found that nil values were being incorrectly sent to
`parse_nested_query` in Rack. Originally it was thought that Rails was
doing something incorrect but it was actually rack-test. This was fixed
in brynary/rack-test@4a4b2c1 and is no longer an issue. This commit
bumps rack-test in Rails so changes to Rack don't cause failures.

See rack/rack#813 for more information.
2015-03-01 16:58:15 -05: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
Rafael Mendonça França
b1edc3789a Track Gemfile.lock at the repository
The main reason is to make bisect easier.

In some points, we have a lot of git dependencies. Since we don't have
the information of which commit we are referring to, bundler get the
latest commit of the master branch of the dependency. This sometimes
returns a version that is not compatible with Rails anymore, making the
tests fail and the harder to identify the commit that introduced a bug.

Also this will make sure that a contributor will always get a set of
dependencies that are passing with our tests.

In our CI server we delete the lock file to make sure we are always
testing against the newest release of our dependencies.
2015-02-18 15:14:46 -02:00