aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9651 from vipulnsward/change_to_each_value_intestCarlos Antonio da Silva2013-03-101-1/+1
|\
| * Change from each to each_value on hash to avoid unused variable warningVipul A M2013-03-111-1/+1
* | Merge pull request #9650 from yahonda/group_by_oracleRafael Mendonça França2013-03-101-2/+2
|\ \
| * | Address ActiveRecord::StatementInvalid: OCIError: ORA-00979Yasuo Honda2013-03-111-2/+2
| |/
* | Merge pull request #9645 from senny/9643_habtm_wrong_table_nameCarlos Antonio da Silva2013-03-101-0/+2
|\ \ | |/ |/|
| * document habtm join-table name with custom prefix [ci skip].Yves Senn2013-03-101-0/+2
|/
* Merge pull request #9638 from siong1987/debuggerCarlos Antonio da Silva2013-03-091-1/+1
|\
| * Make sure that debugger isn't included in production environment.Teng Siong Ong2013-03-091-1/+1
|/
* Change uniq validation with conditions examples to use where with hashesCarlos Antonio da Silva2013-03-092-5/+5
* Merge pull request #9637 from GSI/masterCarlos Antonio da Silva2013-03-091-0/+1
|\
| * included "Montevideo" in list of time zone aliases (closes Issue #9628)Gernot2013-03-091-0/+1
* | Merge pull request #9633 from senny/5321_make_it_lazyCarlos Antonio da Silva2013-03-093-4/+23
|\ \
| * | Uniqueness validation uses a proc to specify the `:conditions` option.Yves Senn2013-03-093-4/+23
* | | Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-errorCarlos Antonio da Silva2013-03-091-1/+1
|\ \ \
| * | | fixes enable_extension bug in postgresql_adapterDarren Woodley2013-03-081-1/+1
* | | | Fix "ActiveRecord" => "Active Record" in changelog [ci skip]Carlos Antonio da Silva2013-03-091-4/+3
| |/ / |/| |
* | | Merge pull request #9371 from benmoss/access-connection-via-classJon Leighton2013-03-097-13/+19
|\ \ \
| * | | Deprecate #connection in favour of accessing it via the classBen Moss2013-03-097-13/+19
* | | | Merge pull request #9626 from dasch/dasch/instrument-strong-paramsJosé Valim2013-03-092-1/+7
|\ \ \ \
| * | | | Use the instrumentation framework to instrument Strong ParamsDaniel Schierbeck2013-03-072-1/+7
* | | | | Fix race condition in testJon Leighton2013-03-091-2/+2
| |/ / / |/| | |
* | | | Merge pull request #9632 from senny/unify_the_changelogsCarlos Antonio da Silva2013-03-094-36/+37
|\ \ \ \
| * | | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].Yves Senn2013-03-094-36/+37
|/ / / /
* | | | Merge pull request #9630 from robertjwhitney/update_collection_docsCarlos Antonio da Silva2013-03-091-2/+2
|\ \ \ \
| * | | | Update documentation for collection<< to reflect << on new records.Robert Whitney2013-03-091-2/+2
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-109-16/+92
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | copy edits [ci skip]Vijay Dev2013-03-102-4/+4
| * | | | fixed typo in strong parameters exampleYves Senn2013-03-091-1/+1
| * | | | strong parameter example for hashes with integer keys.Yves Senn2013-03-091-0/+14
| * | | | Adding a note for :body option in `mail` method.Fabrizio Regini2013-03-081-0/+13
| * | | | fixing typo in the merging scopes sectionNeeraj Singh2013-03-081-4/+3
| * | | | Explained how merging of scope worksNeeraj Singh2013-03-081-0/+56
| * | | | Some copy edit and formatting for upgrading guide.Hendy Tanata2013-03-081-3/+3
| * | | | remove the new metadata note in Rails 4 upgrade guideAlex Robbin2013-03-071-6/+0
| * | | | fixes active_record_querying #pluck exampleawilliams2013-03-071-1/+1
| * | | | Update capture_helper.rbJess Brown2013-03-061-1/+1
| * | | | TypppoAkira Matsuda2013-03-063-4/+4
* | | | | Fix AMo code example indent, add missing author to entry [ci skip]Carlos Antonio da Silva2013-03-091-6/+8
* | | | | Bump up timeoutsJon Leighton2013-03-091-3/+3
* | | | | Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_offSteve Klabnik2013-03-091-4/+4
|\ \ \ \ \
| * | | | | Renumbering the comments in the application boot process.wangjohn2013-03-091-4/+4
|/ / / / /
* | | | | Merge pull request #9627 from rubys/masterCarlos Antonio da Silva2013-03-091-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ensure response.stream is closedSam Ruby2013-03-091-0/+1
|/ / / /
* | | | Merge pull request #9621 from sakuro/migration-magic-comment-fixJeremy Kemper2013-03-094-3/+48
|\ \ \ \
| * | | | Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-094-3/+48
* | | | | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-1/+24
|\ \ \ \ \
| * | | | | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-083-1/+24
* | | | | | Merge pull request #9623 from Agis-/patch-2Carlos Antonio da Silva2013-03-091-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove extra whitespace and fix a commentAgis Anastasopoulos2013-03-091-2/+2
|/ / / / /
* | | | / Fix failing test regarding console change to fix sandboxingCarlos Antonio da Silva2013-03-081-11/+10
| |_|_|/ |/| | |