aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* load the file rather than evalingAaron Patterson2013-06-171-1/+1
|
* Merge pull request #10961 from wangjohn/changing_rails_env_configSantiago Pastorino2013-06-171-24/+7
|\ | | | | Removing a repetitive comment and refactoring the Application class in Railties
| * Removing a repetitive comment and refactoring the Application class inwangjohn2013-06-161-24/+7
| | | | | | | | | | | | | | | | | | Railties. The comment on the +env_config+ method is repetitive, likely to get outdated, and provides no useful information which cannot be gleamed from the code. I'm therefore removing it. I'm also refactoring the check for the presence of a secret_token in the configuration.
* | Merge pull request #10902 from wangjohn/removing_application_singleton_callsSantiago Pastorino2013-06-1712-23/+23
|\ \ | | | | | | Calls to the application constant have been refactored
| * | Calls to the application constant have been refactored to usewangjohn2013-06-1012-23/+23
| | | | | | | | | | | | | | | Rails.application when drawing routes and creating other configurations on the application.
* | | just construct real objects rather than mock and stubAaron Patterson2013-06-171-7/+8
| | |
* | | Merge branch 'master' into mrbrdo-fixserializationAaron Patterson2013-06-17153-573/+1159
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (142 commits) Use Colspan in th Tags Added test for link_to_unless to make sure the result consistency. Escape the string even when the condition of link_to_unless is not satisfied. Add CHANGELOG entry for #10969 Use a case insensitive URI Regexp for #asset_path collection tags accept html attributes as the last element of collection Rewind StringIO instances before be parsed again Use xml instead already parsed xml Updated the doc for const_regexp [ci skip] Make test name descriptive and add reference to original regression commit fixture setup does not rely on `AR::Base.configurations`. regression test + mysql2 adapter raises correct error if conn is closed. cleanup, remove trailing whitespace from AR changelog 'json' gem is no more required under JRuby fix typos Fix AS changelog [ci skip] Update the HTML boolean attributes per the HTML 5.1 spec Changing const_regexp to check for constant name. valid_app_const? -> valid_const? Add CHANGELOG entry for #10740 ...
| * \ \ Merge pull request #10970 from sbagdat/patch-1Rafael Mendonça França2013-06-174-9/+10
| |\ \ \ | | | | | | | | | | Use Colspan in th Tags
| | * | | Use Colspan in th TagsSıtkı Bağdat2013-06-174-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is it more suitable that using ```<th colspan="3">``` instead of three empty ```<th>```? It is simple, but what i am missing about it? Change repetitive th tags to use colspan attribute Update CHANGELOG.md Update CHANGELOG.md
| * | | | Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-172-1/+6
| |\ \ \ \ | | |/ / / | |/| | | Always escape the result of link_to_unless method
| | * | | Added test for link_to_unless to make sure the result consistency.dtaniwaki2013-06-161-0/+5
| | | | |
| | * | | Escape the string even when the condition of link_to_unless is not satisfied.dtaniwaki2013-06-161-1/+1
| | | | |
| * | | | Merge pull request #10942 from yangchenyun/mineYves Senn2013-06-161-2/+2
| |\ \ \ \ | | |/ / / | |/| | | correct documentation about active_record.default_timezone
| | * | | correct documentation about active_record behaviorSteven Yang2013-06-151-2/+2
| | | | |
| * | | | Add CHANGELOG entry for #10969Rafael Mendonça França2013-06-161-0/+21
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge pull request #10969 from davidcelis/case-insensitive-asset-pathRafael Mendonça França2013-06-162-3/+6
| |\ \ \ \ | | |_|_|/ | |/| | | Use a case insensitive URI Regexp for #asset_path
| | * | | Use a case insensitive URI Regexp for #asset_pathDavid Celis2013-06-162-3/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context: https://gist.github.com/radar/5793814 The `URI_REGEXP` that various AssetUrl helpers use is currently case sensitive when checking for a URI scheme. This means if you try to pass a URL like `HTTP://www.example.com/path/to/image.jpg`, you end up with a bogus asset path: `/assets/HTTP://www.example.com/path/to/image.jpg`. URLs are case insensitive, so this regexp should be as well. Signed-off-by: David Celis <me@davidcel.is>
| * | | Merge pull request #10964 from nashby/collection-html-optionsRafael Mendonça França2013-06-163-1/+23
| |\ \ \ | | | | | | | | | | collection tags accept html attributes as the last element of collection
| | * | | collection tags accept html attributes as the last element of collectionVasiliy Ermolovich2013-06-163-1/+23
| |/ / /
| * | | Merge pull request #10960 from pacoguzman/fix-build-due-to-10727Rafael Mendonça França2013-06-155-1/+6
| |\ \ \ | | | | | | | | | | Fix build after #10727
| | * | | Rewind StringIO instances before be parsed againPaco Guzman2013-06-165-0/+5
| | | | |
| | * | | Use xml instead already parsed xmlPaco Guzman2013-06-161-1/+1
| |/ / /
| * | | Merge pull request #10727 from pacoguzman/fix-xml-mini-testsRafael Mendonça França2013-06-156-6/+6
| |\ \ \ | | | | | | | | | | Fix XmlMini different backends tests
| | * | | Compare with the parsed result from REXML backendPaco Guzman2013-05-226-6/+6
| | | | |
| * | | | Merge pull request #10954 from arunagw/update_docs_for_const_regexpXavier Noria2013-06-151-1/+3
| |\ \ \ \ | | | | | | | | | | | | Updated the doc for const_regexp [ci skip]
| | * | | | Updated the doc for const_regexp [ci skip]Arun Agrawal2013-06-151-1/+3
| |/ / / /
| * | | | Merge pull request #10949 from alexpeattie/update_html_boolean_attrsRafael Mendonça França2013-06-153-4/+14
| |\ \ \ \ | | | | | | | | | | | | Update HTML boolean attributes per the HTML 5.1 spec
| | * | | | Update the HTML boolean attributes per the HTML 5.1 specAlex Peattie2013-06-143-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add attributes `allowfullscreen`, `default`, `inert`, `sortable`, `truespeed`, `typemustmatch`. - Fix attribute `seamless` (previously misspelled `seemless`). - Use `assert_dom_equal` instead of `assert_equal` in test.
| * | | | | Merge pull request #10533 from vipulnsward/fix_testRafael Mendonça França2013-06-151-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix test, addresss => address
| | * | | | | Make test name descriptive and add reference to original regression commitVipul A M2013-06-151-1/+2
| | | | | | |
| * | | | | | Merge pull request #10907 from senny/fixtures_and_database_urlYves Senn2013-06-153-4/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | fixture setup does not rely on `AR::Base.configurations`.
| | * | | | | | fixture setup does not rely on `AR::Base.configurations`.Yves Senn2013-06-153-4/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As you can also configure your database connection using `ENV["DATABASE_URL"]`, the fixture setup can't reply on the `.configurations` Hash. As the fixtures are only loaded when ActiveRecord is actually used (`rails/test_help.rb`) it should be safe to drop the check for an existing configuration.
| * | | | | | Merge pull request #10955 from arunagw/jruby_json_not_requiredRafael Mendonça França2013-06-151-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 'json' gem is no more required under JRuby
| | * | | | | | 'json' gem is no more required under JRubyArun Agrawal2013-06-151-1/+0
| | | | | | | |
| * | | | | | | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-153-3/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | regression test + mysql2 adapter raises correct error if conn is closed.
| | * | | | | | | regression test + mysql2 adapter raises correct error if conn is closed.Yves Senn2013-06-153-3/+36
| |/ / / / / / /
| * | | | | | | cleanup, remove trailing whitespace from AR changelogYves Senn2013-06-151-4/+4
| | | | | | | |
| * | | | | | | Merge pull request #10953 from acapilleri/fix_typosYves Senn2013-06-151-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | fix typos
| | * | | | | | fix typosAngelo Capilleri2013-06-151-1/+1
| | | | | | | |
| * | | | | | | Fix AS changelog [ci skip]Carlos Antonio da Silva2013-06-141-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #10950 from appscape-forks/fix-wrong-method-nameCarlos Antonio da Silva2013-06-141-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix wrong method name
| | * | | | | | | valid_app_const? -> valid_const?Martin Schürrer2013-06-151-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #10946 from arunagw/build_fix_for_object_const_get_nilXavier Noria2013-06-141-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | We need to check exception name to be nil
| | * | | | | | Changing const_regexp to check for constant name.Arun Agrawal2013-06-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to return Regexp.escape(camel_cased_word) if the split is blank.
| * | | | | | | Add CHANGELOG entry for #10740Rafael Mendonça França2013-06-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge pull request #10740 from mrsimo/hash-with-indifferent-access-selectRafael Mendonça França2013-06-142-0/+34
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | HashWithIndifferentAccess#select working as intended
| | * | | | | | | HashWithIndifferentAccess#select working as intendedAlbert Llop2013-05-232-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, #reject returned a HashWithIndifferentAccess, whereas #select returned a Hash. Now #select also returns a HashWithIndifferentAccess.
| * | | | | | | | Merge pull request #10898 from dmitry/find_first_refactor_duplicationRafael Mendonça França2013-06-141-11/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactored ActiveRecord `first` method to get rid of duplication.
| | * | | | | | | | rename method `find_first_records` to `find_first_with_limit`Dmitry Polushkin2013-06-101-3/+3
| | | | | | | | | |
| | * | | | | | | | Refactored ActiveRecord `first` method to get rid of duplication.Dmitry Polushkin2013-06-091-11/+10
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 15:49:34 +0000