aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improve readabilityParitosh Piplewar2013-03-291-18/+50
|
* Merge pull request #9989 from robertomiranda/group-assetsGuillermo Iguaran2013-03-281-12/+11
|\ | | | | Update Gemfile since group assets doesn't exist anymore in Gemfile
| * Update Gemfile since group assets doesn't exist anymore in Gemfilerobertomiranda2013-03-281-12/+11
| |
* | Merge pull request #9987 from robertomiranda/group-assetsRafael Mendonça França2013-03-281-2/+3
|\| | | | | Update Bundler require in getting started application
| * Update Bundler require in getting started applicationrobertomiranda2013-03-281-2/+3
|/
* Update the call to Bundler.require in application.rb since assets group ↵Guillermo Iguaran2013-03-281-2/+3
| | | | doesn't exist anymore in Gemfile
* Add better comments to assets gemsGuillermo Iguaran2013-03-281-9/+22
|
* Merge pull request #9984 from ranjaykrishna/col-probRafael Mendonça França2013-03-283-4/+8
|\ | | | | valid_type? added to super class abstract_adapter
| * added comments to test_invalid_type in sqlite3 adapter test and added ↵Ranjay Krishna2013-03-283-4/+8
| | | | | | | | valid_type? method to abstract_adapter.rb and removed unnecessary method from sqlite3 adapter
* | Merge pull request #9982 from prathamesh-sonpatki/railite-typoCarlos Antonio da Silva2013-03-281-1/+1
|\ \ | | | | | | Fix typo
| * | Fix typoPrathamesh Sonpatki2013-03-281-1/+1
|/ /
* | contrib guide: documents guidelines for running the test suiteXavier Noria2013-03-281-0/+11
| |
* | contrib guide: documents how to generate a --dev applicationXavier Noria2013-03-281-0/+16
| |
* | Merge pull request #9977 from vipulnsward/fix_column_test_typoRafael Mendonça França2013-03-281-3/+3
|\ \ | |/ |/| anual_salary => annual_salary
| * anual_salary => annual_salaryVipul A M2013-03-281-3/+3
|/
* Merge pull request #9974 from prathamesh-sonpatki/change_logSteve Klabnik2013-03-281-1/+1
|\ | | | | Removed unused variable in proc [ci skip]
| * Removed unused variable in procPrathamesh Sonpatki2013-03-281-1/+1
|/ | | | | | * This unused variable is already removed from the code here. d18e8b1a3839c5c214e96c7e37e0d86febe15f99 * So removing it from CHANGELOG to be consistent with code
* Merge pull request #9972 from divineforest/fix-overriden-typoRafael Mendonça França2013-03-284-5/+5
|\ | | | | Fix typo: overriden => overriDDen
| * Fix typo: overriden => overriDDenAlexander Balashov2013-03-284-5/+5
| |
* | Merge pull request #9973 from prathamesh-sonpatki/AR-typosRafael Mendonça França2013-03-283-5/+5
|\ \ | | | | | | Fixed typos in ActiveRecord
| * | Fixed typos in ActiveRecordPrathamesh Sonpatki2013-03-283-5/+5
|/ /
* | Merge pull request #9970 from divineforest/fix-typoRafael Mendonça França2013-03-281-1/+1
|\ \ | | | | | | Fix typo
| * | Fix typoAlexander Balashov2013-03-281-1/+1
| |/
* | Use snake case variable names, stick with the conventionCarlos Antonio da Silva2013-03-281-13/+13
| |
* | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
|\ \ | | | | | | Refactored to remove unused loop variable
| * | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
| | |
* | | Merge pull request #9963 from obrie/fix/after_create_updatesCarlos Antonio da Silva2013-03-282-1/+17
|\ \ \ | |_|/ |/| | Fix updates not working within after_create hooks
| * | Fix updates not working within after_create hooksAaron Pfeifer2013-03-272-1/+17
| | |
* | | Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammarCarlos Antonio da Silva2013-03-281-1/+1
|\ \ \ | |_|/ |/| | Fixed grammar
| * | Fixed grammarAnupam Choudhury2013-03-281-1/+1
|/ /
* | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]Xavier Noria2013-03-282-0/+12
| |
* | Add coffee-rails and javascript runtime to gemfile if skip_javascript isRafael Mendonça França2013-03-281-2/+9
| | | | | | | | provided
* | Merge pull request #9944 from where/rebased-fulltext-spacialRafael Mendonça França2013-03-2713-37/+108
|\ \ | | | | | | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL
| * | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL.Ken Mazaika2013-03-2713-37/+108
|/ /
* | Merge pull request #9964 from where/using-schema-dumpRafael Mendonça França2013-03-273-2/+11
|\ \ | |/ |/| Dump the 'using' options for a SQL index into the schema.
| * Dump the 'using' options for a SQL index into the schema.Ken Mazaika2013-03-273-2/+11
|/
* Merge pull request #9523 from ↵Rafael Mendonça França2013-03-274-2/+16
|\ | | | | | | | | | | | | | | | | stopdropandrew/Instrumenter#instrument-yields-payload ActiveSupport::Notifications::Instrumenter#instrument should yield Conflicts: activesupport/CHANGELOG.md
| * ActiveSupport::Notifications::Instrumenter#instrument should yieldstopdropandrew2013-03-024-3/+16
| | | | | | | | its payload the same way that ActiveSupport::Notifications does. Fix spelling in test name.
* | Merge pull request #9955 from rubys/cleanup_app_gemfileRafael Mendonça França2013-03-271-17/+7
|\ \ | | | | | | Cosmetic cleanup of generated Gemfile
| * | Remove buggy and unnecessary logicSam Ruby2013-03-271-7/+0
| | | | | | | | | | | | based on a discussion with @rafaelfranca
| * | Cosmetic cleanup of generated GemfileSam Ruby2013-03-271-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
* | | Fix syntax errorRafael Mendonça França2013-03-271-1/+0
| | |
* | | Merge pull request #9274 from KrzysiekJ/spaces_in_scope_namesRafael Mendonça França2013-03-272-5/+17
|\ \ \ | |/ / |/| | | | | Use define_method when method name contains weird characters.
| * | Use define_method when method name contains weird characters.Krzysztof Jurewicz2013-03-182-5/+17
| | |
* | | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-274-5/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md
| * | | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-274-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method.
* | | | Merge pull request #9954 from neerajdotname/space_after_entirelyRafael Mendonça França2013-03-271-1/+1
|\ \ \ \ | | | | | | | | | | entirelyby => 'entirely by'
| * | | | entirelyby => 'entirely by'Neeraj Singh2013-03-271-1/+1
|/ / / /
* | | | Merge pull request #9949 from vipulnsward/drop_yaml_error_constantRafael Mendonça França2013-03-272-4/+2
|\ \ \ \ | | | | | | | | | | drop errors constant
| * | | | drop errors constantVipul A M2013-03-272-4/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 11:43:47 +0000