aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11105 from mariozig/correct-documentationCarlos Antonio da Silva2013-06-252-2/+2
|\ | | | | Fix typo in docs. HABTM associations should use a pluralized name [ci skip]
| * Fix typo in docs. HABTM associations should use a pluralized namemariozig2013-06-252-2/+2
| |
* | Merge pull request #11000 from sbeckeriv/accept_headerCarlos Antonio da Silva2013-06-253-1/+15
|\ \ | |/ |/| | | Fix undefined method `ref' for nil:NilClass for bad accept headers
| * Fix undefined method `ref' for nil:NilClass for bad accept headersStephen Becker IV2013-06-193-1/+11
| |
* | Merge pull request #11046 from arunagw/verbose_mode_onCarlos Antonio da Silva2013-06-255-5/+7
|\ \ | | | | | | Verbose mode on when running tests
| * | Adding verbose in isolated test.Arun Agrawal2013-06-215-5/+5
| | |
| * | Adding verbose mode to test_with_ar_integrationArun Agrawal2013-06-211-0/+2
| | |
* | | Merge branch 'error-explanation'Carlos Antonio da Silva2013-06-252-6/+6
|\ \ \ | | | | | | | | | | | | Closes #11077 [ci skip]
| * | | Fix another "error_explanation" css class in guides [ci skip]Carlos Antonio da Silva2013-06-251-3/+3
| | | |
| * | | change id="errorExplanation" to id="error_explanation" to match the ↵Luzi Humm2013-06-251-3/+3
|/ / / | | | | | | | | | generated files
* | | Merge pull request #11096 from akalyaev/remove-unnecessary-mappingCarlos Antonio da Silva2013-06-251-5/+5
|\ \ \ | | | | | | | | removed unnecessary mapping for on options
| * | | removed unnecessary mapping for on optionsAnton Kalyaev2013-06-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right before that in `assert_valid_transaction_action` method we make sure that `options[:on]` contains values from `ACTIONS` array (`[:create, :destroy, :update]`) and nothing more (i.e. it could not contain strings or something else, otherwise the error is raised). Also I've polished some docs.
* | | | Merge pull request #11095 from vipulnsward/rails_4_docsXavier Noria2013-06-253-5/+8
|\ \ \ \ | | | | | | | | | | We are now rails 4
| * | | | We are now rails 4 [skip-ci]Vipul A M2013-06-263-5/+8
| | | | |
* | | | | Merge pull request #11098 from vredniy/masterRafael Mendonça França2013-06-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed menu section's location (guides)
| * | | | | Fixed menu section's location (guides)Dima Zudochkin2013-06-251-1/+1
| | | | | |
* | | | | | Merge pull request #11097 from ryancw/patch-2Rafael Mendonça França2013-06-251-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | ActionView flows comment typo
| * | | | | Comment typoRyan Williams2013-06-251-2/+2
|/ / / / /
* | | | | Merge pull request #11093 from nolman/restoring-scaffold-generationRafael Mendonça França2013-06-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | restore correct scaffold generation
| * | | | restore correct scaffold generationNolan Evans2013-06-251-1/+1
|/ / / /
* | | | Change reference to all to scoped instead.Steve Klabnik2013-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In #11088, `#to_a` was added to remove a deprecation around using `#all`. I merged, but it really should have been `#scoped` instead, as that's the preferred replacement.
* | | | Merge pull request #11088 from nolman/nolman/scaffold-fixSteve Klabnik2013-06-251-1/+1
|\ \ \ \ | |/ / / |/| | | fix deprecation warning in scaffold controllers
| * | | fix deprecation warning in scaffold controllersNolan Evans2013-06-251-1/+1
|/ / /
* | | Merge pull request #11084 from arkiver/masterYves Senn2013-06-253-3/+3
|\ \ \ | | | | | | | | Fixing issue #11083
| * | | Fixing Issue #11083Akshay Khole2013-06-253-3/+3
|/ / / | | | | | | | | | Removing other occurrences of `the` appearing twice
* | | remove trailing whitespace from Active Record CHANGELOGYves Senn2013-06-251-1/+1
| | |
* | | Clarify what arguments are passed to redirect blocks - fixes #11056Andrew White2013-06-251-3/+3
| | |
* | | Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-252-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856
* | | test-case => failingYves Senn2013-06-251-0/+13
| | |
* | | Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-caseGuillermo Iguaran2013-06-242-1/+15
|\ \ \ | | | | | | | | Flag cookies as secure with ignore case in ActionDispatch::SSL
| * | | Flag cookies as secure with ignore case in ActionDispatch::SSLYamagishi Kazutoshi2013-06-242-1/+15
| | | |
* | | | Merge pull request #11065 from gbuesing/hstsfixGuillermo Iguaran2013-06-242-2/+6
|\ \ \ \ | | | | | | | | | | ActionDispatch:SSL: don't include STS header in non-https responses
| * | | | ActionDispatch:SSL: don't include STS header in non-https responsesGeoff Buesing2013-06-232-2/+6
| | | | |
* | | | | Add CHANGELOG entry for #10971Rafael Mendonça França2013-06-241-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Conflicts: actionpack/CHANGELOG.md
* | | | | Merge pull request #11075 from vipulnsward/remove_recordYves Senn2013-06-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Remove `another_contract` as it isn't being used
| * | | | Fix `another_contract` not being used warningVipul A M2013-06-241-1/+1
|/ / / /
* | | | test-case to prevent regressions described in #10901.Jared Armstrong2013-06-241-0/+27
| | | |
* | | | Merge pull request #11067 from rajars2576/fix_older_rocketGuillermo Iguaran2013-06-233-20/+20
|\ \ \ \ | |/ / / |/| | | replace all older rocket sign to new ":" from examples of active record ...
| * | | replace all older rocket sign to new ":" from examples of active record and ↵Rajarshi Das2013-06-243-20/+20
|/ / / | | | | | | | | | active models
* | | Setup env and seed_loaded for DatabaseTasks outside load_configPiotr Sarnacki2013-06-231-2/+3
| | | | | | | | | | | | Those vars can be used in tasks, which not call load_config.
* | | Change a way ActiveRecord's config is prepared for rake tasksPiotr Sarnacki2013-06-231-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d1d7c86d0 I moved setting migrations paths into activerecord's railtie to remove Rails dependency on databases.rake. However, it introduced a regression, ENGINE_PATH was not available at the moment, so engine's migrations where not added properly to paths. Fix was added at 97a4a771, but it changes a way things work from using ENGINE_PATH to APP_RAKEFILE. Additionally, the config runs when the code loads, while previously it ran in the db:load_config rake task In order to make it more in pair with original version this commit changes the config to run only on load_config task. This code uses the fact that defining a task in rake does not overwrite, but only appends. It also allows to get back to checking for ENGINE_PATH
* | | Revert "Merge pull request #11053 from yangchenyun/mine"José Valim2013-06-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those two files are required by active_support/rails.rb loaded in active_model.rb It is common to require common dependencies on the root files to avoid boilerplate in each file. This reverts commit 763635e30f17800ebc0a8ae98d780edc8ebfb4e5, reversing changes made to 4f46ef36aaef217834f3f96d3689d32f6a6761ea.
* | | test-case to prevent regressions on `Association#build` with an Array.Yves Senn2013-06-221-0/+10
| | | | | | | | | | | | Closes #11026
* | | Merge pull request #11053 from yangchenyun/mineYves Senn2013-06-221-0/+2
|\ \ \ | | | | | | | | Add explicit dependencies of ActiveSupport to enable independent usage of ActiveModel::Name
| * | | add explicit AS dependencies for ActiveModel::NamingSteven Yang2013-06-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two missing ActiveSupport dependencies to use ActiveModel::Name class or ActiveModel::Naming module independently. Missing dependencies for Module#delegate defined in `active_support/core_ext/module/delegation`, used at [L148](https://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb#L148) Missing dependencies for Object#blank? defined in `active_support/core_ext/object/blank`, used at [L131](https://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb#L131)
* | | | Merge pull request #10796 from neerajdotname/10669Jon Leighton2013-06-223-2/+19
|\ \ \ \ | | | | | | | | | | flatten merged join_values before building the joins
| * | | | flatten merged join_values before building the joinsNeeraj Singh2013-06-223-2/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10669 While joining_values special treatment is given to string values. By flattening the array it ensures that string values are detected as strings and not arrays.
* | | | Merge pull request #11050 from robin850/remove-rails-test-mentionCarlos Antonio da Silva2013-06-211-2/+0
|\ \ \ \ | | | | | | | | | | Remove code related to the rails test command
| * | | | Remove code related to the rails test commandRobin Dupret2013-06-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Remove the mention about this command in the rails command's help message and remove the "t" alias related to it.
* | | | | Merge pull request #11051 from neerajdotname/10509fJon Leighton2013-06-213-1/+25
|\ \ \ \ \ | |/ / / / |/| | | | do not load all child records for inverse case
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 20:38:44 +0000