Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17691 from nickveys/from-json-docs | Rafael Mendonça França | 2014-11-26 | 1 | -4/+4 |
|\ | |||||
| * | Fixing documentation in JSON#from_json | Nick Veys | 2014-11-20 | 1 | -4/+4 |
* | | Merge pull request #17186 from tgxworld/header_authentication_token | Matthew Draper | 2014-11-27 | 3 | -4/+37 |
|\ \ | |||||
| * | | Allow authentication header to not have to specify 'token=' key. | Guo Xiang Tan | 2014-10-10 | 2 | -4/+30 |
* | | | Merge pull request #17786 from recursive-madman/activerecord-errors-codestyle | Rafael Mendonça França | 2014-11-26 | 2 | -3/+6 |
|\ \ \ | |||||
| * | | | various error classes: added newlines & removed :nodoc: flag from public attr... | Recursive Madman | 2014-11-26 | 2 | -3/+6 |
* | | | | Merge pull request #17761 from pschrammel/master | Yves Senn | 2014-11-26 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | be more general with adapter name | Peter Schrammel | 2014-11-25 | 1 | -1/+1 |
* | | | | Merge pull request #17674 from recursive-madman/activerecord-error-improvement | Rafael Mendonça França | 2014-11-26 | 3 | -4/+25 |
|\ \ \ \ | |||||
| * | | | | Add #record attribute to RecordNotFound and RecordDestroyed exceptions. | Recursive Madman | 2014-11-26 | 3 | -4/+25 |
* | | | | | Merge pull request #17782 from cheba/engine-root-master | Rafael Mendonça França | 2014-11-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use absolute_path of caller_locations to infer engine root | Alexander Mankuta | 2014-11-26 | 1 | -1/+1 |
* | | | | | | Merge pull request #17781 from jonatack/patch-8 | Rafael Mendonça França | 2014-11-26 | 1 | -38/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Active Record change log pass [skip ci] | Jon Atack | 2014-11-26 | 1 | -38/+40 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #17785 from jipumarino/dbconsole-for-sqlserver | Rafael Mendonça França | 2014-11-26 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Provide support for SQL Server connections with dbconsole using sqsh | Juan Ignacio Pumarino | 2014-11-26 | 1 | -0/+15 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #17784 from bruno-/refactor-nested-ifs | Rafael Mendonça França | 2014-11-26 | 1 | -5/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Refactor nested if | Bruno Sutic | 2014-11-26 | 1 | -5/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #17780 from arcz/patch-1 | José Valim | 2014-11-26 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove extra empty line | Artur Cygan | 2014-11-26 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | :scissors: | Rafael Mendonça França | 2014-11-26 | 1 | -1/+1 |
* | | | | | Merge pull request #17779 from dilpreet92/server_location | Rafael Mendonça França | 2014-11-26 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | getting the location of the server | dilpreet92 | 2014-11-26 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Clarify where result goes, and supported formats of generate task. | Zachary Scott | 2014-11-25 | 1 | -1/+3 |
* | | | | | Use jquery-rails 4.0.0 | Rafael Mendonça França | 2014-11-25 | 2 | -9/+3 |
* | | | | | Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1 | Sean Griffin | 2014-11-25 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Use web_console 2.0 for 4.2.0.rc1 release | Genadi Samokovarov | 2014-11-26 | 2 | -2/+2 |
* | | | | | | Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-pr | Rafael Mendonça França | 2014-11-25 | 1 | -3/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | adding nodoc to private methods | Jonathan Cutrell | 2014-11-23 | 1 | -2/+2 |
| * | | | | | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value | Jonathan Cutrell | 2014-11-23 | 1 | -1/+4 |
* | | | | | | | Fix warning in AV tests | Sean Griffin | 2014-11-25 | 1 | -2/+4 |
* | | | | | | | Merge branch 'derekprior-dp-add-foreign-keys-with-generators' | Rafael Mendonça França | 2014-11-25 | 5 | -1/+60 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Generators add foreign keys on references | Derek Prior | 2014-11-25 | 5 | -1/+60 |
|/ / / / / / / | |||||
* | | | | | | | Fix syntax error :bomb: | Rafael Mendonça França | 2014-11-25 | 1 | -2/+2 |
* | | | | | | | Merge pull request #17697 from sgrif/sg-remove-is-a-check-when-ignoring-tables | Sean Griffin | 2014-11-25 | 2 | -16/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove is_a? check when ignoring tables | Sean Griffin | 2014-11-20 | 2 | -16/+1 |
* | | | | | | | | Merge pull request #17771 from agis-/issue-17373 | Sean Griffin | 2014-11-25 | 2 | -2/+9 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Local vars should exist in partials for falsy `:object:` values too | Agis- | 2014-11-25 | 2 | -2/+9 |
* | | | | | | | | Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parser | Rafael Mendonça França | 2014-11-25 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Do not rescue Exception in ParamsParser | Yuki Nishijima | 2014-11-23 | 2 | -1/+11 |
* | | | | | | | | | Use released arel | Rafael Mendonça França | 2014-11-25 | 2 | -2/+1 |
* | | | | | | | | | Use released rails-dom-testing | Rafael Mendonça França | 2014-11-25 | 5 | -6/+3 |
* | | | | | | | | | Merge pull request #17768 from bruno-/router-visualizer-css-fix | Rafael Mendonça França | 2014-11-25 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | CSS fix for the router visualizer | Bruno Sutic | 2014-11-25 | 1 | -4/+0 |
* | | | | | | | | | | Move PG float quoting to the correct location | Sean Griffin | 2014-11-25 | 1 | -16/+6 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #17769 from gsamokovarov/remove-slash-console-references | Rafael Mendonça França | 2014-11-25 | 2 | -14/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove Web Console /console references in the guides | Genadi Samokovarov | 2014-11-25 | 2 | -14/+4 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #17739 from rails/bring_back_db_test_prepare | Yves Senn | 2014-11-25 | 6 | -17/+120 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | bring back `db:test:prepare`. | Yves Senn | 2014-11-25 | 5 | -15/+120 |
| * | | | | | | | | | do not trigger AR lazy load hook before initializers ran. | Yves Senn | 2014-11-25 | 1 | -2/+0 |