aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use fetch rather than both Hash#key? and Hash#[]Aaron Patterson2012-01-251-49/+51
|
* Merge pull request #4524 from nashby/datetime-18-codeJosé Valim2012-01-251-15/+0
|\ | | | | remove ruby 1.8 related code
| * remove ruby 1.8 related codeVasiliy Ermolovich2012-01-181-15/+0
| |
* | Merge pull request #4667 from carlosantoniodasilva/av-number-helperJosé Valim2012-01-252-44/+55
|\ \ | | | | | | Action View number helpers improvements
| * | Do not mutate given options hash in number helpersCarlos Antonio da Silva2012-01-252-9/+32
| | |
| * | Refactor percentage helperCarlos Antonio da Silva2012-01-251-1/+2
| | |
| * | Refactor float number parsingCarlos Antonio da Silva2012-01-251-25/+9
| | |
| * | Improve getting translations for number helpersCarlos Antonio da Silva2012-01-251-10/+13
|/ /
* | Merge pull request #4661 from janko-m/masterJosé Valim2012-01-252-6/+15
|\ \ | | | | | | Modify video_tag a bit and make audio_tag able to accept multiple sources
| * | Make audio_tag able to receive multiple sourcesJanko Marohnić2012-01-252-3/+12
| | |
| * | Make path_to_video in video_tag apply to each sourceJanko Marohnić2012-01-252-3/+3
| | |
* | | Merge pull request #4651 from paul/mysql-add-index-bugJosé Valim2012-01-252-2/+8
|\ \ \ | |/ / |/| | Handle nil in add_index :length option in MySQL
| * | Handle nil in add_index :length option in MySQLPaul Sadauskas2012-01-242-2/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our schema.rb is being generated with an `add_index` line similar to this: add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil} This is the same as it was on Rails 3.1.3, however, now when that schema.rb is evaluated, its generating bad SQL in MySQL: Mysql::Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '))' at line 1: CREATE UNIQUE INDEX `xxx` ON `foo` (`foo`(8), `bar`()) This commit adds a check for nil on the length attribute to prevent the empty parens from being output.
* | Remove unused variables to avoid warningsRafael Mendonça França2012-01-241-3/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge pull request #4606 from lest/patch-1Aaron Patterson2012-01-241-2/+0
|\ \ | | | | | | remove unnecessary AS::Concern usage
| * | remove unnecessary AS::Concern usageSergey Nartimov2012-01-221-2/+0
| | |
* | | deprecated AR::TestCase in favor of AS::TestCaseAaron Patterson2012-01-241-0/+4
| | |
* | | Moving AR::TestCase in to the AR tests directoryAaron Patterson2012-01-243-32/+64
| | |
* | | Merge pull request #4641 from rafaelfranca/date_select-fix-3-2José Valim2012-01-242-4/+41
| | | | | | | | | | | | date_select fixes [3-2-stable]
* | | Merge pull request #4514 from brainopia/update_timezone_offetsAaron Patterson2012-01-241-1/+1
|\ \ \ | | | | | | | | Update time zone offset information
| * | | Update time zone offset informationbrainopia2012-01-181-1/+1
| | | |
* | | | Merge pull request #3775 from karevn/masterAaron Patterson2012-01-242-2/+16
|\ \ \ \ | | | | | | | | | | Please pull my changes - they fix a rare problem with tests framework
| * | | | Fix: when using subdomains and constraints, request params were not passed ↵karevn2011-11-282-2/+16
| | | | | | | | | | | | | | | | | | | | to constraints callback
* | | | | fix some examples - method names can't start with a numberVijay Dev2012-01-241-5/+5
| | | | |
* | | | | Merge pull request #4630 from lest/patch-2Aaron Patterson2012-01-241-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Use instance_eval instead of Proc#bind
| * | | | | Use instance_eval instead of Proc#bindSergey Nartimov2012-01-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Proc#bind is not useful when called immediately and previous check for #call method is not correct
* | | | | | Merge pull request #4637 from railsaholic/error_message_fixAaron Patterson2012-01-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | quote fix ` to ' in the ArgumentError message
| * | | | | | quote fix ` to ' in the ArgumentError messageManoj2012-01-241-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | message quote fix
* | | | | | Merge pull request #4636 from sachin87/code_improvedXavier Noria2012-01-241-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | code improved with better condition
| * | | | | | code improvedSachin872012-01-241-6/+3
|/ / / / / /
* | | | | | Merge pull request #4628 from rafaelfranca/fix-buildJosé Valim2012-01-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix broken build
| * | | | | | Only show the type if column is presentRafael Mendonça França2012-01-231-1/+2
| |/ / / / /
* | | | | | Merge pull request #4596 from kennyj/fix_4344José Valim2012-01-242-1/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix GH #4344. Callback defined in a module is not triggered when the module extends an object under Rails 3.2rc2
| * | | | | | Fix GH #4344. A defined callback in extended module is called too.kennyj2012-01-242-1/+57
|/ / / / / /
* | | | | | initialized the @segment_keys instance variableAaron Patterson2012-01-231-1/+4
| | | | | |
* | | | | | Added custom regexps to ASTs that have literal nodes on either side ofAaron Patterson2012-01-232-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | symbol nodes. Fixes #4585
* | | | | | moved the `get` testing method to a moduleAaron Patterson2012-01-232-11/+17
|/ / / / /
* | | | | updated the warning signatureAaron Patterson2012-01-231-1/+1
| | | | |
* | | | | Deprecated multi args to http route methodsAaron Patterson2012-01-232-1/+13
| | | | |
* | | | | Merge pull request #4558 from stephencelis/type-cast-unknown-should-failAaron Patterson2012-01-233-8/+6
|\ \ \ \ \ | | | | | | | | | | | | Don't type-cast unknown types to YAML.
| * | | | | Don't type-cast unknown types to YAML.Stephen Celis2012-01-203-8/+6
| | | | | |
* | | | | | Merge pull request #4563 from amatsuda/ar_relation_ppAaron Patterson2012-01-231-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | let AR::Relation pretty_printed like an Array
| * | | | | | let AR::Relation pretty_printed like an ArrayAkira Matsuda2012-01-211-0/+4
| | | | | | |
* | | | | | | Merge pull request #4576 from guilleiguaran/bump-required-rubygems-versionAaron Patterson2012-01-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump rubygems required version to 1.8.11 (default version in 1.9.3-p0)
| * | | | | | | Bump rubygems required version to 1.8.11 (default version in 1.9.3-p0)Guillermo Iguaran2012-01-211-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #4581 from kennyj/remove_unused_argumentAaron Patterson2012-01-231-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unused argument.
| * | | | | | | | Remove unused argument.kennyj2012-01-221-3/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #4620 from carlosantoniodasilva/counter-cache-old-codeAaron Patterson2012-01-231-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove not used if..else clause
| * | | | | | | | | Remove not used if..else clauseCarlos Antonio da Silva2012-01-231-6/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to #4614.
* | | | | | | | | Merge pull request #4617 from sachin87/remove_repetitionJosé Valim2012-01-231-4/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | alias_method added
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 04:16:07 +0000