Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows). | Phil Ross | 2014-04-12 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_default | Rafael Mendonça França | 2014-04-11 | 5 | -18/+47 | |
|\ \ | | | | | | | Improve debugging support | |||||
| * | | Prevent generation of extra whitespace in templates | David Rodríguez de Dios | 2014-04-10 | 2 | -6/+6 | |
| | | | ||||||
| * | | Isolate debugger related code | David Rodríguez de Dios | 2014-04-10 | 1 | -11/+13 | |
| | | | ||||||
| * | | Update Gemfile templates to provide correct debugger | David Rodríguez de Dios | 2014-04-08 | 2 | -3/+11 | |
| | | | ||||||
| * | | Keep debugger support only for rubies < 2.0.0 | David Rodríguez de Dios | 2014-04-08 | 3 | -7/+26 | |
| | | | ||||||
* | | | Merge pull request #14689 from matthewd/asset_initializer | Rafael Mendonça França | 2014-04-11 | 3 | -6/+15 | |
|\ \ \ | | | | | | | | | Move assets precompile (and version) to an initializer | |||||
| * | | | Move assets precompile (and version) to an initializer | Matthew Draper | 2014-04-11 | 3 | -6/+15 | |
| | | | | | | | | | | | | | | | | | | | | sprockets-rails 2.1 needs the precompile list to be available in all environments. | |||||
* | | | | Require action_controller before any other action_controller file | Rafael Mendonça França | 2014-04-10 | 1 | -0/+1 | |
|/ / / | | | | | | | | | | | | | | | | This will load properly the loading hooks. Closes rails/sass-rails#205 | |||||
* | | | +EOL | Akira Matsuda | 2014-04-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Dont abbreviate that which needs no abbreviation | David Heinemeier Hansson | 2014-04-08 | 1 | -2/+2 | |
| | | | ||||||
* | | | Dont encourage aliases now that we have variants | David Heinemeier Hansson | 2014-04-08 | 1 | -1/+0 | |
| | | | ||||||
* | | | Use short-form for the scaffold render calls and drop the needless test | David Heinemeier Hansson | 2014-04-08 | 1 | -2/+2 | |
|/ / | ||||||
* | | Drop in @jeremy's new database.yml template text | Matthew Draper | 2014-04-09 | 11 | -43/+197 | |
| | | | | | | | | | | In passing, allow multi-word adapters to be referenced in a URL: underscored_name must become hyphened-name. | |||||
* | | Rails.application should be set inside before_configuration hook | Rafael Mendonça França | 2014-04-07 | 1 | -1/+3 | |
| | | | | | | | | Fixes #14620 | |||||
* | | Remove useless begin..end | Carlos Antonio da Silva | 2014-04-07 | 1 | -2/+1 | |
| | | ||||||
* | | Use sass-rails 4.0.3 | Rafael Mendonça França | 2014-04-04 | 1 | -1/+1 | |
| | | ||||||
* | | Ensure we supply Kernel#y for 1.9 too | Matthew Draper | 2014-04-04 | 3 | -10/+29 | |
| | | | | | | | | | | | | | | | | In 1.9, it doesn't live in its own file, so we'll have to define it ourselves. Check RUBY_VERSION, instead of rescuing the require, because we want this to break if `psych/y` moves in a future Ruby release. | |||||
* | | Explicitly load Kernel#y when starting a console | Matthew Draper | 2014-04-04 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | Previously, we relied on the IRB-detection in Psych itself. But that doesn't work when we're running under spring: the application boots (and thus psych is required) before we switch to console mode and load IRB. Fixes #14587. | |||||
* | | Revise 'sqlite3:' URL handling for smoother upgrades | Matthew Draper | 2014-04-03 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll change to the absolute-path interpretation in 4.2. The current "correct" spellings for in-memory, relative, and absolute URLs, respectively, are: sqlite3::memory: sqlite3:relative/path sqlite3:/full/path Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce. Uncovered by @guilleiguaran while investigating #14495, though that sounds like a different issue. | |||||
* | | Require yaml explicitly | Adrià Planas | 2014-03-29 | 1 | -0/+1 | |
| | | ||||||
* | | Merge pull request #12778 from etehtsea/rake-default-fix | Rafael Mendonça França | 2014-03-28 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Don't load test env by default. Closes #13241 | |||||
| * | | Don't load test env by default | Konstantin Shabanov | 2013-11-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Edge Rails applications doesn't need to use arel master | Rafael Mendonça França | 2014-03-26 | 1 | -2/+1 | |
| | | | ||||||
* | | | Fix Generation of proper migration when | Kuldeep Aggarwal | 2014-03-25 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Base.pluralize_table_names = false. Previously, generation a migration like this: rails g migration add_column_name_to_user name would not generating the correct table name. Fixes #13426. | |||||
* | | | Merge pull request #14447 from Houdini/gitignore | Rafael Mendonça França | 2014-03-24 | 3 | -1/+7 | |
|\ \ \ | | | | | | | | | | | | | Skip sqlite3 files in .gitignore if no sqlite3 in app | |||||
| * | | | Remove sqlite3 lines from .gitignore if the application is not using sqlite3. | Dmitrii Golub | 2014-03-24 | 3 | -1/+7 | |
| | | | | ||||||
* | | | | Adding active_model in Rails::Info | Ankit Gupta | 2014-03-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #14379 from robertomiranda/rake-notes.config | Guillermo Iguaran | 2014-03-17 | 2 | -15/+26 | |
|\ \ \ | | | | | | | | | Add Public Api for Register New Extensions for Rake Notes | |||||
| * | | | Add config.annotations, in order to register new extensions for Rake notes ↵ | robertomiranda | 2014-03-16 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | at config level | |||||
| * | | | Fix Shadowing extensions variable in Register Annotation Exentsions | robertomiranda | 2014-03-16 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Supporting .ruby, .yml and .yaml Extension in Rake Notes | robertomiranda | 2014-03-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we ↵ | robertomiranda | 2014-03-14 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | have an API for register it in the corresponding gems | |||||
| * | | | Add Public Api for register new extensions for Rake Notes | robertomiranda | 2014-03-14 | 1 | -15/+24 | |
| | | | | ||||||
* | | | | Let COMMAND_WHITELIST be an Array, not a String | Akira Matsuda | 2014-03-16 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Force sass-rails ~> 4.0.2 to avoid sprockets compatibility error | Rafael Mendonça França | 2014-03-14 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | See https://github.com/rails/sass-rails/issues/191 for more information | |||||
* | | | require actions rather than create_file | Aaron Patterson | 2014-03-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | thor's create_file seems to have a circular dependency on itself when used with our constant loading stuff. fixes #14319 | |||||
* | | | Removed unnecessary command "application" | Arun Agrawal | 2014-03-10 | 1 | -6/+1 | |
| | | | ||||||
* | | | Merge pull request #14262 from sferik/flat_map | Andrew White | 2014-03-09 | 4 | -4/+4 | |
|\ \ \ | | | | | | | | | Replace additional instances of map.flatten with flat_map | |||||
| * | | | Replace map.flatten with flat_map in railties | Erik Michaels-Ober | 2014-03-04 | 4 | -4/+4 | |
| | | | | ||||||
* | | | | Make the rails:template rake task load initializers | Robin Dupret | 2014-03-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Templates could rely on irregular inflections or external libraries for instance so we should load the application's initializers when running the rails:template task. The introducing commit of this feature is f7f11361 ; the initializers have never been loaded invoking this task. Fixes #12133. | |||||
* | | | | Introduce `Rails.gem_version` | Prem Sichanugrist | 2014-03-05 | 3 | -11/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`. | |||||
* | | | | Always return an array from formats so there is no need to wrap it when calling | Carlos Antonio da Silva | 2014-03-04 | 3 | -3/+3 | |
| | | | | ||||||
* | | | | Fix for external generators extend Erb::Generators | Allen Fair | 2014-03-04 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | HAML and probably other generators extend this class and invoke filename_with_extensions with the old signature (without format). This makes the second argument optional and defaults it to the #format method which could be overridden as well. Closes #14132. | |||||
* | | | Merge pull request #14195 from robin850/issue-14079 | Guillermo Iguaran | 2014-02-28 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Avoid namespacing routes inside engines | |||||
| * | | | Avoid namespacing routes inside engines | Robin Dupret | 2014-02-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #11544, invoking the controller generator, any generated route is namespaced according to the class_path method. Since a mountable plugin is namespaced, creating a controller inside would generate a namespaced route based on the engine's name. The controller generator now relies on regular_class_path which does not contain the class hierarchy but the given path. Fixes #14079. | |||||
* | | | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_test | Yves Senn | 2014-02-27 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | fix test cases | |||||
| * | | | | modify model generator warning message. refs [#174c9f0] | Kuldeep Aggarwal | 2014-02-27 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | pass strings to the underscore method | Aaron Patterson | 2014-02-26 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #14149 from tjschuck/bcrypt_gem_rename | Carlos Antonio da Silva | 2014-02-26 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Bump version of bcrypt gem |