github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,882 Commits 34 Branches 105 Tags
22f901cc9db4603d775e4e0a96b0775ca08eebce
Commit Graph

26882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsutomu Kuroda
22f901cc9d Infer currency negative format from positive one. 
When a locale file sets the format of the positive
currency value as '%n %u', the default negative
currency format should be '-%n %u'.

Cherry-picked from master (6724c8c8)
 2012-01-05 11:08:09 +09:00
Santiago Pastorino
d268ef2f65 Bump to rc2 2012-01-04 18:59:41 -02:00
José Valim
0b24dc9148 Revert "AS::Callbacks: remove __define_runner" 
Runners are used internally.

This reverts commit 40c8aa706a.
 2012-01-04 21:29:05 +01:00
Jeremy Kemper
49a1017235 Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG. 2012-01-04 12:09:21 -07:00
Jeremy Kemper
d9e0c4a013 Clarify vendor/plugins deprecation warning 2012-01-04 11:49:19 -07:00
Aaron Patterson
d22592a05b Merge pull request #4282 from edgecase/order_after_reorder 
correctly handle order calls after a reorder
 2012-01-04 10:13:22 -08:00
Santiago Pastorino
f8df37bc01 Use sass-rails 3.2.3 2012-01-04 14:25:20 -02:00
Santiago Pastorino
3fb32cfe7c Revert "use pg 0.11.0 under ruby 1.8.7" 
There's a new pg release, no need for this anymore
This reverts commit 0b5cda73e2.
 2012-01-04 14:20:36 -02:00
Vijay Dev
4b2b595992 copy edits 2012-01-04 20:20:52 +05:30
Pablo Ifran
00a27c52ea improve doc in number helper options 2012-01-04 20:20:48 +05:30
Mike Gunderloy
20a4258c7d General editing pass over assets pipeline guide 2012-01-04 20:20:43 +05:30
Vijay Dev
bc36613f4d updates to 3.2 release notes 2012-01-04 20:10:32 +05:30
Kristian Freeman
6bcc1b89dc Final grammar checkup on 3.2 release notes. 2012-01-04 20:08:50 +05:30
José Valim
a10f30963d Merge pull request #4288 from kennyj/fix_4285-2 
(3-2-stable) Fix GH #4285. Remove options when we record calling create_table
 2012-01-03 23:43:26 -08:00
kennyj
6012970fea Fix GH #4285. Remove options when we record calling creat_table 2012-01-04 14:54:38 +09:00
Aaron Patterson
63f7a61246 When generating routes, the last defined named route wins. This is in 
contrast to route recognition where the first recognized route wins.
This behavior will not exist in Rails 4.0.

See:

  https://github.com/rails/rails/issues/4245
  https://github.com/rails/rails/issues/4164
 2012-01-03 14:00:24 -08:00
Aaron Patterson
e9122112fa Revert "Named Routes shouldn't override existing ones (currently route recognition goes with the earliest match, named routes use the latest match)" 
This reverts commit 71d769e3b5.
 2012-01-03 13:56:12 -08:00
Aaron Patterson
c4a29de0e0 Merge pull request #4283 from lest/fix-singleton-checking 
use correct variant of checking whether class is a singleton
 2012-01-03 13:12:02 -08:00
Santiago Pastorino
caa6cdeba1 Merge pull request #4281 from lest/3-2-changelog 
add CHANGELOG entry for AS::Base64 deprecation
 2012-01-03 12:10:59 -08:00
Sergey Nartimov
337ac054db add CHANGELOG entry for AS::Base64 deprecation 2012-01-03 23:08:28 +03:00
Santiago Pastorino
8c129f18d2 Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417 2012-01-03 17:51:10 -02:00
José Valim
124536ed9b Merge pull request #4280 from lest/3-2-backport-callbacks 
backport changes in AS::Callbacks
 2012-01-03 11:31:00 -08:00
