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
24,211 Commits 34 Branches 105 Tags
d9b59c341c5cc5848a42e936588a67130bf7ff4a
Commit Graph

24211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Gebhardt
d9b59c341c Extracted version from gemspec and placed it in its own file. This is consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems. 2011-07-28 09:47:21 -04:00
Dan Gebhardt
5515a18aa5 Expanded meta-data in gemspec to include author, email, etc.; Defaults include "TODO" to prevent gems from being built without review. 2011-07-28 09:46:13 -04:00
Santiago Pastorino
d482cf8bfa Merge pull request #2285 from castlerock/remove_warnings_ruby193 
remove unused variables warnings removed
 2011-07-26 12:33:34 -07:00
Santiago Pastorino
49ebd01d19 Merge pull request #2284 from joshk/patch-6 
enable Travis CI irc notifications to #rails-contrib on irc.freenode.org
 2011-07-26 12:32:39 -07:00
Vishnu Atrai
db34a65277 remove unused variables warnings removed 2011-07-26 23:53:54 +05:30
Josh Kalderimis
5a5d7ba973 enable Travis CI irc notifications to #rails-contrib on irc.freenode.org 2011-07-26 18:17:58 +00:00
Aaron Patterson
0868461ee0 Merge pull request #2283 from castlerock/remove_warnings_ruby193 
remove deprication warning: ambiguous first argument; put parentheses or
 2011-07-26 11:14:23 -07:00
Vishnu Atrai
1e69f0b84a remove deprication warning: ambiguous first argument; put parentheses or even spaces 2011-07-26 23:39:17 +05:30
Aaron Patterson
64807b964f fixing tests on ruby trunk 2011-07-26 11:02:41 -07:00
Aaron Patterson
d4246e5bb3 fixing whitespace errors 2011-07-26 11:00:33 -07:00
Santiago Pastorino
af6abc6404 Merge pull request #2281 from castlerock/remove_warnings_ruby193 
remove deprication warning for ruby 1.9.3-head for unused variable
 2011-07-26 10:42:15 -07:00
Vishnu Atrai
cf3f1c9ba8 remove deprication warning for ruby 1.9.3-head for unused variables 2011-07-26 22:33:23 +05:30
José Valim
bdbf97c23b Merge pull request #2277 from dmathieu/fix_actionpack_tests 
Fix actionpack's test suite
 2011-07-26 08:02:45 -07:00
Damien Mathieu
945f0c82af use sprocket's append_path and assert_match 2011-07-26 16:59:15 +02:00
Piotr Sarnacki
14c6fca9cd Revert "allow select to have multiple arguments" 
This reverts commit 04cc446d17.

I reverted it because apparently we want to use: select([:a, :b])
instead of select(:a, :b), but there was no tests for that form.
 2011-07-26 16:15:12 +02:00
Piotr Sarnacki
89f3d8a886 Merge pull request #2271 from slawosz/enhance_select_method_api 
allow select to have multiple arguments ie. Post.select(:id,:name,:author)
 2011-07-26 06:33:54 -07:00
Santiago Pastorino
cfd086a302 Merge pull request #2272 from cesario/fix_relations_test 
Simplify the test by using id and name.
 2011-07-26 06:25:05 -07:00
Sławosz Sławiński
04cc446d17 allow select to have multiple arguments 2011-07-26 14:57:47 +02:00
Franck Verrot
41902e6932 Simplify the test by using id and name. id will be the only real sort criteria in any case as it's unique. 2011-07-26 11:36:18 +02:00
Santiago Pastorino
b4e577945b use_sprockets is not used anymore 2011-07-26 01:00:00 -03:00
Santiago Pastorino
155bb7c75d Bump sprockets up 2011-07-26 00:42:31 -03:00
Santiago Pastorino
4d13e90531 Check that Rack::Sendfile is not included unless config.action_dispatch.x_sendfile_header is set 2011-07-26 00:19:45 -03:00
Santiago Pastorino
36ab1cd293 Bump rack up. Closes #2107 2011-07-25 23:03:30 -03:00
José Valim
647eeb1881 Merge pull request #2262 from sferik/format_true 
Allow a route to have :format => true
 2011-07-25 15:51:43 -07:00
