Skip to content

Commit

Permalink
Whitespace harmony
Browse files Browse the repository at this point in the history
  • Loading branch information
sunny committed Apr 12, 2013
1 parent 6a7a538 commit 48f46b7
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.txt text
*.md text
Expand Down
4 changes: 2 additions & 2 deletions Home.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vulputate tincidunt sollicitudin. Quisque sit amet leo sed nunc eleifend rhoncus in consectetur leo. Vivamus posuere semper convallis. Duis malesuada lacus sed erat lobortis tincidunt mattis ligula consectetur. Sed aliquam vulputate eros at euismod. Aenean egestas lorem ligula, quis faucibus turpis. Curabitur a eros in ipsum gravida ornare. Sed elementum enim vel mi scelerisque dapibus. Nulla id libero ligula, quis tempus sem. Morbi nec felis tortor, ac cursus risus. Mauris elementum tortor id lacus eleifend non lobortis tellus pharetra. Etiam posuere cursus vestibulum. $x \lt y$
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vulputate tincidunt sollicitudin. Quisque sit amet leo sed nunc eleifend rhoncus in consectetur leo. Vivamus posuere semper convallis. Duis malesuada lacus sed erat lobortis tincidunt mattis ligula consectetur. Sed aliquam vulputate eros at euismod. Aenean egestas lorem ligula, quis faucibus turpis. Curabitur a eros in ipsum gravida ornare. Sed elementum enim vel mi scelerisque dapibus. Nulla id libero ligula, quis tempus sem. Morbi nec felis tortor, ac cursus risus. Mauris elementum tortor id lacus eleifend non lobortis tellus pharetra. Etiam posuere cursus vestibulum. $x \lt y$

Morbi tincidunt dolor vel massa dictum volutpat. Vestibulum quis nibh metus, id tincidunt nisl. Vivamus eget sem ac risus eleifend rhoncus at eu nisl. Nunc elit massa, vulputate ac gravida eget, condimentum quis justo. Integer scelerisque, libero vel consequat ultricies, eros libero sagittis libero, pellentesque bibendum quam massa ut orci. Maecenas sit amet urna eget quam aliquam posuere. Nulla facilisi. Duis imperdiet augue sit amet metus ornare et hendrerit dui feugiat. Aenean a lacus neque. Sed eu enim tincidunt dolor pharetra porttitor. Vestibulum ut felis dui, rutrum iaculis orci. Duis eu bibendum tortor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse mollis sagittis purus sit amet sollicitudin. Phasellus vel interdum erat.
Morbi tincidunt dolor vel massa dictum volutpat. Vestibulum quis nibh metus, id tincidunt nisl. Vivamus eget sem ac risus eleifend rhoncus at eu nisl. Nunc elit massa, vulputate ac gravida eget, condimentum quis justo. Integer scelerisque, libero vel consequat ultricies, eros libero sagittis libero, pellentesque bibendum quam massa ut orci. Maecenas sit amet urna eget quam aliquam posuere. Nulla facilisi. Duis imperdiet augue sit amet metus ornare et hendrerit dui feugiat. Aenean a lacus neque. Sed eu enim tincidunt dolor pharetra porttitor. Vestibulum ut felis dui, rutrum iaculis orci. Duis eu bibendum tortor. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse mollis sagittis purus sit amet sollicitudin. Phasellus vel interdum erat.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
2 changes: 1 addition & 1 deletion lib/gollum-lib/committer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def add_to_index(dir, name, format, data, allow_same_ext = false)

tree.blobs.each do |blob|
next if page_path_scheduled_for_deletion?(index.tree, fullpath)

existing_file = blob.name.downcase.sub(/\.\w+$/, '')
existing_file_ext = ::File.extname(blob.name).sub(/^\./, '')

Expand Down
2 changes: 1 addition & 1 deletion lib/gollum-lib/file_view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def render_files
end

# http://stackoverflow.com/questions/3482814/sorting-list-of-string-paths-in-vb-net
sorted_folders.sort! do |first,second|
sorted_folders.sort! do |first,second|
a = first[0]
b = second[0]

Expand Down
6 changes: 3 additions & 3 deletions lib/gollum-lib/wiki.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ def history_sanitization
# Sets page title to value of first h1
# Defaults to false
attr_reader :h1_title

# Gets the custom index page for / and subdirs (e.g. foo/)
attr_reader :index_page

# Gets side on which the sidebar should be shown
attr_reader :bar_side

Expand Down Expand Up @@ -177,7 +177,7 @@ def history_sanitization
# :css - Include the custom.css file from the repo.
# :h1_title - Concatenate all h1's on a page to form the
# page title.
# :index_page - The default page to retrieve or create if the
# :index_page - The default page to retrieve or create if the
# a directory is accessed.
# :bar_side - Where the sidebar should be displayed, may be:
# - :left
Expand Down
6 changes: 3 additions & 3 deletions test/test_file_view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

class FakePage
def initialize filepath
@filepath = filepath
@filepath = filepath
end

# From page.rb
def filename_stripped
::File.basename(@filepath, ::File.extname(@filepath))
Expand Down Expand Up @@ -44,7 +44,7 @@ def initialize filepath_array
def size
@array.size
end

def [] index
@array[ index ]
end
Expand Down
4 changes: 2 additions & 2 deletions test/test_git_access.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
test "cannot access tree from invalid ref" do
assert_equal [], @access.tree('foo')
end

test "sets #mode for blob entries" do
@access.tree '60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'
file = @access.tree_map['60f12f4254f58801b9ee7db7bca5fa8aeefaa56b'][0]
assert_equal 0100644, file.mode

@access.tree '874f597a5659b4c3b153674ea04e406ff393975e'
symlink = @access.tree_map['874f597a5659b4c3b153674ea04e406ff393975e'].find { |entry| entry.name == 'Data-Two.csv' }
assert_not_nil symlink
Expand Down
6 changes: 3 additions & 3 deletions test/test_markup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
content = <<-END
shoop da woop
``` python
``` python
np.array([[2,2],[1,3]],np.float)
```
END
Expand Down Expand Up @@ -747,8 +747,8 @@ def assert_markup_highlights_code(markup_class, rendered)

test "id with prefix ok" do
content = "h2(example#wiki-foo). xxxx"
output = %(<h2 class="example" id="wiki-foo">xxxx<a class=\"anchor\" id=\"xxxx\" href=\"#xxxx\"></a></h2>)
compare(content, output, :textile)
output = %(<h2 class="example" id="wiki-foo">xxxx<a class=\"anchor\" id=\"xxxx\" href=\"#xxxx\"></a></h2>)
compare(content, output, :textile)
end

test "id prefix added" do
Expand Down
2 changes: 1 addition & 1 deletion test/test_page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -270,4 +270,4 @@
assert page.raw_data.include? 'Time'
assert page.raw_data =~ /^[\s\-]*$/
end
end
end
4 changes: 2 additions & 2 deletions test/test_page_revert.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
end
sha = @wiki.revert_page(page1, '7c45b5f16ff3bae2a0063191ef832701214d4df5')
page2 = nil
while (page2 == nil)
page2 = @wiki.page('B')
end
assert_equal sha, page2.version.sha
assert_equal "INITIAL", body=page2.raw_data.strip
assert_equal body, File.read(File.join(@path, "B.md")).strip
Expand Down

0 comments on commit 48f46b7

Please sign in to comment.