Permalink
Switch branches/tags
Commits on Mar 27, 2017
  1. Merge pull request #28546 from claudiob/drop-j-option

    rafaelfranca committed Mar 27, 2017
    Remove -j (--javascript) option from `rails new`
  2. Apply the log_level default

    rafaelfranca committed Mar 27, 2017
    Since 4.2 the default log level in production is now debug. We removed
    the deprecation in c2e8658
    but we don't reflected the default value. We are not appling it.
    
    Closes #28558
  3. Merge pull request #28050 from namusyaka/avoid-converting-int-into-float

    rafaelfranca committed Mar 27, 2017
    Avoid converting integer as a string into float
  4. Merge pull request #28488 from kamipo/preprocess_association_query_ha…

    rafaelfranca committed Mar 27, 2017
    …ndling
    
    Preprocess association query handling in predicate builder
  5. Merge pull request #27636 from mtsmfm/disable-referential-integrity-w…

    rafaelfranca committed Mar 27, 2017
    …ithout-superuser-privilege-take-2
    
    Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser privileges (take 2)
  6. Merge pull request #28485 from quantumlicht/fix_migrate_with_empty_ve…

    rafaelfranca committed Mar 27, 2017
    …rsion
    
    fix migrate with empty version
  7. Merge pull request #28577 from y-yagi/do_not_display_hidden_namespace…

    rafaelfranca committed Mar 27, 2017
    …s_in_destroy_command_help
    
    Do not show hidden namespaces in destroy commnad help
  8. Use the stale branch

    rafaelfranca committed Mar 27, 2017
    [ci skip]
  9. Merge pull request #28367 from ptoomey3/ignore-disabled-buttons

    tenderlove committed Mar 27, 2017
    Prevent ujs event propagation if element disabled when event chain begins
  10. Merge pull request #28541 from ota42y/fix/gemfile_generator_fix

    eileencodes committed Mar 27, 2017
    ignore system test gems on Gemfile when execute with --skip-test option
  11. Fixes #28359

    Philippe Guay Philippe Guay
    Philippe Guay authored and Philippe Guay committed Mar 20, 2017
    Add stronger assertions to rake migration tasks to make sure the user is providing a numeric VERSION
    An empty string was getting converted to version = 0. This would in turn pass the presence check.
    
    Address linting warning
    
    Add test for rake task and refactor code to meet expectations
    In particular passing VERSION=0 should not raise an error.
    
    Addressed Comments for PR #28485. Trimmed empty lines + change of wording for error message
    
    Adjust test for change of wording in error message
    
    Change condition to follow rails idioms
Commits on Mar 26, 2017
  1. add field ids when generating a scaffold form.

    senny committed Mar 26, 2017
    This is a follow up to a6d065e. When using `form_with` you must supply
    field ids manually. Since the scaffold generator is using labels we
    need to make sure that they are linked up properly.
  2. Load :author_addresses

    yahonda authored and mtsmfm committed Jan 9, 2017
  3. Use `SET CONSTRAINTS` for `disable_referential_integrity` without sup…

    mtsmfm committed Dec 13, 2015
    …eruser privileges (take 2)
    
    Re-create rails#21233
    
    eeac615 was reverted (127509c) because it breaks tests.
    
    ----------------
    
    ref: 72c1557
    
    - We must use `authors` fixture with `author_addresses` because of its foreign key constraint.
    - Tests require PostgreSQL >= 9.4.2 because it had a bug about `ALTER CONSTRAINTS` and fixed in 9.4.2.
Commits on Mar 25, 2017
  1. Bump from h3 to h2 tag

    maclover7 committed Mar 25, 2017
    "3 Days before release" should an h2, like the rest of the day headings.
    All of the steps are h3 tags.
    
    [ci skip]
  2. Small grammar fix

    maclover7 committed Mar 25, 2017
    Add apostrophe.
    
    [ci skip]
  3. Small grammar fix

    maclover7 committed Mar 25, 2017
    Add necessary commas.
    
    [ci skip]
  4. Update middleware list

    maclover7 committed Mar 25, 2017
    Taken from `bin/rails about` run on a v5.1.0.rc1 application.
    
    [ci skip]
  5. Upgrade various Rails 5.0 references to 5.1

    maclover7 committed Mar 25, 2017
    RC1 is out, `5-1-stable` has been created, figured it was time to start
    updating this stuff :)
    
    [ci skip]
  6. Merge pull request #28571 from y-yagi/rename_local_current_user_to_ve…

    kaspth committed Mar 25, 2017
    …rified_user_guide
    
    Rename local variable name `current_user` to `verified_user` [ci skip]
  7. Merge pull request #28570 from kamipo/rename_local_current_user_to_ve…

    kaspth committed Mar 25, 2017
    …rified_user
    
    Rename local variable name `current_user` to `verified_user` [ci skip]
  8. Rename local variable name `current_user` to `verified_user` [ci skip]

    kamipo committed Mar 25, 2017
    Assigning local variable named `current_user` in the condition is
    confusing.
  9. Revert "Merge pull request #28569 from HarryCollins/patch-1"

    kaspth committed Mar 25, 2017
    This reverts commit 296d024, reversing
    changes made to e341d83.
    
    We aren't trying to compare to current_user, we're assigning that variable.
  10. Merge pull request #28569 from HarryCollins/patch-1

    kamipo committed Mar 25, 2017
    Update Action Cable README.md - typo fix [ci skip]
  11. Merge pull request #28568 from y-yagi/fix_doc_format_for_duplicable

    kamipo committed Mar 25, 2017
    Fix doc format for `duplicable?` [ci skip]
  12. Always need to extract `value.bound_attributes` if `value.is_a?(Relat…

    kamipo committed Mar 25, 2017
    …ion)`
    
    Because `RelationHandler` uses `value.arel`.