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
25,363 Commits 34 Branches 105 Tags
0defbc6bfeff053983ef65739b2dcc080b2ad227
Commit Graph

25363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Vakhov
0defbc6bfe normalize arg for ActionMailer::TestCase tests method 2011-10-03 14:27:41 +04:00
Sam Pohlenz
6f429f375e Ensure that enhancements to assets:precompile task are only run once 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 11:18:49 +02:00
Sam Pohlenz
0e1f7e0058 Replace calls to capture(:stdout) with quietly in assets tests 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 11:18:44 +02:00
José Valim
9c6d4801d1 Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize 
use safe_constantize instead constantize in AC::TestCase
 2011-10-03 02:10:40 -07:00
José Valim
daca35c394 Merge pull request #3194 from avakhov/patch-ac-test-case-tests 
normalize arg for AC::TestCase tests class method
 2011-10-03 02:10:29 -07:00
Alexey Vakhov
8e946daf69 normalize arg for AC::TestCase tests class method 2011-10-03 12:12:07 +04:00
Alexey Vakhov
0eb80fabdd use safe_constantize instead constantize in AC::TestCase 2011-10-03 10:04:14 +04:00
José Valim
d68884f4fd :group => :assets should only run in the assets environment. 2011-10-02 22:08:33 +02:00
Xavier Noria
ac1fc5c594 rewords the docs of config.assets.initialize_on_precompile in the asset pipeline guide 2011-10-02 12:33:14 -07:00
Xavier Noria
6e00c05607 documents config.assets.initialize_on_precompile in the asset pipeline guide 2011-10-02 11:35:58 -07:00
Santiago Pastorino
c1547fcf6d Precompile properly refers files referenced with asset_path test 2011-10-02 13:57:29 -02:00
Santiago Pastorino
9b34e31155 capture was commented out 2011-10-02 13:52:29 -02:00
José Valim
753424079e Provide initialize_on_precompile which, when set to false, does not initialize the app for precompilation. Defaults to true. 2011-10-02 12:15:21 +02:00
José Valim
1efe41dc36 Merge pull request #3174 from phuibonhoa/master 
Fixed file store to handle delete_matched being called before cache dir is created.
 2011-10-02 02:30:44 -07:00
José Valim
6e8fe1bf02 TestCase should respect the view_assigns API instead of pulling variables on its own. 2011-10-02 11:29:13 +02:00
José Valim
63f6da050a Update CHANGELOG. 2011-10-02 11:17:06 +02:00
José Valim
5af5e77895 Merge pull request #2583 from guilleiguaran/railsrc 
Read extra args for 'rails new' from ~/.railsrc
 2011-10-02 02:13:30 -07:00
Philippe Huibonhoa
119a484e80 Improved testing so that it tests the real functionality and not the private method. 2011-10-02 01:39:52 -07:00
Guillermo Iguaran
101fb42106 Print information about .railsrc to users 2011-10-02 01:06:39 -05:00
Guillermo Iguaran
7039def6e1 Read extra args for 'rails new' from ~/.railsrc 2011-10-02 00:12:40 -05:00
José Valim
ec53b802da Merge pull request #3185 from arunagw/void_context_warnings_removed 
Use of :: in void context Warning removed
 2011-10-01 04:59:23 -07:00
Arun Agrawal
b30ffbbfd6 Use of :: in void context Warning removed 2011-10-01 14:27:12 +05:30
José Valim
926e97ca66 Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixtures 
Modified how to handle if ActiveRecord is defined.
 2011-09-30 09:44:26 -07:00
Yasuo Honda
44791a2bc6 Modified how to handle if ActiveRecord is defined. 2011-09-30 12:05:53 -04:00
José Valim
d4457dc32b Provide read_attribute_for_serialization as the API to serialize attributes. 2011-09-30 14:20:41 +02:00
José Valim
37b9594a8e Set the default options value for as_json in the encoder object. 2011-09-30 12:45:36 +02:00
José Valim
afeb8976a3 Merge pull request #3175 from nhocki/as-json-patch 
Allow default options for `as_json` method on models
 2011-09-30 03:42:53 -07:00
