aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Correct comment for (beginning|end)_of_minuteGert Goet2013-02-222-4/+4
|/ / / / / / / / / / /
* / / / / / / / / / / Fix backwards compatibility with Rails 3 apps.Steve Klabnik2013-02-223-40/+52
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed script/rails and introduced bin/rails, we accidentally introduced a regression. If you install Rails 4 as a gem, then try to do something in a Rails 3 application: $ rails g This will throw the 'please type rails new foo' message rather than the proper generator documentation message. This is because older apps don't have bin/rails. Therefore, we now *prefer* bin/rails, but still search for script/rails, and exec the one we find.
* | | | | | | | | | Merge pull request #9334 from NARKOZ/time_tagAndrew White2013-02-212-19/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | use ISO 8601 format in time_tag helper
| * | | | | | | | | | document setting custom datetime attribute for time_tag helperNihad Abbasov2013-02-221-0/+2
| | | | | | | | | | |
| * | | | | | | | | | fix time_tag helper and update tests to not rely on dynamically generated valuesNihad Abbasov2013-02-222-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute.
* | | | | | | | | | | Merge pull request #9365 from gaganawhad/core-ext-beginning-of-minuteAndrew White2013-02-216-0/+61
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added beginning_of_minute support to core_ext calculations for Time and DateTime
| * | | | | | | | | | | Added beginning_of_minute support to core_ext calculations for Time and DateTimeGagan Awhad2013-02-216-0/+61
| | | | | | | | | | | |
* | | | | | | | | | | | completes pass over the AP changelog [ci skip]Xavier Noria2013-02-212-15/+6
| | | | | | | | | | | |
* | | | | | | | | | | | tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-9/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntaxAndrew White2013-02-213-14/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | determine the match shorthand target early.
| * | | | | | | | | | | determine the match shorthand target early.Yves Senn2013-02-213-14/+53
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes.
* | | | | | | | | | | Revert "Revert "Merge pull request #4803 from lucascaton/master""Santiago Pastorino2013-02-213-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
* | | | | | | | | | | This cache is not neededSantiago Pastorino2013-02-211-2/+1
| | | | | | | | | | |
* | | | | | | | | | | Use composition to figure out the forgery protection strategySantiago Pastorino2013-02-211-9/+27
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Use #grep to filter priority zones when a regexp is givenCarlos Antonio da Silva2013-02-212-3/+5
| | | | | | | | | |
* | | | | | | | | | Use Array Difference to calculate the zones array, instead of iteratingCarlos Antonio da Silva2013-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's faster, and doesn't force us to dup the timezones array.
* | | | | | | | | | Fix test name and refactor fake timezones creation in form options testCarlos Antonio da Silva2013-02-211-3/+3
| | | | | | | | | |
* | | | | | | | | | Remove not necessary changelog about time zone array mutationCarlos Antonio da Silva2013-02-211-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seemed to be introduced in master by 9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a changelog entry for fixing it. [ci skip]
* | | | | | | | | | tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-42/+27
| | | | | | | | | |
* | | | | | | | | | Merge pull request #9358 from iwiznia/patch-1Xavier Noria2013-02-211-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Update railties/lib/rails/application/configuration.rb
| * | | | | | | | | Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better comment for database_configuration method
| * | | | | | | | | Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"]
* | | | | | | | | Merge pull request #9354 from NARKOZ/remove-warningsSteve Klabnik2013-02-211-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove assigned but unused variables
| * | | | | | | | | remove assigned but unused variable warningNihad Abbasov2013-02-211-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #9357 from fabiokr/rack_test_uploaded_fileXavier Noria2013-02-212-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Rack::Test::UploadedFile is a permitted scalar
| * | | | | | | | Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-212-4/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_tableXavier Noria2013-02-212-0/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add more documentation for create_join_table.
| * | | | | | | | Indent comment block by two spaces.Marc Schütz2013-02-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by @fxn https://github.com/schuetzm/rails/commit/743d15bba182df80d003d205690ead988970299c#commitcomment-2661417
| * | | | | | | | Add more documentation for create_join_table.Marc Schütz2013-02-202-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that it doesn't create indices by default and that it also has a block form.
* | | | | | | | | Merge pull request #9352 from senny/remove_uncommented_boot_testCarlos Antonio da Silva2013-02-211-20/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove commented railties boot_test.rb
| * | | | | | | | | remove uncommented railties boot_test.rbYves Senn2013-02-211-20/+0
| | | | | | | | | |
* | | | | | | | | | Fix warningRafael Mendonça França2013-02-211-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | ActiveRecord -> Active Record [ci skip]Xavier Noria2013-02-201-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #9345 from ↵Rafael Mendonça França2013-02-201-10/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wangjohn/change_name_of_query_method_argument_checker_for_clarity Renaming the check_empty_arguments method to something more descriptive.
| * | | | | | | | | Renaming the check_empty_arguments method to something more descriptive.wangjohn2013-02-201-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function is now called has_arguments? so that it's easier to tell that it's just checking to see if the args are blank or not.
* | | | | | | | | | removes relation bang methods from the AR changelog [ci skip]Xavier Noria2013-02-201-12/+0
| | | | | | | | | |
* | | | | | | | | | removes some remaining relation bang methods documentation [ci skip]Xavier Noria2013-02-201-3/+0
| | | | | | | | | |
* | | | | | | | | | puts a lambda around a default scope [ci skip]Xavier Noria2013-02-201-1/+1
| | | | | | | | | |
* | | | | | | | | | adds an example in the docs of #not with multiple conditions [ci skip]Xavier Noria2013-02-201-4/+8
| | | | | | | | | |
* | | | | | | | | | database.yml -> config/database.yml [ci skip]Xavier Noria2013-02-201-1/+1
| | | | | | | | | |
* | | | | | | | | | Revert "Merge pull request #4803 from lucascaton/master"Santiago Pastorino2013-02-203-5/+3
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb
* | | | | | | | | Skip failing test and add a FIXME noteRafael Mendonça França2013-02-201-0/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #9344 from senny/changelog_cleanupRafael Mendonça França2013-02-201-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | unify AR changelog entries [ci skip]
| * | | | | | | | | unify AR changelog entries [ci skip]Yves Senn2013-02-201-4/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #8645 from senny/rename_index_on_rename_columnRafael Mendonça França2013-02-207-8/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | also rename indexes when a table or column is renamed
| * | | | | | | | | also rename indexes when a table or column is renamedYves Senn2013-02-207-8/+73
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When a table or a column is renamed related indexes kept their name. This will lead to confusing names. This patch renames related indexes when a column or a table is renamed. Only indexes with names generated by rails will be renamed. Indexes with custom names will not be renamed.
* | | | | | | | | moves the new :nsec date format to the Active Support changelog [ci skip]Xavier Noria2013-02-202-6/+5
| | | | | | | | |
* | | | | | | | | revises the documentation of AR::Base.cache_timestamp_format [ci skip]Xavier Noria2013-02-201-2/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #8613 from senny/8264_character_limit_for_indicesRafael Mendonça França2013-02-206-14/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | deal with long index names and internal sqlite3 operations
| * | | | | | | | reserve less chars for internal sqlite3 operationsYves Senn2013-02-201-7/+7
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:20:39 +0000