Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bloy/mike.bloy.org
base: 4250f69915
...
head fork: bloy/mike.bloy.org
compare: e412b6e652
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
3  Gemfile
@@ -1,8 +1,9 @@
# A sample Gemfile
source :gemcutter
-gem 'capistrano'
gem 'bcdatabase'
+gem 'capistrano'
gem 'compass'
gem 'middleman'
+gem 'rb-inotify', '~> 0.8.8'
gem 'therubyracer'
View
35 Gemfile.lock
@@ -10,7 +10,7 @@ GEM
highline (~> 1.5)
i18n
thor (~> 0.14.6)
- capistrano (2.12.0)
+ capistrano (2.13.4)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -29,7 +29,7 @@ GEM
em-websocket (0.3.8)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
- eventmachine (0.12.10)
+ eventmachine (1.0.0)
execjs (1.2.13)
multi_json (~> 1.0)
ffi (1.1.5)
@@ -37,23 +37,21 @@ GEM
guard (1.1.1)
listen (>= 0.4.2)
thor (>= 0.14.6)
- guard-livereload (1.0.0)
+ guard-livereload (1.0.1)
em-websocket (>= 0.2.0)
guard (>= 1.1.0)
multi_json (~> 1.0)
haml (3.1.7)
- highline (1.6.13)
+ highline (1.6.15)
hike (1.2.1)
http_router (0.10.2)
rack (>= 1.0.0)
url_mount (~> 0.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
+ jruby-pageant (1.1.1)
libv8 (3.3.10.4)
- listen (0.4.7)
- rb-fchange (~> 0.0.5)
- rb-fsevent (~> 0.9.1)
- rb-inotify (~> 0.8.8)
- maruku (0.6.0)
+ listen (0.5.3)
+ maruku (0.6.1)
syntax (>= 1.0.0)
middleman (2.0.16.1)
coffee-script (~> 2.2.0)
@@ -82,7 +80,8 @@ GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.5.2)
+ net-ssh (2.6.0)
+ jruby-pageant (>= 1.1.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
padrino-core (0.10.6)
@@ -97,15 +96,12 @@ GEM
rack (1.3.6)
rack-protection (1.2.0)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rb-fchange (0.0.5)
- ffi
- rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
- sass (3.2.0)
- sinatra (1.3.2)
+ sass (3.2.1)
+ sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
@@ -126,9 +122,9 @@ GEM
rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
- uglifier (1.2.7)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
+ multi_json (~> 1.0, >= 1.0.2)
url_mount (0.2.1)
rack
@@ -140,4 +136,5 @@ DEPENDENCIES
capistrano
compass
middleman
+ rb-inotify (~> 0.8.8)
therubyracer
View
BIN  source/images/icon/coderwall.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  source/layout.erb
@@ -40,6 +40,8 @@
title="mike@meat-in-a-tin.bloy.org">Email</a></li>
<li id="github"><a href="http://github.com/bloy"
title="github">github</a></li>
+ <li id="coderwall"><a href="http://coderwall.com/bloy"
+ title="coderwall">coderwall</a></li>
<li id="linkedin"><a href="http://www.linkedin.com/in/mikebloy"
title="LinkedIn">LinkedIn</a></li>
<li id="stackexchange"><a
View
1  source/stylesheets/site.css.scss
@@ -109,6 +109,7 @@ nav#links ul {
}
}
li#email:before { @include icon-sprite(email); }
+li#coderwall:before { @include icon-sprite(coderwall); }
li#github:before { @include icon-sprite(github); }
li#gplus:before { @include icon-sprite(gplus); }
li#facebook:before { @include icon-sprite(facebook); }

No commit comments for this range

Something went wrong with that request. Please try again.