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,515 Commits 34 Branches 105 Tags
d759d19507439fc65754459befe64a65930b8366
Commit Graph

23515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillermo Iguaran
d759d19507 Use uglifier from rubygems instead of git repo 2011-06-21 10:59:48 -05:00
José Valim
8a889dd45e Merge pull request #1786 from gazay/3-1-stable-regexp-fix 
Fix regexp in generators for right catching error message
 2011-06-20 14:35:30 -07:00
Alexey Gaziev
91bbb8e956 Removed tests for rescue branch for Rails 2.x compatibility 2011-06-20 22:29:30 +04:00
José Valim
ac78ff76ad Merge pull request #1787 from cmeiklejohn/make_fragment_for_more_robust_for_subclasses_of_safe_buffer 
fragment_for assumes ActionView::OutputBuffer.
 2011-06-20 11:01:33 -07:00
Christopher Meiklejohn
a52e4189b5 Only mark the sliced buffer as safe, if it was safe to begin with. 2011-06-20 13:52:21 -04:00
Christopher Meiklejohn
d12aa483f2 Streamline fragment_for SafeBuffer logic to make it more concise. 2011-06-20 13:20:42 -04:00
Alexey Gaziev
78cd3f9ec2 Removed rescue branch for Rails 2.x compatibility 2011-06-20 20:13:52 +04:00
Alexey Gaziev
ca044113f3 Fix regexp in generators for right catching error message 2011-06-20 19:54:37 +04:00
José Valim
81f7bf55c7 Merge pull request #1785 from medwezys/master 
Do not change a frozen text passed to simple_format text helper
 2011-06-20 07:01:47 -07:00
Tadas Tamosauskas
f292f0971f Do not change a frozen text passed to simple_format text helper 2011-06-20 14:51:07 +01:00
José Valim
89b3293a54 Merge pull request #1784 from gazay/3-1-stable-shadowing-variables 
Removing shadowing outer local variables warnings
 2011-06-20 06:48:17 -07:00
Alexey Gaziev
93f488e7fa Removed shadowing variable warning in activerecord railties 2011-06-20 17:28:59 +04:00
Alexey Gaziev
87329ef67f Removed warnings about shadowing variables 2011-06-20 17:22:09 +04:00
José Valim
b7c8e0bb0c Merge pull request #1780 from dazuma/fix_missing_require_set 
Add missing require 'set'
 2011-06-20 04:37:37 -07:00
Daniel Azuma
140ba34aa9 Add missing require 'set' 2011-06-20 00:24:35 -07:00
Joshua Peek
2df2bfdb4b Merge pull request #1776 from jamesarosen/clean_images 
assets:clean task now cleans up images
 2011-06-19 19:09:50 -07:00
James A. Rosen
7440a254c4 assets:clean task now cleans up images 2011-06-19 18:40:17 -07:00
Santiago Pastorino
4131fd7c79 Call super here to allow SessionHash initialize new stuff for us 2011-06-19 22:00:22 -03:00
José Valim
93b7da478b Merge pull request #1770 from arunagw/require_relative_remove 
Removing require_relative gem. Linecache new version 0.46 is out and it's
 2011-06-19 04:51:42 -07:00
Xavier Noria
ed4be0a3a4 explains why links are gsub'ed, and changes the regexp delimiters 2011-06-19 11:45:36 +02:00
Arun Agrawal
41aba82673 Removing require_relative gem. Linecache new version 0.46 is out and it's loading rbx-require-relative > 0.0.4 2011-06-19 15:05:38 +05:30
José Valim
e6f15f0553 Ugh, the class_attribute pull request broke the build. fix it. 2011-06-19 00:06:48 -03:00
José Valim
7d4606156b Merge pull request #1763 from grantneufeld/schema_column_exists_options_hash 
Fix default options argument on ActiveRecord::ConnectionAdaptors::Table#column_exists?
 2011-06-18 19:34:39 -07:00
José Valim
4054435b28 Merge pull request #1764 from stevehodgkiss/master 
Fix inconsistencies with serving images in production mode when ActiveRecord is loaded
 2011-06-18 19:31:17 -07:00
José Valim
b1b42b55e2 Merge pull request #1765 from bensie/class_attribute_skip_reader 
Add option to omit creating an instance reader method on class_attribute
 2011-06-18 19:29:38 -07:00
James Miller
0ce5fb8a27 Add option to omit creating an instance reader method on class_attribute 2011-06-18 15:49:11 -07:00
Xavier Noria
6c705e33ef Merge pull request #1762 from vijaydev/readme_links_rdoc 
Solving the problem of links being broken in GitHub for the sake of api site
 2011-06-18 15:02:31 -07:00
Steve Hodgkiss
50444204cc Fix inconsistencies by being polite to the wrapped body. Needed for Rack::Sendfile to function properly. See issue #1761. 2011-06-18 22:30:01 +01:00
Grant Neufeld
3cc83a8f24 Changed the default value for the options argument on ActiveRecord::ConnectionAdapters::Table#column_exists? from nil to an empty Hash {}. 
That method calls through to ActiveRecord::ConnectionAdapters::SchemaStatements##column_exists? expects options to be a Hash.

When options was nil, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.
 2011-06-18 14:38:38 -06:00
Vijay Dev
96c57d4bd0 To solve the problem of links being broken in GitHub for the sake of api site, have them replaced at runtime during rdoc generation 2011-06-18 23:45:59 +05:30
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