Commit Graph

476 Commits

Author SHA1 Message Date
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
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 2a4e14db981e38611667d407a975600ee720ada7.
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 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