Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Dependencies: bump to jquery-rails 4.0.0.beta2 | Godfrey Chan | 2014-09-05 | 1 | -1/+1 | |
| | ||||||
* | Use the released jquery-rails gem | Godfrey Chan | 2014-09-05 | 1 | -1/+1 | |
| | ||||||
* | Add TODO to release the gems before the next Rails release | Rafael Mendonça França | 2014-09-05 | 1 | -0/+5 | |
| | ||||||
* | Move implementation to the gems | Rafael Mendonça França | 2014-09-01 | 1 | -0/+1 | |
| | | | | Now we keep only the common code and move the specific code to the gems | |||||
* | Add test to assert the right sanitizer vendor is being used | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 | |
| | ||||||
* | Use jquery-rails master | Rafael Mendonça França | 2014-09-01 | 1 | -1/+1 | |
| | ||||||
* | Create a group to active job gems | Rafael Mendonça França | 2014-08-19 | 1 | -11/+13 | |
| | ||||||
* | Use the released turbolinks gem | Carlos Antonio da Silva | 2014-08-19 | 1 | -3/+1 | |
| | ||||||
* | Require sprockets-rails 3.0.0.beta1 | Rafael Mendonça França | 2014-08-19 | 1 | -1/+0 | |
| | ||||||
* | Add TODO note about the gems missing release | Rafael Mendonça França | 2014-08-19 | 1 | -1/+3 | |
| | ||||||
* | Remove git dependecies | Rafael Mendonça França | 2014-08-19 | 1 | -2/+0 | |
| | ||||||
* | Use released rails-html-sanitizer | Rafael Mendonça França | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Use released rails-deprecated_sanitizer | Rafael Mendonça França | 2014-08-19 | 1 | -1/+0 | |
| | ||||||
* | loofah require dependecy is not needed anymore | Rafael Mendonça França | 2014-08-19 | 1 | -2/+0 | |
| | ||||||
* | Gem `queue_classic` does not support JRuby | Peter Suschlik | 2014-08-19 | 1 | -1/+1 | |
| | ||||||
* | Point to unreleased deprecated_sanitizer | Rafael Mendonça França | 2014-08-18 | 1 | -0/+1 | |
| | ||||||
* | Use the released beta of i18n | Carlos Antonio da Silva | 2014-08-18 | 1 | -1/+0 | |
| | ||||||
* | Merge branch 'loofah' | Rafael Mendonça França | 2014-08-17 | 1 | -0/+3 | |
|\ | | | | | | | | | Conflicts: Gemfile | |||||
| * | Merge branch 'master' into loofah | Rafael Mendonça França | 2014-08-17 | 1 | -1/+15 | |
| |\ | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | |||||
| * | | Use the release gems and point application gemfile to right loofah | Rafael Mendonça França | 2014-08-17 | 1 | -4/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into loofah | Rafael Mendonça França | 2014-08-12 | 1 | -1/+7 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/integration_test.rb actionview/CHANGELOG.md | |||||
| * \ \ | Merge pull request #11218 from kaspth/loofah-integration | Rafael Mendonça França | 2014-07-10 | 1 | -0/+5 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loofah-integration Conflicts: actionpack/CHANGELOG.md actionview/CHANGELOG.md | |||||
| | * | | | Point gems to all the right places. | Timm | 2014-06-16 | 1 | -4/+4 | |
| | | | | | ||||||
| | * | | | Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for ↵ | Timm | 2014-06-16 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | assert_select_email. | |||||
| | * | | | Added Loofah as a dependency in actionview.gemspec. | Timm | 2014-06-11 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | Use released arel | Rafael Mendonça França | 2014-08-17 | 1 | -1/+0 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #16485 from seuros/activejob | David Heinemeier Hansson | 2014-08-17 | 1 | -0/+14 | |
|\ \ \ \ | | | | | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails | |||||
| * | | | | [ActiveJob] Use globalid gem | Abdelkader Boudih | 2014-08-17 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Clean adapter_test.rb and skip test for sidekiq in unsupported rubies | Abdelkader Boudih | 2014-08-13 | 1 | -11/+11 | |
| | | | | | ||||||
| * | | | | Remove activejob integration tests | Abdelkader Boudih | 2014-08-12 | 1 | -0/+13 | |
| | |_|/ | |/| | | ||||||
* / | | | Allow usage of bundle local config for rack by specifying the branch | Carlos Antonio da Silva | 2014-08-17 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | [ci skip] | |||||
* | | | Test using turbolinks master | Rafael Mendonça França | 2014-08-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | See https://github.com/rails/turbolinks/commit/153f1b0f04c718442cfd73365a2778dfe1a1c5c7 | |||||
* | | | Set Psych as the YAML engine for Rubinius | Robin Dupret | 2014-07-23 | 1 | -0/+6 | |
|/ / | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | Merge pull request #13999 from jamox/update_rack | Aaron Patterson | 2014-07-08 | 1 | -0/+1 | |
|\ \ | |/ |/| | This updates rails to use edge rack | |||||
| * | Upgraded rack | Jarmo Isotalo | 2014-05-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | 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 | |||||
* | | Mail 2.6.1 silences excessive warnings; remove Gemfile hack | Benjamin Fleischer | 2014-06-08 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | Completes https://github.com/rails/rails/pull/15493 Revert "For our build, stick with mail 2.5.x for now" This reverts commit b8f586a094c104006d29a87fee0d8b48d0af2d14. | |||||
* | | For our build, stick with mail 2.5.x for now | Matthew Draper | 2014-06-05 | 1 | -0/+1 | |
| | | | | | | | | 2.6 currently has many warnings, which are failing the Travis build. | |||||
* | | Default config.assets.digests to true in development | Dan Kang | 2014-05-17 | 1 | -1/+1 | |
|/ | ||||||
* | Our test suite isn't ready to run in random order yet :cry: | Guillermo Iguaran | 2014-05-16 | 1 | -0/+3 | |
| | ||||||
* | flexible ruby-oci8 version specification. [Gaurav Sharma] | Yves Senn | 2014-05-15 | 1 | -1/+1 | |
| | | | | | | Follow up to #15109. /cc @Gaurav2728 | |||||
* | update ruby-oci8 version specification. Closes #15109. [ci skip] | Yves Senn | 2014-05-15 | 1 | -1/+1 | |
| | | | | /cc @yahonda | |||||
* | Merge pull request #15108 from arthurnn/i18n_master | Rafael Mendonça França | 2014-05-14 | 1 | -0/+1 | |
|\ | | | | | Use i18n master to run tests | |||||
| * | Use i18n master to run tests | Arthur Neves | 2014-05-13 | 1 | -0/+1 | |
| | | ||||||
* | | Update Redcarpet to 3.1.2 | Robin Dupret | 2014-05-14 | 1 | -1/+1 | |
|/ | | | | | | | This version fixes an API breakage between 3.0 and 3.1 ; the header method's arity should not have changed. [ci skip] | |||||
* | Guides: output valid HTML5 | Nate Berkopec | 2014-05-05 | 1 | -1/+1 | |
| | | | [ci skip] | |||||
* | Add branch to arel on Gemfile to allow local bundle config [ci skip] | Carlos Antonio da Silva | 2014-05-02 | 1 | -1/+1 | |
| | ||||||
* | oops! Fix Gemfile. :bomb: | Aaron Patterson | 2014-04-09 | 1 | -1/+2 | |
| | ||||||
* | fix bind collecting for mysql | Aaron Patterson | 2014-04-09 | 1 | -1/+0 | |
| | ||||||
* | Merge branch 'master' into adequaterecord | Aaron Patterson | 2014-04-09 | 1 | -0/+1 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
| * | depend_on_asset is not required anymore on sprockets-rails 2.1.2 | Rafael Mendonça França | 2014-04-09 | 1 | -0/+1 | |
| | |