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

387 Commits

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