update middleman
This commit is contained in:
parent
a3925c40c7
commit
f24ff9bc7c
93
Gemfile.lock
93
Gemfile.lock
@ -1,14 +1,14 @@
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
activesupport (3.2.13)
|
||||
i18n (= 0.6.1)
|
||||
activesupport (3.2.12)
|
||||
i18n (~> 0.6)
|
||||
multi_json (~> 1.0)
|
||||
chunky_png (1.2.8)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.3.3)
|
||||
coffee-script-source (1.6.2)
|
||||
compass (0.12.2)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
@ -21,83 +21,65 @@ GEM
|
||||
eventmachine (1.0.3)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
ffi (1.8.1)
|
||||
ffi (1.9.0)
|
||||
fssm (0.2.10)
|
||||
haml (4.0.3)
|
||||
tilt
|
||||
hike (1.2.3)
|
||||
http_parser.rb (0.5.3)
|
||||
http_router (0.10.2)
|
||||
rack (>= 1.0.0)
|
||||
url_mount (~> 0.2.1)
|
||||
i18n (0.6.1)
|
||||
listen (0.7.3)
|
||||
maruku (0.6.1)
|
||||
syntax (>= 1.0.0)
|
||||
middleman (3.0.14)
|
||||
middleman-core (= 3.0.14)
|
||||
middleman-more (= 3.0.14)
|
||||
middleman-sprockets (~> 3.1.0)
|
||||
middleman-core (3.0.14)
|
||||
i18n (0.6.4)
|
||||
kramdown (1.0.2)
|
||||
listen (1.1.6)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
rb-kqueue (>= 0.2)
|
||||
middleman (3.1.0)
|
||||
coffee-script (~> 2.2.0)
|
||||
compass (>= 0.12.2)
|
||||
execjs (~> 1.4.0)
|
||||
haml (>= 3.1.6)
|
||||
kramdown (~> 1.0.0)
|
||||
middleman-core (= 3.1.0)
|
||||
middleman-more (= 3.1.0)
|
||||
middleman-sprockets (>= 3.1.2)
|
||||
sass (>= 3.1.20)
|
||||
uglifier (~> 2.1.0)
|
||||
middleman-core (3.1.0)
|
||||
activesupport (~> 3.2.6)
|
||||
bundler (~> 1.1)
|
||||
listen (~> 0.7.3)
|
||||
rack (~> 1.4.1)
|
||||
i18n (~> 0.6.1)
|
||||
listen (~> 1.1.6)
|
||||
rack (>= 1.4.5)
|
||||
rack-test (~> 0.6.1)
|
||||
rb-fsevent (~> 0.9.3)
|
||||
thor (~> 0.15.4)
|
||||
thor (>= 0.15.2, < 2.0)
|
||||
tilt (~> 1.3.6)
|
||||
middleman-livereload (3.1.0)
|
||||
em-websocket (>= 0.2.0)
|
||||
middleman-core (>= 3.0.2)
|
||||
multi_json (~> 1.0)
|
||||
rack-livereload
|
||||
middleman-more (3.0.14)
|
||||
coffee-script (~> 2.2.0)
|
||||
coffee-script-source (~> 1.3.3)
|
||||
compass (>= 0.12.2)
|
||||
execjs (~> 1.4.0)
|
||||
haml (>= 3.1.6)
|
||||
i18n (~> 0.6.0, < 0.6.2)
|
||||
maruku (~> 0.6.0)
|
||||
middleman-core (= 3.0.14)
|
||||
padrino-helpers (= 0.10.7)
|
||||
sass (>= 3.1.20)
|
||||
uglifier (~> 1.2.6)
|
||||
middleman-sprockets (3.1.1)
|
||||
middleman-more (3.1.0)
|
||||
middleman-sprockets (3.1.2)
|
||||
middleman-core (>= 3.0.14)
|
||||
padrino-helpers (= 0.10.7)
|
||||
middleman-more (>= 3.0.14)
|
||||
sprockets (~> 2.1)
|
||||
sprockets-helpers (~> 1.0.0)
|
||||
sprockets-sass (~> 1.0.0)
|
||||
multi_json (1.7.6)
|
||||
multi_json (1.7.7)
|
||||
oily_png (1.1.0)
|
||||
chunky_png (~> 1.2.7)
|
||||
padrino-core (0.10.7)
|
||||
activesupport (~> 3.2.0)
|
||||
http_router (~> 0.10.2)
|
||||
sinatra (~> 1.3.1)
|
||||
thor (~> 0.15.2)
|
||||
tilt (~> 1.3.0)
|
||||
padrino-helpers (0.10.7)
|
||||
i18n (~> 0.6)
|
||||
padrino-core (= 0.10.7)
|
||||
rack (1.4.5)
|
||||
rack (1.5.2)
|
||||
rack-livereload (0.3.15)
|
||||
rack
|
||||
rack-protection (1.5.0)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rake (10.0.4)
|
||||
rb-fsevent (0.9.3)
|
||||
rb-inotify (0.9.0)
|
||||
ffi (>= 0.5.0)
|
||||
rb-kqueue (0.2.0)
|
||||
ffi (>= 0.5.0)
|
||||
sass (3.2.9)
|
||||
sinatra (1.3.6)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.3)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
slim (1.3.9)
|
||||
temple (~> 0.6.3)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
@ -114,15 +96,12 @@ GEM
|
||||
susy (1.0.8)
|
||||
compass (>= 0.12.2)
|
||||
sass (>= 3.2.0)
|
||||
syntax (1.0.0)
|
||||
temple (0.6.5)
|
||||
thor (0.15.4)
|
||||
thor (0.18.1)
|
||||
tilt (1.3.7)
|
||||
uglifier (1.2.7)
|
||||
uglifier (2.1.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.3)
|
||||
url_mount (0.2.1)
|
||||
rack
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
@ -22,10 +22,11 @@ section
|
||||
i.icon-github-sign.icon-2x
|
||||
span
|
||||
a href="http://git.higgsboson.tk" title="Webinterface to our public git repos" Git Web
|
||||
li
|
||||
i.icon-inbox.icon-2x
|
||||
span
|
||||
== link_to "Inbox", "/inbox", title: "Send us your files"
|
||||
/ TODO: readd nginx upload module
|
||||
/li
|
||||
/ i.icon-inbox.icon-2x
|
||||
/ span
|
||||
/ == link_to "Inbox", "/inbox", title: "Send us your files"
|
||||
li
|
||||
i.icon-download-alt.icon-2x
|
||||
span
|
||||
|
Loading…
Reference in New Issue
Block a user