Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Use jquery-rails from github" | Santiago Pastorino | 2013-04-02 | 1 | -3/+1 |
| | | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb | ||||
* | Revert more Rails.version changes | Rafael Mendonça França | 2013-04-01 | 3 | -4/+4 |
| | | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc | ||||
* | Move the class methods to above the protected section | Rafael Mendonça França | 2013-04-01 | 3 | -47/+36 |
| | |||||
* | Merge pull request #10021 from pabloh/refactor_rails_generator_test_case | Rafael Mendonça França | 2013-04-01 | 4 | -211/+259 |
|\ | | | | | | | Refactor Rails::Generator::TestCase into modules | ||||
| * | Break down Rails::Generator::TestCase into modules | Pablo Herrero | 2013-03-31 | 4 | -211/+259 |
| | | |||||
* | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 1 | -1/+1 |
|\ \ | |/ |/| | Cookie-base session store auto-upgrade | ||||
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 1 | -1/+1 |
| | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
* | | Make comment about uglifier in generated Gemfile consistent between branches | Carlos Antonio da Silva | 2013-03-30 | 1 | -1/+1 |
| | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393. | ||||
* | | be lazy loading SDoc | Xavier Noria | 2013-03-30 | 1 | -1/+1 |
| | | |||||
* | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependency | Xavier Noria | 2013-03-30 | 1 | -0/+5 |
| | | |||||
* | | Update the call to Bundler.require in application.rb since assets group ↵ | Guillermo Iguaran | 2013-03-28 | 1 | -2/+3 |
| | | | | | | | | doesn't exist anymore in Gemfile | ||||
* | | Add better comments to assets gems | Guillermo Iguaran | 2013-03-28 | 1 | -9/+22 |
|/ | |||||
* | Add coffee-rails and javascript runtime to gemfile if skip_javascript is | Rafael Mendonça França | 2013-03-28 | 1 | -2/+9 |
| | | | | provided | ||||
* | Remove buggy and unnecessary logic | Sam Ruby | 2013-03-27 | 1 | -7/+0 |
| | | | | based on a discussion with @rafaelfranca | ||||
* | Cosmetic cleanup of generated Gemfile | Sam Ruby | 2013-03-27 | 1 | -17/+14 |
| | | | | | | - Remove obsolete/misleading comment about assets only being used production - Remove unnecessary group :assets - Eliminate blank lines if options[:skip_javascript] is not specified | ||||
* | Put coffee-rails in top-level of generated Gemfile | Gabe Kopley | 2013-03-24 | 1 | -15/+27 |
| | | | | v3 of pull request based on additional feedback from @jeremy | ||||
* | Use jquery-rails from github | Sam Ruby | 2013-03-24 | 1 | -1/+3 |
| | | | | completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980 | ||||
* | Merge pull request #8501 from charliesome/version-to-s | Rafael Mendonça França | 2013-03-23 | 3 | -4/+4 |
|\ | | | | | Add #to_s method to VERSION modules | ||||
| * | remove references to *::VERSION, replace with *.version | Charlie Somerville | 2013-03-21 | 3 | -4/+4 |
| | | |||||
* | | Better styles for the CSS [ci skip] | Rafael Mendonça França | 2013-03-23 | 3 | -38/+38 |
|/ | |||||
* | Don't generate a scaffold.css if no-assets | Kevin Glowacz | 2013-03-20 | 1 | -0/+1 |
| | |||||
* | fix sentence [ci skip] | Neeraj Singh | 2013-03-19 | 1 | -1/+1 |
| | |||||
* | config.ru uses the effective Rack app | Yves Senn | 2013-03-15 | 1 | -1/+1 |
| | | | | | | | | | | We used to pass the Rails::Application subclass to #run. The Rails server then called #to_app to convert that class to the actual Rack application. if you surround `#run` with a call to `#map` the server no longer convertes the class to the instance and we end up with unnecessary delegation calls on every request. | ||||
* | Add support for generate scaffold password:digest | Sam Ruby | 2013-03-13 | 7 | -13/+29 |
| | | | | | | | | | | * adds password_digest attribute to the migration * adds has_secure_password to the model * adds password and password_confirmation password_fields to _form.html * omits password entirely from index.html and show.html * adds password and password_confirmation to the controller * adds unencrypted password and password_confirmation to the controller test * adds encrypted password_digest to the fixture | ||||
* | Mention that debugging can be slow. | Steve Klabnik | 2013-03-11 | 1 | -0/+2 |
| | | | | | | https://github.com/rails/rails/pull/3180\#issuecomment-14705821 has mention of rendering going from 1-2ms to 4 seconds with this on, which seems reasonable: debugging is slow. | ||||
* | Merge pull request #9080 from sikachu/master-rails-test | Rafael Mendonça França | 2013-03-11 | 1 | -3/+4 |
|\ | | | | | Add `rails test` command to run the test suite | ||||
| * | Make sure that `rails test` load test in test env | Prem Sichanugrist | 2013-03-09 | 1 | -1/+1 |
| | | |||||
| * | Improve wording for rails test command | Dalibor Nasevic | 2013-03-09 | 1 | -2/+2 |
| | | |||||
| * | Load fixtures only when running suites, or `-f` | Prem Sichanugrist | 2013-03-09 | 1 | -2/+3 |
| | | | | | | | | | | | | * `rails test -f` will run the test suites with all fixtures loaded * New application will now generated without `fixtures :all` line enabled by default. | ||||
* | | Make sure that debugger isn't included in production environment. | Teng Siong Ong | 2013-03-09 | 1 | -1/+1 |
|/ | |||||
* | Remove extra whitespace and fix a comment | Agis Anastasopoulos | 2013-03-09 | 1 | -2/+2 |
| | | | minor comment fix for consistency | ||||
* | add prompt to 422 page to check logs | Nihad Abbasov | 2013-03-04 | 1 | -2/+3 |
| | |||||
* | Merge pull request #9512 from Jacke/master | Guillermo Iguaran | 2013-03-02 | 3 | -33/+126 |
|\ | | | | | New 404, 422, 500 pages, they are more stylish and bring ruby essence… | ||||
| * | New beauty pages(404, 422, 500) | Stanislav | 2013-03-02 | 3 | -33/+126 |
| | | | | | | | | | | | | moving changelog note to unreleased section New beauty pages(404, 422, 500) | ||||
* | | :scissors: extra blank line | Akira Matsuda | 2013-03-02 | 1 | -1/+0 |
|/ | |||||
* | Ensure plugins generated with plugin new can boot the dummy application | José Valim | 2013-02-28 | 5 | -14/+35 |
| | |||||
* | Use less hyperbole in the language re: allowed parameters | David Czarnecki | 2013-02-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #9419 from banyan/change-default-root-route-helper | Guillermo Iguaran | 2013-02-25 | 2 | -2/+2 |
|\ | | | | | Change default root route helper | ||||
| * | Change default root route helper | Kohei Hasegawa | 2013-02-26 | 2 | -2/+2 |
| | | |||||
* | | Apparently we can't get away from adding lib to the load path | José Valim | 2013-02-25 | 1 | -0/+1 |
| | | |||||
* | | Plugins can use a similar bootscript to Rails apps | José Valim | 2013-02-25 | 1 | -8/+3 |
| | | |||||
* | | Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile | Guillermo Iguaran | 2013-02-25 | 1 | -2/+2 |
| | | |||||
* | | Remove sprockets-rails from the Gemfile generator | robertomiranda | 2013-02-25 | 1 | -1/+0 |
|/ | |||||
* | Revert "Use sass compressor as the default CSS compressor" | Guillermo Iguaran | 2013-02-25 | 1 | -1/+1 |
| | | | | | | | This reverts commit 3eef1c7c5d0c4538efb9e061b6fe68011f0352b1. The css compressor should be set in sass-rails plugin. Check https://github.com/rails/sass-rails/commit/339529f9f6433047df6358c0439e6641cb74f045 for the fix. | ||||
* | Use sass compressor as the default CSS compressor | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | | | | | | | With the new sprockets-rails we need to explicitly set the CSS compressor. See https://github.com/rails/sprockets-rails#changes-from-rails-3x | ||||
* | Merge pull request #9401 from sikachu/master-remove-builder-option | Rafael Mendonça França | 2013-02-24 | 1 | -14/+0 |
|\ | | | | | Remove `--builder` option from `rails` command | ||||
| * | Remove `--builder` option from `rails` command | Prem Sichanugrist | 2013-02-24 | 1 | -14/+0 |
| | | | | | | | | | | | | | | Ability to use a custom builder by passing `--builder` (or `-b`) has been removed. Consider using application template instead. See this guide for more detail: http://guides.rubyonrails.org/rails_application_templates.html | ||||
* | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_seconds | Xavier Noria | 2013-02-24 | 2 | -10/+0 |
|\ \ | | | | | | | remove config.auto_explain_threshold_in_seconds | ||||
| * | | remove AR auto-explain (config.auto_explain_threshold_in_seconds) | Yves Senn | 2013-02-24 | 2 | -10/+0 |
| |/ | | | | | | | | | | | | | | | | | | | We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection. | ||||
* / | Use sprockets-rails 2.0.0.rc3 in new apps | Guillermo Iguaran | 2013-02-24 | 1 | -1/+1 |
|/ |