Santiago Pastorino
cb85d70d61 Remove unused use_sprockets config 2011-07-25 19:07:39 -03:00
Santiago Pastorino
ecd4f0b6ff Don't use Rack::Sendfile middleware if x_sendfile_header is not present 2011-07-25 18:55:13 -03:00
Xavier Noria
703d0e05c0 Merge branch 'master' of git://github.com/lifo/docrails 2011-07-25 14:20:01 -07:00
Erik Michaels-Ober
c17254319b Add documentation for :format => true 2011-07-25 14:13:26 -07:00
Xavier Noria
598eab90ff let TIP and friends handle a multiline paragraph 
Normally I would have done this in master, but there was already
a guide with wrapped content, so worked here. I am going to
cross-merge now.
 2011-07-25 14:12:12 -07:00
Erik Michaels-Ober
b9c9142603 Allow a route to have :format => true 
When format is true, it is mandatory (as opposed to :format => false).
This is currently not possible with resource routes, which automatically
make format optional by default.
 2011-07-25 11:37:25 -07:00
Vijay Dev
50ca6f06c7 Revert "aligment issues fixed" 
This reverts commit 6f29b356c1.

Reason: Changelogs are not meant to be changed in docrails.
 2011-07-25 23:41:28 +05:30
JudeArasu
6f29b356c1 aligment issues fixed 2011-07-25 23:26:36 +05:30
Santiago Pastorino
8e0061128e Merge pull request #2245 from davidtrogers/constraints_block_passed_to_following_routes_in_same_scope 
Memoizing @blocks & disposing of constraints options properly
 2011-07-25 10:32:31 -07:00
Dave Rogers
4dc42f5353 Ensure the constraints block is only applied to the correct route 
addresses issue #1907 - any routes that follow a route with a constraints
  block are inheriting the previous route's constraints.
 2011-07-25 09:59:53 -07:00
Glenn Gillen
4605b5639d Simplify the way default DATABASE_URL works. 2011-07-25 09:08:08 -07:00
Aaron Patterson
36fd3fdf46 no need for an anonymous class on every setup call 2011-07-25 09:07:46 -07:00
José Valim
b033a24814 Merge pull request #2258 from thedarkone/no-file-stat 
Use shorter class-level File methods instead of going through File.stat
 2011-07-25 08:13:21 -07:00
thedarkone
624b118616 Use shorter class-level File methods instead of going through File.stat. 2011-07-25 17:02:28 +02:00
Santiago Pastorino
64affc9384 Merge pull request #2236 from cldwalker/after_initialize 
Fix after_initialize and Base.create edge case
 2011-07-25 07:20:38 -07:00
José Valim
14c0f0ee12 Merge pull request #2254 from dmathieu/test_name 
provide more explicit test names
 2011-07-25 06:52:40 -07:00
Damien Mathieu
3348ea6254 provide more explicit test names 2011-07-25 15:25:22 +02:00
José Valim
451f63b42e Merge pull request #2247 from dmathieu/test_precompile_caching 
Add test checking that precompiling assets performs caching
 2011-07-25 05:36:00 -07:00
Vijay Dev
203a85f191 Revert "Add in a tip about opening two command prompt windows" 
This reverts commit 1e5fa59d13.

Reason: It's somewhat a grey area. We don't really want to tell the
users how they want to use the terminal.
 2011-07-25 17:39:17 +05:30
Vijay Dev
60c505dc79 Revert "Update the TIP formatter to handle multiline tips" 
This reverts commit e3dbe66e19.

Reason: Code changes are not allowed in docrails.
 2011-07-25 17:37:01 +05:30
José Valim
a850cf7058 Merge pull request #2251 from thedarkone/update-all-order 
Bring back the ability to provide :order for update_all
 2011-07-25 05:03:28 -07:00
José Valim
dffd920432 Merge pull request #2252 from thedarkone/polymorphic-url-helpers 
Make polymorphic_url calls go through application helpers again.
 2011-07-25 05:02:00 -07:00
thedarkone
036f77574d Make polymorphic_url calls go through application helpers again. 
This brings back the ability to overwrite/extend url generating methods in application heleprs.
 2011-07-25 13:43:02 +02:00
thedarkone
10863580aa Bring back the ability to provide :order for update_all. 2011-07-25 13:33:44 +02:00
Damien Mathieu
07c9ff0b4a add test checking that precompiling assets performs caching 2011-07-25 10:32:03 +02:00
Elliot Winkler
f330e6af34 Improve ch. 1 of the Form Helpers guide 2011-07-24 17:09:47 -06:00