aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
...
* Gem `queue_classic` does not support JRubyPeter Suschlik2014-08-191-1/+1
|
* Point to unreleased deprecated_sanitizerRafael Mendonça França2014-08-181-0/+1
|
* Use the released beta of i18nCarlos Antonio da Silva2014-08-181-1/+0
|
* Merge branch 'loofah'Rafael Mendonça França2014-08-171-0/+3
|\ | | | | | | | | Conflicts: Gemfile
| * Merge branch 'master' into loofahRafael Mendonça França2014-08-171-1/+15
| |\ | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * | Use the release gems and point application gemfile to right loofahRafael Mendonça França2014-08-171-4/+2
| | |
| * | Merge branch 'master' into loofahRafael Mendonça França2014-08-121-1/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/integration_test.rb actionview/CHANGELOG.md
| * \ \ Merge pull request #11218 from kaspth/loofah-integrationRafael Mendonça França2014-07-101-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loofah-integration Conflicts: actionpack/CHANGELOG.md actionview/CHANGELOG.md
| | * | | Point gems to all the right places.Timm2014-06-161-4/+4
| | | | |
| | * | | Added rails-dom-testing and rails-html-sanitizer to Gemfile. Added tests for ↵Timm2014-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | assert_select_email.
| | * | | Added Loofah as a dependency in actionview.gemspec.Timm2014-06-111-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 arelRafael Mendonça França2014-08-171-1/+0
| |_|_|/ |/| | |
* | | | Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-171-0/+14
|\ \ \ \ | | | | | | | | | | Integrate ActiveJob / DeliverLater / GlobalID with Rails
| * | | | [ActiveJob] Use globalid gemAbdelkader Boudih2014-08-171-0/+1
| | | | |
| * | | | Clean adapter_test.rb and skip test for sidekiq in unsupported rubiesAbdelkader Boudih2014-08-131-11/+11
| | | | |
| * | | | Remove activejob integration testsAbdelkader Boudih2014-08-121-0/+13
| | |_|/ | |/| |
* / | | Allow usage of bundle local config for rack by specifying the branchCarlos Antonio da Silva2014-08-171-1/+1
|/ / / | | | | | | | | | [ci skip]
* | | Test using turbolinks masterRafael Mendonça França2014-08-061-1/+1
| | | | | | | | | | | | | | | See https://github.com/rails/turbolinks/commit/153f1b0f04c718442cfd73365a2778dfe1a1c5c7
* | | Set Psych as the YAML engine for RubiniusRobin Dupret2014-07-231-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_rackAaron Patterson2014-07-081-0/+1
|\ \ | |/ |/| This updates rails to use edge rack
| * Upgraded rackJarmo Isotalo2014-05-191-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 hackBenjamin Fleischer2014-06-081-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 nowMatthew Draper2014-06-051-0/+1
| | | | | | | | 2.6 currently has many warnings, which are failing the Travis build.
* | Default config.assets.digests to true in developmentDan Kang2014-05-171-1/+1
|/
* Our test suite isn't ready to run in random order yet :cry:Guillermo Iguaran2014-05-161-0/+3
|
* flexible ruby-oci8 version specification. [Gaurav Sharma]Yves Senn2014-05-151-1/+1
| | | | | | Follow up to #15109. /cc @Gaurav2728
* update ruby-oci8 version specification. Closes #15109. [ci skip]Yves Senn2014-05-151-1/+1
| | | | /cc @yahonda
* Merge pull request #15108 from arthurnn/i18n_masterRafael Mendonça França2014-05-141-0/+1
|\ | | | | Use i18n master to run tests
| * Use i18n master to run testsArthur Neves2014-05-131-0/+1
| |
* | Update Redcarpet to 3.1.2Robin Dupret2014-05-141-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 HTML5Nate Berkopec2014-05-051-1/+1
| | | [ci skip]
* Add branch to arel on Gemfile to allow local bundle config [ci skip]Carlos Antonio da Silva2014-05-021-1/+1
|
* oops! Fix Gemfile. :bomb:Aaron Patterson2014-04-091-1/+2
|
* fix bind collecting for mysqlAaron Patterson2014-04-091-1/+0
|
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-091-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.2Rafael Mendonça França2014-04-091-0/+1
| |
| * sprockets-rails was releasedRafael Mendonça França2014-04-041-1/+0
| |
| * Make possible to use sprockets-rails 2.1Rafael Mendonça França2014-04-041-0/+1
| |
* | working against arel/collector branchAaron Patterson2014-04-091-1/+1
| |
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-261-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (55 commits) [ci skip] Move association class method notes extract common code in `uuid_test.rb`. move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`. [ci skip] remove guide section on models in migrations test case for custom PostgreSQL enum type. Remove inclusion of rubysl gem for rbx on generated Gemfile let `insert_record` actuall save the object. [skip ci] Fix test name typo in app generator tests. travis s/2.1.0/2.1.1 Bump version of bcrypt gem Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns Optimize getting started guide images, and use png instead of jpg :scissors: [ci skip] Point master changelogs to 4-1-stable branch Add missing parantheses in index_exists? `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191. [skip ci] Standardized punctuation. [skip ci] Fix typo in link_to :method option description refactor, with_locale is not needed because I18n is mocked. Fix ActionView label translation for more than 10 nested elements ...
| * Bump version of bcrypt gemT.J. Schuck2014-02-251-1/+5
| |
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-171-6/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (311 commits) Add a missing changelog entry for #13981 and #14035 Revert "Fixed plugin_generator test" implements new option :month_format_string for date select helpers [Closes #13618] add factory methods for empty alias trackers guarantee a list in the alias tracker so we can remove a conditional stop exposing table_joins make most parameters to the AliasTracker required make a singleton for AssociationScope pass the association and connection to the scope method pass the tracker down the stack and construct it in the scope method clean up add_constraints signature remove the reflection delegate remove klass delegator remove railties changes. fixes #14054 remove chain delegate remove scope_chain delegate Add verb to sanitization note fix path shown in mailer's templates updated Travis build status image url fix guide active_support_core_extensions. add Note to String#indent [ci skip] ... Conflicts: activerecord/lib/active_record/associations/join_dependency.rb activerecord/test/cases/associations/association_scope_test.rb
| * Update Travis settings for RubiniusErik Michaels-Ober2014-02-121-5/+0
| | | | | | | | /cc @brixen
| * Upgraded jquery-rails gem versionUday Kadaboina2014-02-031-1/+1
| |
* | use edge arelAaron Patterson2014-01-151-0/+1
|/
* upgrade SDocXavier Noria2014-01-121-1/+1
| | | | Kudos to @zzak for taking over SDoc and make it work with RDoc 4.
* Only build a ConnectionSpecification if requiredJosé Valim2013-12-241-3/+3
|
* Use the released arel gemRafael Mendonça França2013-12-051-1/+0
|
* Dropped yajl from GemfileGodfrey Chan2013-11-261-1/+0
|
* Add branch to arel in Gemfile so that we can use local repos [ci skip]Carlos Antonio da Silva2013-11-261-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:00:11 +0000