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
23,486 Commits 34 Branches 105 Tags
fb9bfc2430924bced50f4cc285374bfdeb83f685
Commit Graph

23486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leonard Garvey
fb9bfc2430 Fixed a typo in asset pipeline 2011-06-18 21:15:49 +10:00
Vijay Dev
2fbb7504e2 Revert changes done in c56618ec, 51cb7459 and 030950a. The links are 
pointing to files/*/*.html for usage in api.rubyonrails.org and as a
result are broken in GitHub blobs. This is unavoidable (at least for now).
 2011-06-18 16:02:50 +05:30
Ryan Bigg
c8f046bd45 Flesh out the asset pipeline guide with information learned from today's research 2011-06-18 19:45:31 +10:00
Xavier Noria
20d7d2415f copy-edits 7c2db6c, cbf2af1, and f391f94 2011-06-18 10:22:34 +02:00
Xavier Noria
146ec2d1df Merge branch 'master' of git://github.com/lifo/docrails 2011-06-18 10:11:47 +02:00
Ryan Bigg
0fd52bb6c7 Added 'Configuring Assets' section to configuring guide 2011-06-18 11:16:10 +10:00
Jason Noble
030950a7ee Change ActiveRecord and ActionPack links to point to the right place 2011-06-17 14:13:54 -07:00
Jason Noble
51cb74596a Change ActiveRecord and ActionPack links to point to the right place 2011-06-17 14:13:30 -07:00
Jason Noble
c56618ec0d Change ActiveRecord and ActionPack links to point to the right place 2011-06-17 14:12:11 -07:00
Lucia Escanellas
144a388dec Update remove_index documentation 
* Changes should better reflect present code behavior
* Related to issue: https://github.com/rails/rails/issues/1624
 2011-06-17 16:30:40 -03:00
José Valim
08983fefd5 Attributes on scaffold and model generators default to string. 
This allows the following: "rails g scaffold Post title body:text author"
 2011-06-17 15:10:53 -03:00
Santiago Pastorino
9a64c8ec66 Merge pull request #1751 from guilleiguaran/mysql-0-3-6 
Bump to mysql2 0.3.6
 2011-06-17 10:22:34 -07:00
Guillermo Iguaran
301cad4476 Bump to mysql2 0.3.6 2011-06-17 11:27:37 -05:00
José Valim
0dd32e8edb Merge pull request #1748 from bogdan/select_form_helpers_refactor 
Select tag helpers: remove some code dups
 2011-06-17 07:09:10 -07:00
Jon Leighton
e510c2c642 Add require 'pathname' as it has not already been required in some circumstances 2011-06-17 14:55:34 +01:00
Bogdan Gusiev
69fdfab487 Select tag helpers: remove some code dups 2011-06-17 16:54:35 +03:00
Xavier Noria
248552e324 AS guide: expands safe string docs regarding destructive methods, coercion, copying, etc. 2011-06-17 10:57:33 +02:00
Aaron Patterson
ba1b88fda6 Merge pull request #1636 from metaskills/upstream/3-1-stable 
Allow the connection pool's #table_exists? method to give the connections
 2011-06-17 00:02:45 -07:00
Santiago Pastorino
da25aa5841 Merge pull request #1738 from gazay/3-1-stable-change-nokogiri-version 
Fix several warnings: change version of nokogiri gem
 2011-06-16 16:27:49 -07:00
Alexey Gaziev
171491b1eb Change version of nokogiri gem 2011-06-17 01:01:49 +04:00
José Valim
a788d4e6e9 Merge pull request #1737 from SAP-Oxygen/master-app_plugins_ordering_patch 
Patch for [3.1.0.rc1] App plugins initialized before engines and plugins inside engines
 2011-06-16 13:56:59 -07:00
Joseph Wong
29dfe05e07 Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines 
and plugins inside engines

It seems that plugins inside a Rails 3.1 application proper (i.e. in
/vendor/plugins) are initialized before engines and plugins inside
engines.

After some debugging, I found the culprit in
Rails::Application::Railties#all:

  def all(&block)
    @all ||= railties + engines + super
    @all.each(&block) if block
    @all
  end

The call to super here implicitly passes the &block argument, which
has the unfortunate side-effect of adding the plugin initializers
first (in front of other railties and engines) in the case of
Rails::Engine#initializers:

def initializers
  initializers = []
  railties.all { |r| initializers += r.initializers }
  initializers += super
  initializers
end

The solution here is to replace the super call with a call
to #plugins.
 2011-06-16 13:24:33 -07:00
Jon Leighton
be99ae78c9 Perf fix - Use an instance variable instead of a class_attribute. Thanks @josevalim and @jhawthorn for the prompting. 2011-06-16 21:13:56 +01:00
José Valim
f44db45c87 safe_concat should not work on dirty buffers. 2011-06-16 17:04:31 -03:00
José Valim
594603b45f Fix safe buffer by adding a dirty status. 2011-06-16 16:49:41 -03:00
R.T. Lechow
6ca18f9037 Typo. 2011-06-16 15:44:21 -04:00
wycats
1844572fd1 Make the API for compression consistent between JS and CSS. By default, users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem. 
Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
 2011-06-16 12:09:36 -07:00
José Valim
b9fa32c75e Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patch 
Cherry-picking patch for https://github.com/rails/rails/issues/1460 from 3-1-stable to master
 2011-06-16 11:03:58 -07:00
Joseph Wong
245dba0c89 Cherry-picking patch for https://github.com/rails/rails/issues/1460 
from 3-1-stable to master

[3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
rake tasks ignored

Working with the new support for plugins inside engines in Rails 3.1,
I found that certain things that work for regular plugins don't work
for these new nested plugins. In particular, these methods in
Rails::Engine don't seem to understand that an engine could have
nested plugins:

#load_tasks
#load_generators
#load_console
#eager_load!

A solution which worked out for me is to move the calls to
railties.all { ... } from the overriding methods in Rails::Application
into Rails::Engine.
 2011-06-16 10:52:05 -07:00
Vijay Dev
07d62ff719 minor clean up generators section 2011-06-16 22:49:06 +05:30
Vijay Dev
7c2db6ce37 add info that plugin installs need git or svn installed 2011-06-16 22:49:06 +05:30
Xavier Noria
885428887f Merge pull request #1731 from vijaydev/plugin_name_change 
Replace dev.rubyonrails.com plugin url with a dummy url
 2011-06-16 09:11:18 -07:00
Vijay Dev
d92ad224e0 replace dev.ror.com plugin url with a dummy one 2011-06-16 21:28:42 +05:30
Santiago Pastorino
eedbe1c827 Use html_safe 2011-06-16 12:46:11 -03:00
José Valim
f2c0fb32c0 Remove usage of memoizable from ActionPack. 2011-06-16 08:01:35 -03:00
José Valim
8775ffa372 Update CHANGELOG, improve message. 2011-06-16 07:47:01 -03:00
José Valim
43ed24e23b Merge pull request #1727 from ihower/improve_legacy_wild_controller_route 
Improve the legacy wild controller route in app templates
 2011-06-16 02:11:35 -07:00
José Valim
7de3b362e3 Merge pull request #1725 from arunagw/mysql_bump 
Bump mysql2 to 0.3.5
 2011-06-16 01:59:34 -07:00
Vijay Dev
bfb022adae document doc:* rake tasks 2011-06-16 12:29:47 +05:30
Wen-Tien Chang
d7aac1f1e4 Also change the default route comment 2011-06-16 14:03:41 +08:00
Wen-Tien Chang
adbe7daab6 Improve the legacy wild controller route in app templates 2011-06-16 13:36:42 +08:00
Arun Agrawal
536e1566b6 Bump mysql2 to 0.3.5 2011-06-16 10:45:58 +05:30
JudeAr
cbf2af1e81 typo changes fixed 2011-06-15 22:15:53 -07:00
JudeAr
0dd9db871d fixed typo chnages 2011-06-15 22:04:20 -07:00
Santiago Pastorino and José Ignacio Costa
e445a79562 Bump mysql2 up 2011-06-16 01:05:45 -03:00
José Valim
36253916b0 Deprecate memoizable. 2011-06-15 17:08:08 -03:00
José Valim
6c3e80af68 load_generators from engine should also handle self automatically. 2011-06-15 15:53:58 -03:00
Vijay Dev
406d61ee8c add details on how to use specific annotations in rake:notes 2011-06-15 23:26:19 +05:30
Vijay Dev
3e44159650 document how rake notes work 2011-06-15 22:53:57 +05:30
Jason Fox
1adb38b6c3 Merge pull request #47 from jasonfox/master 
Fixed two errors in the doc
 2011-06-15 09:39:59 -07:00