José Valim
d38dac8ea9 Override respond_to? since we are also overriding method_missing. 2012-01-03 20:27:38 +01:00
Bogdan Gusiev
40c8aa706a AS::Callbacks: remove __define_runner 2012-01-03 22:14:41 +03:00
Bogdan Gusiev
5b8d27000b Refactor AS::Callbacks 
Extracted `__reset_runner` from `__define_runner`
And call it in proper places
 2012-01-03 22:14:37 +03:00
Bogdan Gusiev
4e8286fe12 AS::Callbacks: improved __define_runner performance 2012-01-03 22:14:33 +03:00
Bogdan Gusiev
9f8f4c2871 AS::Callbacks: improve __define_runner perfomance 2012-01-03 22:14:27 +03:00
Santiago Pastorino
0d7d3a6e77 Add font_path helper method 2012-01-03 17:05:43 -02:00
Aaron Patterson
eafdf6c9bd Merge pull request #4279 from lest/fix-log 
do not rewrite log during application bootstrap
 2012-01-03 09:31:45 -08:00
Santiago Pastorino
ca24ee75af Merge pull request #4278 from kennyj/fix_rdoc_generating_problem 
Use -e option instead of -c option (rake rdoc task).
 2012-01-03 14:05:27 -02:00
José Valim
c032ff6e3c Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64 
deprecate AS::Base64 methods without DeprecatedConstantProxy
 2012-01-03 05:55:51 -08:00
Sergey Nartimov
1fc53df661 deprecate AS::Base64 methods without DeprecatedConstantProxy 2012-01-03 16:37:20 +03:00
Santiago Pastorino
853de2bd9a Deprecate Rails::Plugin in favor of gems 2012-01-03 10:37:47 -02:00
José Valim
2535898acf Merge pull request #4273 from lest/fix-pg-version 
use pg 0.11.0 under ruby 1.8.7
 2012-01-03 03:51:10 -08:00
Sergey Nartimov
0b5cda73e2 use pg 0.11.0 under ruby 1.8.7 2012-01-03 14:47:31 +03:00
Xavier Noria
e369c4e67f Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64 
fix base64 requires
 2012-01-02 14:21:13 -08:00
Sergey Nartimov
4f440a3833 fix base64 requires 2012-01-03 01:18:34 +03:00
Xavier Noria
7bdfbac580 Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64 
deprecate ActiveSupport::Base64
 2012-01-02 14:00:32 -08:00
Sergey Nartimov
5f09414f85 deprecate ActiveSupport::Base64 
extend and define ::Base64 if needed
 2012-01-03 00:57:03 +03:00
Vijay Dev
6e9cd38468 DRY up guides index page 
Use the list of guides available in documents.yaml to fill in the
menu in the index page instead of duplicating the list again. Also,
remove WIP guides from the menu.
 2012-01-01 23:04:37 +05:30
Alejandro Andrés
8be9d92c8b Fixed documentation error in code examples from form_tag_helper.rb 2011-12-31 19:11:00 +05:30
Sam Umbach
95a83cc248 SCSS processor is provided by the sass gem 2011-12-31 19:11:00 +05:30
Sam Umbach
003d0ff3f8 Minor readability improvements 2011-12-31 19:11:00 +05:30
Vijay Dev
ba19837a89 fix a couple of formatting issues 2011-12-31 19:11:00 +05:30
Vijay Dev
0a048f3a4f remove wiki link 2011-12-31 19:11:00 +05:30
Aaron Patterson
f12d90486c Merge pull request #4227 from gazay/3-2-stable-marshalling 
3 2 stable marshalling
 2011-12-30 10:04:39 -08:00
Xavier Noria
0814e745b7 adds a comments that clarifies why Range#include? chooses the comparison operator 2011-12-30 02:25:00 -08:00
Sergey Nartimov
71f59b72fe refactor Range#include? to handle ranges with floats 
Conflicts:

	activesupport/lib/active_support/core_ext/range/include_range.rb
 2011-12-30 02:24:46 -08:00
Aaron Patterson
766eda3e11 fixing typo. Thanks Vijay! 2011-12-29 10:23:48 -08:00
Vijay Dev
63c6feefc9 revise some doc changes 2011-12-29 23:39:06 +05:30