Commits

Show all
Author Commit Message Labels Comments Date
Jeremy Kemper
Merge branch 'master' into streaming
Santiago Pastorino
Move Date#xmlschema to conversions and add a missing require
Santiago Pastorino
Avoids deprecation warning running tests
Patrik Stenmark
Adds tests for content negotiation change introduced in dc5300adb6d46252c26e Signed-off-by: wycats <wycats@gmail.com>
madjo
ARGV.empty? is useless. If ARGV is empty, ARGV.first != "new" will always be true Signed-off-by: José Valim <jose.valim@gmail.com>
Andrew White
Fix syntax of routing tests so they actually run Signed-off-by: José Valim <jose.valim@gmail.com>
Andrew White
Refactor resource options and scoping. Resource classes are now only responsible for controlling how they are named. All other options passed to resources are pushed out to the scope. Signed-off-by: José Valim <jose.valim@gmail.com>
Wincent Colaiuta
Fixes for "router" and "routes" terminology Commit f7ba614c2db improved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or…
Jeremy Kemper
Merge remote branch 'spastorino/master'
Santiago Pastorino
Add a missing require to allow the usage of Array#to_xml
Andrew White
Refactor recall parameter normalization [#5021 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Santiago Pastorino
Removes the dependency that AMo has on tzinfo [#4979 state:committed]
Santiago Pastorino
Refactor move some date, time and date_time methods to */zones and fixed some requires
Santiago Pastorino
Time#formatted_offset is defined in core_ext/time/conversions [#4979]
Geoff Buesing
Time#as_json: use Time#formatted_offset instead of strftime %z directive, which is non-standard and inaccurate on some platforms (e.g., Mac OS X). [#4979] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Jeremy Kemper
Fix indent
José Valim
Fix routes with :controller segment when namespaced [#5034 state:resolved]
José Valim
reload_routes! was still referencing old Rails::Application.
Santiago Pastorino
bump erubis version to 2.6.6 and thor version to 0.13.7 Signed-off-by: José Valim <jose.valim@gmail.com>
Santiago Pastorino
Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo [#4979 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
Piotr Sarnacki
Unify routes naming by renaming router to routes Signed-off-by: José Valim <jose.valim@gmail.com>
tenderlove
porting session.clear fix to master branch. [#5030 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Santiago Pastorino
AS json refactor, move to_json implementation to core_ext and a cleanup a bit the code
Jeremy Kemper
Bump bundler dependency to 1.0.0.beta.2 or later
José Valim
Avoid calls to Rails::Application since this is not the official API. Your application should *always* reference your application const (as Blog::Application) and Rails.application should be used just internally.
shingara
fix failure if behavior is not define and try use the default Signed-off-by: José Valim <jose.valim@gmail.com>
José Valim
Add the possibility to have several behaviors in AS::Deprecation.
James Le Cuirot
Don't remove scheduled destroys when loading an association. [#4642 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
José Valim
Make relation a private method.
Xavier Noria
Merge remote branch 'rails/master'
  1. Prev
  2. Next