aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21995 from tak1n/masterJon Moss2016-01-101-8/+35
|\
| * fix doc for rails custom configuration through config_for [skip ci]Benny Klotz2015-12-031-2/+2
| * Updated existing custom configuration for rails 5 where `config.x`Benny Klotz2015-10-191-8/+35
* | Merge pull request #22993 from akshay-vishnoi/travis-updateMatthew Draper2016-01-101-1/+1
|\ \
| * | Update postgresql version to 9.4 for travis.Akshay Vishnoi2016-01-101-1/+1
* | | Merge pull request #22992 from akshay-vishnoi/fix-docsSean Griffin2016-01-092-2/+2
|\ \ \ | |/ / |/| |
| * | [ci skip] fix typoAkshay Vishnoi2016-01-102-2/+2
* | | Split out token `if` tests to trigger `before_create`.Kasper Timm Hansen2016-01-091-1/+5
* | | Revert "Switch `has_secure_token` to `before_save`."Kasper Timm Hansen2016-01-091-4/+3
* | | Switch `has_secure_token` to `before_save`.Kasper Timm Hansen2016-01-091-3/+4
* | | Add conditional_token to users.Kasper Timm Hansen2016-01-091-0/+1
* | | Merge pull request #20835 from glittershark/if-and-unless-in-secure-tokenKasper Timm Hansen2016-01-094-2/+40
|\ \ \ | |/ / |/| |
| * | Support :if and :unless in has_secure_tokenGriffin Smith2016-01-094-2/+40
|/ /
* | Merge pull request #22703 from joshsoftware/rake-log-clearKasper Timm Hansen2016-01-094-10/+33
|\ \
| * | rake log:clear task updated refs[#22544]Pramod2016-01-094-10/+33
* | | [ci skip] Clarify some Minitest origins.Kasper Timm Hansen2016-01-091-0/+2
* | | Extract line filtering to Railties.Kasper Timm Hansen2016-01-094-64/+69
* | | Merge pull request #22988 from y-yagi/match_environment_variable_name_and_err...Richard Schneeman2016-01-091-1/+1
|\ \ \ | |/ / |/| |
| * | match the environment variable name that actually checking and error messageyuuji.yaginuma2016-01-091-1/+1
* | | Merge pull request #22986 from yui-knk/fix_automatic_inverse_of_commentप्रथमेश Sonpatki2016-01-091-1/+1
|\ \ \ | |/ / |/| |
| * | [ci skip] `automatic_inverse_of` returns `false` not `nil` (document fix)yui-knk2016-01-091-1/+1
* | | Merge pull request #22987 from prathamesh-sonpatki/add-missing-changelong-for...Richard Schneeman2016-01-081-0/+8
|\ \ \ | |/ / |/| |
| * | Added missing CHANGELOG entry for https://github.com/rails/rails/pull/22976Prathamesh Sonpatki2016-01-091-0/+8
|/ /
* | Merge pull request #22976 from schneems/schneems/schema-migration-primary-keySean Griffin2016-01-082-3/+3
|\ \
| * | Get update_attributes working with SchemaMigrationschneems2016-01-082-3/+3
* | | Fix the broken buildSean Griffin2016-01-081-0/+2
* | | Merge pull request #22984 from akshay-vishnoi/fix-docsRichard Schneeman2016-01-081-1/+1
|\ \ \
| * | | [ci skip] Fix typo Renderering --> RenderingAkshay Vishnoi2016-01-091-1/+1
|/ / /
* | | Refactor tz aware types, add support for PG rangesSean Griffin2016-01-085-8/+67
* | | Merge pull request #22967 from schneems/schneems/generic-metadataSean Griffin2016-01-0817-14/+253
|\ \ \
| * | | Fixing tests and re-locating error checking.schneems2016-01-085-16/+17
| * | | Fix kwarg to not have circular dependencyschneems2016-01-081-1/+1
| * | | Use hash like syntax for InternalMetadataschneems2016-01-086-14/+12
| * | | Add EnvironmentMismatchErrorschneems2016-01-082-4/+25
| * | | Use `key` as primary key in schema.schneems2016-01-081-1/+1
| * | | [ci skip] Add comment to remove silenced code.schneems2016-01-071-0/+1
| * | | Prevent destructive action on production databaseschneems2016-01-0716-14/+232
* | | | Merge pull request #22977 from rails/revert-22934-masterDavid Heinemeier Hansson2016-01-0815-46/+36
|\ \ \ \
| * | | | Revert "Move async execution from celluloid to concurrent-ruby"David Heinemeier Hansson2016-01-0815-46/+36
|/ / / /
* | | | Merge pull request #22934 from mperham/masterDavid Heinemeier Hansson2016-01-0815-36/+46
|\ \ \ \ | |_|/ / |/| | |
| * | | don't need explicit dep and a pretty neat pickMike Perham2016-01-052-2/+1
| * | | Use Module#thread_mattr_accessorMike Perham2016-01-051-8/+6
| * | | Remove celluloid referencesMike Perham2016-01-056-6/+1
| * | | Move async execution from celluloid to concurrent-rubyMike Perham2016-01-059-30/+48
* | | | [doc] The capture method isn't always used inside views to create a variableAkira Matsuda & saya2016-01-081-2/+2
* | | | Merge pull request #22973 from kamipo/fix_select_values_method_signatureRafael França2016-01-082-4/+4
|\ \ \ \
| * | | | Fix `select_values` method signature for consistencyRyuta Kamizono2016-01-082-4/+4
* | | | | Merge pull request #22971 from kamipo/insert_sql_is_almost_same_as_insertRafael França2016-01-084-25/+2
|\ \ \ \ \
| * | | | | `{update|delete}_sql` are almost the same as `{update|delete}`Ryuta Kamizono2016-01-084-25/+2
* | | | | | Merge pull request #22972 from prathamesh-sonpatki/fix-typoRafael França2016-01-081-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 08:53:19 +0000