deac
/
middleman
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update haml and sass deps 

Conflicts:
	Gemfile
	middleman/middleman.gemspec
i18n_v4
Thomas Reynolds 2014-04-03 09:53:33 -07:00
parent 6d2f8cd50c
commit fac4928d50
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -19,4 +19,5 @@ Makefile
.mm-pid-*
.idea
*.sublime-workspace
/bin
/bin
middleman-core/fixtures/compass-sprites-app/source/images/icon-s0de2218f58.png

2
middleman-core/features/compass-sprites.feature
View File

@ -3,4 +3,4 @@ Feature: Compass sprites should be generated on build and copied
Given a successfully built app at "compass-sprites-app"
When I cd to "build"
Then the following files should exist:
| images/icon-s1a8aa64128.png |
| images/icon-s0de2218f58.png |

2
middleman-core/middleman-core.gemspec
View File

@ -29,7 +29,7 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', ['~> 4.0.1'])
# Watcher
s.add_dependency('listen', ['~> 1.3'])
s.add_dependency('listen', ['~> 1.1'])
# i18n
s.add_dependency('i18n', ['~> 0.6.9'])

6
middleman/middleman.gemspec
View File

@ -22,9 +22,9 @@ Gem::Specification.new do |s|
s.add_dependency('middleman-cli', Middleman::VERSION)
s.add_dependency('middleman-templates', Middleman::VERSION)
s.add_dependency('middleman-sprockets', '>= 3.1.2')
s.add_dependency('haml', ['>= 3.1.6'])
s.add_dependency('sass', ['>= 3.1.20'])
s.add_dependency('compass', ['>= 0.12.2'])
s.add_dependency("haml", [">= 4.0.5"])
s.add_dependency("sass", [">= 3.3.4"])
s.add_dependency("compass", [">= 1.0.0.alpha.19"])
s.add_dependency('uglifier', ['~> 2.4.0'])
s.add_dependency('coffee-script', ['~> 2.2.0'])
s.add_dependency('execjs', ['~> 2.0.2'])