Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | rename `str` to `string` to fix overshadowing of variable | Vipul A M | 2014-05-07 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix rails dbconsole for jdbcmysql adapter. | Gabriel Gilder and Jim Kingdon | 2014-05-05 | 1 | -1/+1 | |
| | | | ||||||
* | | | skip-git should not hit git commands plugin generators | Arun Agrawal | 2014-05-02 | 3 | -14/+38 | |
| | | | ||||||
* | | | Works correctly if git not installed | Roman Shmatov | 2014-05-02 | 2 | -8/+30 | |
| | | | ||||||
* | | | Automaticly add username and email if configured in git-scm, as bundle gem | Abd ar-Rahman Hamidi | 2014-05-02 | 3 | -3/+19 | |
| | | | ||||||
* | | | Avoid unnecessary conditional block | Giovanni Cappellotto | 2014-05-01 | 1 | -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 #14877 | Yves Senn | 2014-04-27 | 1 | -1/+0 | |
| | | | | | | | | | | The last uses of this variable was removed with the `--builder` option. 2da5ea1c9feb4a7b491bd00bd6ffd931b9203da8 | |||||
* | | Merge branch 'master' into adequaterecord | Aaron Patterson | 2014-04-25 | 1 | -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 Draper | 2014-04-24 | 1 | -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 Patterson | 2014-04-23 | 1 | -1/+2 | |
|/ / | | | | | | | This reverts commit 7f62f30f58fe5f2955e3292ab1f01aa2c9a8f0ee. | |||||
* | | Make console and generators blocks works at Application instance level | Rafael Mendonça França | 2014-04-14 | 4 | -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ça | 2014-04-14 | 1 | -4/+4 | |
| | | ||||||
* | | 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 | 8 | -35/+76 | |
|\ \ | | | | | | | 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 | 2 | -24/+32 | |
| | | | ||||||
| * | | Update Gemfile templates to provide correct debugger | David Rodríguez de Dios | 2014-04-08 | 4 | -7/+21 | |
| | | | ||||||
| * | | Keep debugger support only for rubies < 2.0.0 | David Rodríguez de Dios | 2014-04-08 | 4 | -10/+29 | |
| | | | ||||||
* | | | Merge pull request #14689 from matthewd/asset_initializer | Rafael Mendonça França | 2014-04-11 | 5 | -7/+20 | |
|\ \ \ | | | | | | | | | Move assets precompile (and version) to an initializer | |||||
| * | | | Move assets precompile (and version) to an initializer | Matthew Draper | 2014-04-11 | 5 | -7/+20 | |
| | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | ||||||
* | | | depend_on_asset is not required anymore on sprockets-rails 2.1.2 | Rafael Mendonça França | 2014-04-09 | 1 | -6/+6 | |
| | | | ||||||
* | | | 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 | 2 | -9/+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 | 3 | -1/+17 | |
| | | | | | | | | Fixes #14620 | |||||
* | | Remove useless begin..end | Carlos Antonio da Silva | 2014-04-07 | 1 | -2/+1 | |
| | | ||||||
* | | Declare the assets dependency | Rafael Mendonça França | 2014-04-04 | 1 | -7/+8 | |
| | | ||||||
* | | 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 | 3 | -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 explicitly | Adrià Planas | 2014-03-29 | 1 | -0/+1 | |
| | | ||||||
* | | Add CHANGELOG entry for #12778 [ci skip] | Rafael Mendonça França | 2014-03-28 | 1 | -0/+4 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
* | | | Fix build with bundler 1.6 | Rafael Mendonça França | 2014-03-26 | 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 | 2 | -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 gitignore | Rafael Mendonça França | 2014-03-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | If the sqlite file name change in future version we this regexp should catch | |||||
* | | | Merge pull request #14447 from Houdini/gitignore | Rafael Mendonça França | 2014-03-24 | 5 | -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 Golub | 2014-03-24 | 5 | -2/+36 | |
| | | | | ||||||
* | | | | Adding active_model in Rails::Info | Ankit Gupta | 2014-03-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | test for structure:dump without schema information table. refs eafec46 | Yves Senn | 2014-03-20 | 1 | -0/+12 | |
| | | | | | | | | | | | | This is a test case for the fix provided in eafec4694c5b37eff9d83b1188b8e331fa6027fa | |||||
* | | | Remove some indirection in rake dbs test | Carlos Antonio da Silva | 2014-03-20 | 1 | -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. | |||||
* | | | Check if the output is empty rather than asserting for equality | Carlos Antonio da Silva | 2014-03-20 | 1 | -5/+4 | |
| | | | | | | | | | | | | Also fix indent of test block. | |||||
* | | | Refactor assertion of line numbers matching 4 spaces | Carlos Antonio da Silva | 2014-03-19 | 1 | -16/+4 | |
| | | | ||||||
* | | | Move booting/loading tasks setup to the rake notes helper method | Carlos Antonio da Silva | 2014-03-19 | 1 | -15/+3 | |
| | | |