aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fix RailsServer#start content in initialization guideAlex Johnson2013-11-121-17/+23
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Change syntax format for example returned valuesPrem Sichanugrist2013-11-1119-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip]
| * | | | Add section for command_tasks in initialization guideAlex Johnson2013-11-081-12/+42
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update commands.rb content in initialization guideAlex Johnson2013-11-081-2/+8
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
| | | | | | | | | | | | | | | Highlighted code
* | | | | Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Updated allow_failures for Rubinius 2.2.1.
| * | | | | Updated allow_failures for Rubinius 2.2.1.Federico Ravasio2013-11-241-1/+1
|/ / / / /
* | | | | Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-242-5/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Rubinius Gemfile and travis fixes
| * | | | Properly fix Rubinius dependencies in Gemfile & Travis integration.Federico Ravasio2013-11-242-5/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even if not included in the Gemfile. Now it's 100% required to include the gem 'rubysl', otherwise the stdlib is not available entirely, breaking everything. Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing conflicts with Rails's dependency on minitest 5. That is not the case anymore since rubysl-test-unit 2.0.2, so it is completely safe to include it fully. When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2, thus picking new versions automatically.
* | | | Merge pull request #13016 from arunagw/test-for-skip-assets-controllerGuillermo Iguaran2013-11-231-0/+6
|\ \ \ \ | | | | | | | | | | Test for when controller with skip-assets
| * | | | Test for when controller with skip-assetsArun Agrawal2013-11-231-0/+6
|/ / / /
* | | | Merge pull request #13015 from arunagw/task-creation-command-testYves Senn2013-11-231-1/+13
|\ \ \ \ | | | | | | | | | | Added test when task generator called on revoke
| * | | | Added test when task generator called on revokeArun Agrawal2013-11-231-1/+13
|/ / / /
* | | | Merge pull request #13012 from harrigan/masterYves Senn2013-11-231-1/+1
|\ \ \ \ | | | | | | | | | | Helper should be a module in Rails guides [ci skip]
| * | | | Helper should be a module in Rails guides [ci skip]Martin Harrigan2013-11-231-1/+1
|/ / / /
* | | | Merge pull request #13011 from arunagw/jruby-fixesYves Senn2013-11-231-2/+10
|\ \ \ \ | | | | | | | | | | Using activerecord-jdbcsqlite3-adapter
| * | | | Using activerecord-jdbcsqlite3-adapterArun Agrawal2013-11-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | PluginGeneratorTest needs to have activerecord-jdbcsqlite3-adapter to pass under JRuby
* | | | | Merge pull request #13010 from arunagw/cleanedup-generator-testYves Senn2013-11-231-21/+6
|\ \ \ \ \ | |/ / / / |/| | | | Cleaned up app generator test
| * | | | Cleaned up app generator testArun Agrawal2013-11-231-21/+6
|/ / / /
* | | | Merge pull request #13007 from chancancode/dont_call_as_json_with_nilJeremy Kemper2013-11-222-2/+18
|\ \ \ \ | | | | | | | | | | Don't call #as_json on children of Array and Hash with nil when no arguments are passed
| * | | | When Array#as_json and Hash#as_json are called without options, theyGodfrey Chan2013-11-222-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | should also call #as_json on the children without options (instead of nil)
* | | | | Merge pull request #12774 from exAspArk/fix_uniqueness_on_relationYves Senn2013-11-223-1/+24
|\ \ \ \ \ | |/ / / / |/| | | | Fix validation on uniqueness
| * | | | Fix validation on uniqueness of empty associationEvgeny Li2013-11-223-1/+24
|/ / / /
* | | | Use a more generic assertion to make sure this tests will be useful.Rafael Mendonça França2013-11-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since we are using assert_no_match, if we change the code before changing the tests, the tests will still pass and the assertion will become useless
* | | | Merge pull request #13003 from laurocaetano/fix_assertion_for_turbolinksRafael Mendonça França2013-11-221-1/+1
|\ \ \ \ | | | | | | | | | | Fix the assertion for not inclusion of turbolinks on application.js.
| * | | | Fix the assertion for not inclusion of turbolinks on application.js.Lauro Caetano2013-11-221-1/+1
|/ / / / | | | | | | | | | | | | | | | | We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present.
* | | | Improve changelogsCarlos Antonio da Silva2013-11-224-11/+13
| | | | | | | | | | | | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | | | Merge pull request #13000 from arunagw/build-fix-rake-testYves Senn2013-11-211-2/+2
|\ \ \ \ | | | | | | | | | | Build fix for new routing inspector changes
| * | | | Build fix for new routing inspector changesArun Agrawal2013-11-221-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | | | Merge pull request #12996 from shreve/patch-2Guillermo Iguaran2013-11-211-1/+1
|\ \ \ \ | | | | | | | | | | Added a missing close parenthesis to i18n.md
| * | | | Added a missing close parenthesis to i18n.mdJacob Evan Shreve2013-11-211-1/+1
|/ / / /
* | | | Merge pull request #12993 from laurocaetano/skip_turbolinksRafael Mendonça França2013-11-214-4/+21
|\ \ \ \ | | | | | | | | | | Option to skip turbolinks
| * | | | Remove turbolinks when generating a new application based on a templateLauro Caetano2013-11-214-4/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | that skips it. It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template.
* | | | Merge pull request #12994 from sbagdat/fix_for_info_titleRafael Mendonça França2013-11-212-1/+3
|\ \ \ \ | | | | | | | | | | Fix for titles of info pages
| * | | | Fix for titles of info pagesSıtkı Bağdat2013-11-222-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Both `rails/info/properties` and `rails/info/routes` have same html title attribute as *Routes*. This commit includes a fix for the titles.
* | | | | Merge pull request #12992 from arunagw/build-fix-routing-inspectorRafael Mendonça França2013-11-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Build fix for Routing Inspector
| * | | | | Build fix for Routing InspectorArun Agrawal2013-11-221-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | | | | Revert "Merge pull request #12990 from vipulnsward/remove_visualizer_param"Rafael Mendonça França2013-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a19346d2855ecb1c791cdef3af92589566d00db, reversing changes made to d82588ee4756b03025813b3997f4db171ee0fcdc. This argument is being used in the view https://github.com/rails/rails/blob/5a19346d2855ecb1c791cdef3af92589566d00db/actionpack/lib/action_dispatch/journey/visualizer/index.html.erb#L4 It is being set using the binding https://github.com/rails/rails/blob/5a19346d2855ecb1c791cdef3af92589566d00db/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb#L108
* | | | | Merge pull request #12990 from vipulnsward/remove_visualizer_paramRafael Mendonça França2013-11-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unused param `title`to `TransitionTable#visualizer`
| * | | | | Remove unused param `title`to `TransitionTable#visualizer`Vipul A M2013-11-221-1/+1
|/ / / / /
* | | | | Merge pull request #12962 from ↵Xavier Noria2013-11-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/call_initialize_schema_migrations_table_from_migration Use `SchemaStatements#initialize_schema_migrations_table` instead of `ActiveRecord::SchemaMigration.create_table`.
| * | | | | Use `SchemaStatements#initialize_schema_migrations_table` instead of ↵Ryuta Kamizono2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::SchemaMigration.create_table`.
* | | | | | unify punctuation in Action Pack changelog. [ci skip]Yves Senn2013-11-211-5/+7
| | | | | |
* | | | | | Merge pull request #12975 from sbagdat/fix-for-rake-routesYves Senn2013-11-214-19/+24
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Fix for routes task
| * | | | | Fix for routes taskSıtkı Bağdat2013-11-214-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes formatting issue for `rake routes` task, when a section is shorter than a header.
* | | | | | doc `travel` and `travel_to` stubs are removed in teardown. [ci skip]Yves Senn2013-11-211-4/+4
| | | | | |
* | | | | | replace custom Time stubbing with `travel` and `travel_to`.Yves Senn2013-11-211-37/+7
| | | | | |
* | | | | | Merge pull request #12970 from prathamesh-sonpatki/issue12885Carlos Antonio da Silva2013-11-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add positional information to eval call so that this information will be used in printing correct location where the exception occurred. Closes #12885.
| * | | | | | Add positional information to eval call so that this information willPrathamesh Sonpatki2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be used in printing correct location where the exception occurred. Closes #12885 - Without this the location of exception is always the line on which 'eval' is called - But if the exception occurs in a gem outside of Rails, then that location is not printed in stacktrace
* | | | | | | Merge pull request #12986 from budnik/fix-unicode-nbspCarlos Antonio da Silva2013-11-214-9/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | replace U+00A0 with whitespace, Fixes #12985