Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8527

Show
Ignore:
Timestamp:
01/02/08 19:24:44 (6 months ago)
Author:
rick
Message:

Correct indentation in a couple spots. Closes #10671 [l.guidi, rick]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r8506 r8527  
    11*SVN* 
     2 
     3* Correct indentation in tests.  Closes #10671 [l.guidi] 
    24 
    35* Fix that auto_link looks for ='s in url paths (Amazon urls have them).  Closes #10640 [bgreenlee] 

  • trunk/actionpack/test/controller/html-scanner/sanitizer_test.rb

    r8485 r8527  
    205205 
    206206  def test_should_sanitize_with_trailing_space 
    207        raw = "display:block; " 
    208        expected = "display: block;" 
    209        assert_equal expected, sanitize_css(raw) 
     207    raw = "display:block; " 
     208    expected = "display: block;" 
     209    assert_equal expected, sanitize_css(raw) 
    210210  end 
    211211 

  • trunk/railties/lib/rails_generator/commands.rb

    r8365 r8527  
    311311          else 
    312312            logger.create relative_path 
    313             unless options[:pretend] 
    314               FileUtils.mkdir_p(path) 
     313                  unless options[:pretend] 
     314                    FileUtils.mkdir_p(path) 
    315315               
    316               # Subversion doesn't do path adds, so we need to add 
    317               # each directory individually. 
    318               # So stack up the directory tree and add the paths to 
    319               # subversion in order without recursion. 
    320               if options[:svn] 
    321                 stack=[relative_path] 
    322                 until File.dirname(stack.last) == stack.last # dirname('.') == '.' 
    323                   stack.push File.dirname(stack.last) 
    324                 end 
    325                 stack.reverse_each do |rel_path| 
    326                   svn_path = destination_path(rel_path) 
    327                   system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn')) 
    328                 end 
    329               end 
    330            end 
    331          end 
    332        end 
     316                    # Subversion doesn't do path adds, so we need to add 
     317                    # each directory individually. 
     318                    # So stack up the directory tree and add the paths to 
     319                    # subversion in order without recursion. 
     320                    if options[:svn] 
     321                            stack=[relative_path] 
     322                            until File.dirname(stack.last) == stack.last # dirname('.') == '.' 
     323                              stack.push File.dirname(stack.last) 
     324                            end 
     325                            stack.reverse_each do |rel_path| 
     326                              svn_path = destination_path(rel_path) 
     327                              system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn')) 
     328                            end 
     329                    end 
     330            end 
     331          end 
     332        end 
    333333 
    334334        # Display a README.