José Valim
fe157a7475 Merge pull request #3177 from arunagw/void_warnings_removed 
possibly useless use of :: in void context Warning removed
 2011-09-30 03:35:16 -07:00
José Valim
47a14a045e Merge pull request #3178 from arunagw/argument_warning_removed 
warning removed : '&' interpreted as argument prefix
 2011-09-30 03:34:38 -07:00
Arun Agrawal
b0b436ebce warning removed : '&' interpreted as argument prefix 2011-09-30 15:56:38 +05:30
Arun Agrawal
e81c427fe8 possibly useless use of :: in void context Warning removed 2011-09-30 14:13:58 +05:30
Nicolás Hock Isaza
da914fa35c Fixing as_json method for ActiveRecord models. 
When you've got an AR Model and you override the `as_json` method,
you should be able to add default options to the renderer, like this:

    class User < ActiveRecord::Base
      def as_json(options = {})
        super(options.merge(:except => [:password_digest]))
      end
    end

This was not possible before this commit. See the added test case.
 2011-09-29 21:44:23 -05:00
Philippe Huibonhoa
0baa8f8604 Added fix so that file store does not raise an exception when cache dir does not exist yet. This can happen if a delete_matched is called before anything is saved in the cache. 2011-09-29 18:59:40 -07:00
Santiago Pastorino
d2888de598 Add CHANGELOG entries 2011-09-29 16:49:31 -03:00
Jon Leighton
adb8ac153f Don't call self.class unless necessary. Closes #3171. 2011-09-29 18:00:30 +01:00
José Valim
4284e137ab Merge pull request #3167 from dmitriy-kiriyenko/honour_rails_env_environment_variable_when_running_rake 
RAILS_ENV environment variable is ignored when running rake from thor script using Rails::Generators::Actions
 2011-09-29 06:19:26 -07:00
Dmitriy Kiriyenko
148e4a5413 Honour RAILS_ENV environment variable when running rake. 2011-09-29 15:35:25 +03:00
Santiago Pastorino
64b0c8888b javascript_path and stylesheet_path should honor the asset pipelining 2011-09-28 20:13:24 -03:00
José Valim
ad304e9f7e Merge pull request #3159 from elliterate/digest_auth_with_query_string 
Fixed digest authentication for requests with a query string [#3158]
 2011-09-28 15:49:35 -07:00
Santiago Pastorino
a5e731856b Merge pull request #3156 from ihower/enhance_button_to_helper_v2 
Make button_to helper support "form" option
 2011-09-28 15:39:05 -07:00
Colin Shield & Ian Lesperance
41365a8275 Fixed digest authentication for requests with a query string [#3158] 2011-09-28 15:23:47 -07:00
Xavier Noria
cba3c00831 partial pass over the assets guide 2011-09-28 13:48:48 -07:00
Wen-Tien Chang
3058d13a06 Make button_to helper support "form" option which is the form attributes. 2011-09-29 01:40:15 +08:00
Vijay Dev
f3b8cd9d36 fixing typo in assets guide 2011-09-28 13:35:46 +05:30
Jon Leighton
ddfa00c266 Merge pull request #3152 from rocky-jaiswal/fix-failed-ar-test 
Fixed failed test under 1.8.7 as map.keys order in indeterminable
 2011-09-28 00:57:21 -07:00
Rocky Jaiswal
aefc40324d Fixed failed test under 1.8.7 as map.keys order in indeterminable 2011-09-28 11:57:34 +05:30
Santiago Pastorino
771b76a3dc Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require 
add missing require to html sanitizer
 2011-09-27 19:31:24 -07:00
Xavier Noria
41c8277a9b the infamous detail only spotted in GitHub diffs no matter how careful you were before pushing 2011-09-27 13:55:41 -07:00
Xavier Noria
c612183ad1 partial pass over the asset pipeline 2011-09-27 13:51:06 -07:00
Alexey Vakhov
1bd88fdafd add missing require to html sanitizer 2011-09-27 23:39:52 +04:00