Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 2, 2012
  1. Vijay Dev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_controller/metal/mime_responds.rb
    	activerecord/lib/active_record/attribute_methods.rb
    	guides/source/working_with_javascript_in_rails.md
Commits on Oct 30, 2012
  1. Alexey Gaziev
Commits on Oct 29, 2012
  1. atomicc.rb: Don't assume we may chown/chmod a file.

    Daniele Sluijters authored
    Previously this code just assumed it is capable of changing the file
    ownership, both user and group. This will fail in a lot of scenario's
    unless:
    * The process is run as a superuser (root);
    * The owning user and group are already set to the user and group we're
      trying to chown to;
    * The user chown'ing only changes the group to another group it is a
      member of.
    If either of those conditions are not met the filesystem will simply
    deny the operation throwing an error.
    
    It is also not always possible to do a chmod, there might be a SELinux
    policy or another limitation preventing the user to change the file
    mode. To this end the chmod call has also been added to the rescue
    block.
    
    I've also added a little comment above the chmod command that doing a
    chmod on a file which has an ACL set will cause the ACL to be
    recalculated / modified.
Commits on Oct 27, 2012
  1. pmahoney

    Replace flow-control exception with explicit test.

    pmahoney authored
    It was noticed while profiling 'assets:precompile' in JRuby that
    exception creation was consuming a large portion of time, and
    some of that was due to File.atomic_write.
    
    Testing first with File.exists? eliminates the need for an exception
    which should be a perfomrance improvement on both JRuby and MRI.
    In this case, the stat() isn't even extra overhead, since it is always
    called.
Commits on Oct 24, 2012
  1. Geoffrey Roguelon
Commits on Oct 22, 2012
  1. Francesco Rodríguez
Commits on Oct 21, 2012
  1. Avner Cohen

    More changes around 1.9 hash syntax

    AvnerCohen authored
    Added missing space in previous hash related commit
  2. Vijay Dev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	activesupport/lib/active_support/core_ext/hash/slice.rb
    	guides/source/active_support_core_extensions.md
Commits on Oct 20, 2012
  1. Avner Cohen
Commits on Oct 16, 2012
  1. Xavier Noria

    Revert "remove unnecessary object/conversions file"

    fxn authored
    This file is used at least by Active Merchant, its existence
    is maybe not necessary but no big deal either.
    
    This reverts commit ae9b3d7.
Commits on Oct 12, 2012
  1. Rafael Mendonça França

    Merge pull request #7007 from Mik-die/hash_extract

    rafaelfranca authored
    make Hash#extract! more symmetric with Hash#slice
Commits on Oct 9, 2012
  1. Xavier Noria
  2. Xavier Noria

    keys.include? -> key?

    fxn authored
Commits on Oct 7, 2012
  1. Mikhail Dieterle
Commits on Oct 2, 2012
  1. Nihad Abbasov
Commits on Sep 24, 2012
  1. Adam Stankiewicz
Commits on Sep 21, 2012
  1. Vijay Dev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
    	activesupport/lib/active_support/configurable.rb
    	activesupport/lib/active_support/core_ext/module/deprecation.rb
    	guides/source/action_controller_overview.md
    	guides/source/active_support_core_extensions.md
    	guides/source/ajax_on_rails.textile
    	guides/source/association_basics.textile
    	guides/source/upgrading_ruby_on_rails.md
    
    While resolving conflicts, I have chosen to ignore changes done in
    docrails at some places - these will be most likely 1.9 hash syntax
    changes.
Commits on Sep 20, 2012
  1. Carlos Antonio da Silva
  2. Carlos Antonio da Silva
  3. Jeremy Kemper

    Merge pull request #7613 from marcandre/delegate_to_class

    jeremy authored
    Nice and easy delegation to the class
  4. Jo Liss
Commits on Sep 19, 2012
  1. Francesco Rodríguez
Commits on Sep 18, 2012
  1. Innokenty Mikhailov

    Date.beginning_of_week thread local and beginning_of_week application…

    gregolsen authored
    … config option added (default is Monday)
Commits on Sep 15, 2012
  1. Steve Klabnik

    Improve Process::Status#to_json

    steveklabnik authored
    Because Process::Status has no instance_variables, the
    ActiveSupport version of #to_json produces {}, which isn't good.
    
    Therefore, we implement our own #as_json, which makes it useful
    again.
    
    Fixes #4857
Commits on Sep 13, 2012
  1. Pranas Kiziela

    Allow passing block to deep_merge and deep_merge!

    pranas authored
    Hash#merge accepts block that you can use to customize how hash values
    are merged. This change makes merge and deep_merge compatible.
  2. Rafael Mendonça França
  3. Piotr Niełacny

    Change ActiveSupport::Deprecation to class.

    LTe authored
    ActiveSupport::Deprecation is now a class rather than a module. You can
    get instance of ActiveSupport::Deprecation calling #instance method.
    
      ActiveSupport::Deprecation.instance
    
    But when you need to get new object od ActiveSupport::Deprecation you
    need to just call #new.
    
      @instance = ActiveSupport::Deprecation.new
    
    Since you can create a new object, you can change the version and the
    name of the library where the deprecator concerned.
    
      ActiveSupport::Deprecation.new('2.0', 'MyGem')
    
    If you need use another deprecator instance you can select it in the
    options of deprecate method.
    
      deprecate :method, :deprecator => deprecator_instance
    
    Documentation has been updated.
  4. Francesco Rodríguez
Commits on Sep 12, 2012
  1. Francesco Rodríguez
  2. Francesco Rodríguez
  3. Marc-André Lafortune
Commits on Sep 9, 2012
  1. Kalys Osmonov
Commits on Sep 1, 2012
  1. Vijay Dev
  2. Vijay Dev

    copy edits [ci skip]

    vijaydev authored
Commits on Aug 30, 2012
  1. Jeff Shantz
Something went wrong with that request. Please try again.