1. 24 6月, 2013 3 次提交
  2. 23 6月, 2013 3 次提交
    • P
      Setup env and seed_loaded for DatabaseTasks outside load_config · 11ac1e8a
      Piotr Sarnacki 提交于
      Those vars can be used in tasks, which not call load_config.
      11ac1e8a
    • P
      Change a way ActiveRecord's config is prepared for rake tasks · 84fd0aad
      Piotr Sarnacki 提交于
      In commit d1d7c86d 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
      84fd0aad
    • J
      Revert "Merge pull request #11053 from yangchenyun/mine" · e1f4f644
      José Valim 提交于
      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 763635e3, reversing
      changes made to 4f46ef36.
      e1f4f644
  3. 22 6月, 2013 11 次提交
  4. 21 6月, 2013 23 次提交