aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #15015 from pothibo/database-configurationRafael Mendonça França2014-05-073-1/+22
|\ \ \ | | | | | | | | Use Rails::Paths::Path#existent in database_configuration
| * | | Use Rails::Paths::Path#existent in database_configurationPier-Olivier Thibault2014-05-073-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Database configuration was trying to load the first path that config.paths['config/database'] was returning even if the path didn't exist in the filesystem. Because Rails::Paths::Path has the possibility to return more than 1 path (as an array), database_configuration should filter down the paths to the existing one and then load the first one. This would make it possible to move the database.yml file and add the new path to paths['config/database'] and still load the configurations.
* | | | Return a non zero code when db has never been setup on statusPaul B2014-05-071-1/+1
|/ / /
* | | rename `str` to `string` to fix overshadowing of variableVipul A M2014-05-071-1/+1
| | |
* | | Fix rails dbconsole for jdbcmysql adapter.Gabriel Gilder and Jim Kingdon2014-05-051-1/+1
| | |
* | | skip-git should not hit git commands plugin generatorsArun Agrawal2014-05-023-14/+38
| | |
* | | Works correctly if git not installedRoman Shmatov2014-05-022-8/+30
| | |
* | | Automaticly add username and email if configured in git-scm, as bundle gemAbd ar-Rahman Hamidi2014-05-023-3/+19
| | |
* | | Avoid unnecessary conditional blockGiovanni Cappellotto2014-05-011-5/+0
| |/ |/| | | | | | | GeneratedAttribute#column_name checks already for reference? on the attribute returning the right name to use as symbol for label and field.
* | Generators, remove leftover variable assignment. refs #14877Yves Senn2014-04-271-1/+0
| | | | | | | | | | The last uses of this variable was removed with the `--builder` option. 2da5ea1c9feb4a7b491bd00bd6ffd931b9203da8
* | Merge branch 'master' into adequaterecordAaron Patterson2014-04-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (28 commits) move AR length validation tests into separate test-case. No need for trailing slash on migration path. reset `@arel` when modifying a Relation in place. PostgreSQL Timestamps always map to `:datetime`. [ci skip] Improve formatting and yml Fix a typo in the doc of forty_two AR FinderMethod Improve readability of contributing to rails guide. [ci skip] Precompile the image we're referencing, too. `ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty transactions. Fixed an issue with migrating legacy json cookies. Correct comment [ci skip] Perfer to define methods instead of calling test Fix syntax error Add CHANGELOG entry for #14757 [ci skip] Fix run-on sentences and improve grammar [skip ci] Add test for using ActionView::Helpers::FormHelper.label with block and html select! renamed to avoid name collision Array#select! Rearrange deck chairs on the titanic. Organize connection handling test cases. Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. ActionController::Renderers documentation fix ...
| * | Precompile the image we're referencing, too.Matthew Draper2014-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can't compile a file that references a non-compiled asset's path. .. unless you turn off asset runtime errors. Outside of a test case like this, `config.assets.precompile` would normally retain its default entry, which precompiles all images (and other non-JS/CSS files) that are in `app/assets`.
* | | Revert "Edge Rails applications doesn't need to use arel master"Aaron Patterson2014-04-231-1/+2
|/ / | | | | | | This reverts commit 7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee.
* | Make console and generators blocks works at Application instance levelRafael Mendonça França2014-04-144-0/+114
| | | | | | | | | | | | | | Like rake tasks and runner blocks these blocks should also being shared between applications since they are stored at the classes. Fixes #14748
* | :scissors:Rafael Mendonça França2014-04-141-4/+4
| |
* | Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).Phil Ross2014-04-121-1/+1
| |
* | Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_defaultRafael Mendonça França2014-04-118-35/+76
|\ \ | | | | | | Improve debugging support
| * | Prevent generation of extra whitespace in templatesDavid Rodríguez de Dios2014-04-102-6/+6
| | |
| * | Isolate debugger related codeDavid Rodríguez de Dios2014-04-102-24/+32
| | |
| * | Update Gemfile templates to provide correct debuggerDavid Rodríguez de Dios2014-04-084-7/+21
| | |
| * | Keep debugger support only for rubies < 2.0.0David Rodríguez de Dios2014-04-084-10/+29
| | |
* | | Merge pull request #14689 from matthewd/asset_initializerRafael Mendonça França2014-04-115-7/+20
|\ \ \ | | | | | | | | Move assets precompile (and version) to an initializer
| * | | Move assets precompile (and version) to an initializerMatthew Draper2014-04-115-7/+20
| | | | | | | | | | | | | | | | | | | | sprockets-rails 2.1 needs the precompile list to be available in all environments.
* | | | Require action_controller before any other action_controller fileRafael Mendonça França2014-04-101-0/+1
|/ / / | | | | | | | | | | | | | | | This will load properly the loading hooks. Closes rails/sass-rails#205
* | | +EOLAkira Matsuda2014-04-101-1/+1
| | |
* | | depend_on_asset is not required anymore on sprockets-rails 2.1.2Rafael Mendonça França2014-04-091-6/+6
| | |
* | | Dont abbreviate that which needs no abbreviationDavid Heinemeier Hansson2014-04-081-2/+2
| | |
* | | Dont encourage aliases now that we have variantsDavid Heinemeier Hansson2014-04-081-1/+0
| | |
* | | Use short-form for the scaffold render calls and drop the needless testDavid Heinemeier Hansson2014-04-082-9/+2
|/ /
* | Drop in @jeremy's new database.yml template textMatthew Draper2014-04-0911-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 hookRafael Mendonça França2014-04-073-1/+17
| | | | | | | | Fixes #14620
* | Remove useless begin..endCarlos Antonio da Silva2014-04-071-2/+1
| |
* | Declare the assets dependencyRafael Mendonça França2014-04-041-7/+8
| |
* | Use sass-rails 4.0.3Rafael Mendonça França2014-04-041-1/+1
| |
* | Ensure we supply Kernel#y for 1.9 tooMatthew Draper2014-04-043-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 consoleMatthew Draper2014-04-041-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 upgradesMatthew Draper2014-04-033-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 explicitlyAdrià Planas2014-03-291-0/+1
| |
* | Add CHANGELOG entry for #12778 [ci skip]Rafael Mendonça França2014-03-281-0/+4
| |
* | Merge pull request #12778 from etehtsea/rake-default-fixRafael Mendonça França2014-03-281-1/+1
|\ \ | | | | | | | | | | | | Don't load test env by default. Closes #13241
| * | Don't load test env by defaultKonstantin Shabanov2013-11-111-1/+1
| | |
* | | Fix build with bundler 1.6Rafael Mendonça França2014-03-261-1/+1
| | |
* | | Edge Rails applications doesn't need to use arel masterRafael Mendonça França2014-03-261-2/+1
| | |
* | | Fix Generation of proper migration whenKuldeep Aggarwal2014-03-252-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Check if any sqlite files are not included in the gitignoreRafael Mendonça França2014-03-241-2/+2
| | | | | | | | | | | | | | | If the sqlite file name change in future version we this regexp should catch
* | | Merge pull request #14447 from Houdini/gitignoreRafael Mendonça França2014-03-245-2/+36
|\ \ \ | | | | | | | | | | | | Skip sqlite3 files in .gitignore if no sqlite3 in app
| * | | Remove sqlite3 lines from .gitignore if the application is not using sqlite3.Dmitrii Golub2014-03-245-2/+36
| | | |
* | | | Adding active_model in Rails::InfoAnkit Gupta2014-03-231-1/+1
|/ / /
* | | test for structure:dump without schema information table. refs eafec46Yves Senn2014-03-201-0/+12
| | | | | | | | | | | | This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa
* | | Remove some indirection in rake dbs testCarlos Antonio da Silva2014-03-201-34/+20
| | | | | | | | | | | | | | | Just pass in the expected database as argument rather than "caching" it in a hash and using the hash in the helper methods.