| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge pull request #8598 from NARKOZ/refactor-highlight | Santiago Pastorino | 2012-12-26 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | refactor highlight method: return fast if text or phrases are blank | |||||
| | * | | | | fetch highlighter option only when needed | Nihad Abbasov | 2012-12-24 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Revert the change at ActiveModel::Errors#add_on_blank and fix in the | Rafael Mendonça França | 2012-12-26 | 3 | -14/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right place. The EachValidator#validate already handle :allow_blank and :allow_nil, correctly. Closes #8622. Fix #8621. | |||||
| * | | | | | Tests and fix for validates_presence of :allow_nil, :allow_blank | Colin Kelley | 2012-12-26 | 2 | -1/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb | |||||
| * | | | | | Note about migration timestamps. | Steve Klabnik | 2012-12-26 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should mention that the ordering matters with regards to timestamps, and not imply that it's just for uniqueness purposes. Closes #8610. | |||||
| * | | | | | Consistent use of single and double quotes | Rafael Mendonça França | 2012-12-26 | 1 | -10/+10 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #8616 from senny/8612_respect_yaml_keywords | Rafael Mendonça França | 2012-12-26 | 4 | -7/+48 | |
| |\ \ \ \ \ | | | | | | | | | | | | | quote column names in generated fixture files | |||||
| | * | | | | | quote column names in generated fixture files | Yves Senn | 2012-12-26 | 4 | -7/+48 | |
| | | | | | | | ||||||
| * | | | | | | Fix CHANGELOG style [ci skip] | Rafael Mendonça França | 2012-12-26 | 2 | -6/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5100 from ↵ | Rafael Mendonça França | 2012-12-26 | 3 | -6/+29 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | paukul/validate_on_condition_on_transaction_callbacks Validate :on option on after_commit and after_rollback callbacks | |||||
| | * | | | | | | validate :on option on after_commit and after_rollback callbacks | Pascal Friederich | 2012-12-26 | 3 | -6/+29 | |
| | | | | | | | | ||||||
| * | | | | | | | We need to check explictly that env['action_dispatch.show_exceptions'] | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is false. If it is nil we can't raise the exception | |||||
| * | | | | | | | Merge pull request #8600 from shime/patch-1 | Rafael Mendonça França | 2012-12-26 | 1 | -4/+3 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | more descriptive return parameters | |||||
| | * | | | | | | | more descriptive return parameters | Hrvoje Šimić | 2012-12-26 | 1 | -4/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Revert "Ignore /bin on new apps" -- given the move to default binstubs, we ↵ | David Heinemeier Hansson | 2012-12-26 | 1 | -4/+3 | |
| | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | want you to check those in! This reverts commit 35c554f0bf518e1068e79002a462c3deba649e9b. | |||||
| * | | | | | | | Merge pull request #8608 from ↵ | Rafael Mendonça França | 2012-12-25 | 2 | -1/+19 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | senny/8576_cant_inherit_from_deprecated_buffered_logger deprecation warning when BufferedLogger is instantiated | |||||
| | * | | | | | | | deprecation warning when BufferedLogger is instantiated | Yves Senn | 2012-12-25 | 2 | -1/+19 | |
| | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #8609 from senny/buffered_logger_documentation | Guillermo Iguaran | 2012-12-25 | 3 | -5/+5 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | replace AS::BufferedLogger doc mentions with AS::Logger | |||||
| | * | | | | | | replace AS::BufferedLogger doc mentions with AS::Logger | Yves Senn | 2012-12-25 | 3 | -5/+5 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #8607 from ↵ | Rafael Mendonça França | 2012-12-25 | 2 | -2/+20 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | senny/8576_cant_inherit_from_deprecated_buffered_logger ActiveSupport::BufferedLogger can be subclassed | |||||
| | * | | | | | | ActiveSupport::BufferedLogger can be subclassed | Yves Senn | 2012-12-25 | 2 | -2/+20 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #8592 from rafaelfranca/warning_fix | Guillermo Iguaran | 2012-12-24 | 1 | -1/+5 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove warning of intance variable not initialized | |||||
| | * | | | | | | Remove warning of intance variable not initialized | Rafael Mendonça França | 2012-12-23 | 1 | -1/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #8604 from zoltankiss/minor_fixes | Guillermo Iguaran | 2012-12-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | minor grammar fix | |||||
| | * | | | | | | | minor grammar fix | Zoltan Kiss | 2012-12-24 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
| * | | / / / / | silences "possibly useless use of :: in void context" warnings | Xavier Noria | 2012-12-24 | 1 | -7/+3 | |
| | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AS utility silence_warnings does not really silence this one, because it is issued at parse-time. It seemed to in some places because the constant was the only expression in the block and therefore it was its return value, that could potentially be used by silence_warnings are return value of the yield call. To bypass the warning we assign to a variable. The chosen variable is "_" because it is special-cased in parse.c not to issue an "assigned but unused variable" warning in turn. | |||||
| * | | | | | | Merge pull request #8601 from amatsuda/chmod_x | Rafael Mendonça França | 2012-12-24 | 2 | -0/+0 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | chmod -x from non-script files | |||||
| | * | | | | | chmod -x from non-script files | Akira Matsuda | 2012-12-24 | 2 | -0/+0 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #8595 from amatsuda/regex_warning | Rafael Mendonça França | 2012-12-23 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | "warning: ambiguous first argument; put parentheses or even spaces" | |||||
| | * | | | | | "warning: ambiguous first argument; put parentheses or even spaces" | Akira Matsuda | 2012-12-24 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #8594 from amatsuda/rm_sqlite2 | Guillermo Iguaran | 2012-12-23 | 1 | -13/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | I don't think we're supporting SQLite 2 | |||||
| | * | | | | | we're not supporting SQLite 2 | Akira Matsuda | 2012-12-24 | 1 | -13/+5 | |
| | |/ / / / | ||||||
| * | | | | | Explicit options should have precedence over railsrc on the `rails new` | Rafael Mendonça França | 2012-12-24 | 2 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command Closes #8545 | |||||
| * | | | | | Merge pull request #8593 from shime/master | Rafael Mendonça França | 2012-12-23 | 1 | -2/+0 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | another little documentation fix | |||||
| | * | | | | remove duplication from Rails::Application docs | Hrvoje Šimić | 2012-12-24 | 1 | -2/+0 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #8588 from marcandre/fix_reversible | Carlos Antonio da Silva | 2012-12-23 | 5 | -9/+24 | |
| |\ \ \ \ | | | | | | | | | | | Fix Migration#reversible by not using `transaction`. | |||||
| | * | | | | Fixes for PR [#8267] | Marc-Andre Lafortune | 2012-12-22 | 5 | -9/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix Migration#reversible by not using `transaction`. * Adapt mysql adapter to updated api for remove_column * Update test after aedcd683684d08eaf30623a4b48ce31a31426372 | |||||
| * | | | | | Fix spacing regression in scaffold generator | Yehuda Katz | 2012-12-22 | 1 | -1/+3 | |
| | | | | | | ||||||
| * | | | | | Fix syntax error in controller template | Guillermo Iguaran | 2012-12-22 | 1 | -4/+12 | |
| | | | | | | ||||||
| * | | | | | adds kindlerb to the :doc bundle group for guides generation | Xavier Noria | 2012-12-22 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Ignore /bin on new apps | José Valim | 2012-12-22 | 1 | -3/+4 | |
| | | | | | | ||||||
| * | | | | | Forgot to check in railties fixture for binstubs | Yehuda Katz | 2012-12-22 | 1 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | Add --no-html to scaffold generator | Yehuda Katz | 2012-12-22 | 5 | -8/+54 | |
| | | | | | | ||||||
| * | | | | | Detect rbenv and update the shebang | Yehuda Katz | 2012-12-22 | 2 | -1/+18 | |
| | | | | | | ||||||
| * | | | | | Install binstubs by default | Yehuda Katz | 2012-12-22 | 2 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #8085 from acapilleri/format_never_nil | Guillermo Iguaran | 2012-12-22 | 4 | -3/+28 | |
| |\ \ \ \ \ | | | | | | | | | | | | | if format is unknown NullMimeTypeObject is returned | |||||
| | * | | | | | return Mime::NullType if format is unknown | Angelo Capilleri | 2012-12-22 | 4 | -3/+28 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a request has an unknown format, the methods html?, xml?, json? ...etc not raise an Exception. This patch add a class Mime::NullType, that is returned when request.format is unknown and it responds false to the methods that ends with '?' and true to 'nil?'. It refers to #7837, this issue is considered a improvement not a bug. | |||||
| * | | | | | Merge pull request #8586 from balexand/cache_digests_regex | Rafael Mendonça França | 2012-12-21 | 3 | -2/+12 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Digestor explicit dependency should not contain trailing whitespace | |||||
| | * | | | | Digestor explicit dependency should not contain trailing whitespace | Brian Alexander | 2012-12-21 | 3 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | test for rails/rails#8586 | |||||
| * | | | | | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵ | Jeremy Kemper | 2012-12-21 | 25 | -724/+4 | |
| | | | | | | | | | | | | | | | | | | | | | with Rails 4.0. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |