rake 0.9.x won't be compatible with Cucumber::Rake::Task::ForkedCucumberRunner which uses the RUBY constant, resulting in 'uninitialized constant Cucumber::Rake::Task::ForkedCucumberRunner::RUBY'
* master:
sprite test_unit
more sprite tests to test_unit
sprite base test
sprite tests moved over
fixed merge in gemfile
diff helper
refactored tests
updated the sencha site graphic
updated gemfile
updated gemfile
updated gemfile
fixed merge
added application integration to turtorials
merge
added redirect for reference and updated general layouts redirect
Conflicts:
Gemfile
Gemfile.lock
* stable: (36 commits)
Tweak the changelog.
[CSS3] The box-shadow $spread value now defaults to using the browser default instead of 0.
update the lockfile
some todos
Move the contributing guide to the tutorials section.
add on-page anchors to the command line reference page.
Better docs on the grid image command.
Move the tutorials to the main nav... I don't think most people see it.
Don't set the display in the box-flex mixin. This makes nested flex boxes annoying. Closes GH-207
Add a note about the colorization change.
Add a note about the compass validator
Only colorize the action when logging results.
Update to use the new compass validator during development.
Fix broken test cases.
Support true in addition to the inset keyword for the box-shadow mixin. Closes GH-206
IE8 compat for :last-child selector
Make the compass configuration file more self documenting by adding comments for preferred_syntax, output_style, and line_comments.
Pass --no-line-comments to disable line comments.
A little less noise during installation.
Change the default Sass directory in standalone projects from src to sass. Closes GH-203
...
Conflicts:
TODO.md
VERSION.yml
doc-src/content/CHANGELOG.markdown
features/command_line.feature
features/step_definitions/command_line_steps.rb
lib/compass/commands/write_configuration.rb
* stable:
Fix broken test.
tests for padding free horizontal list.
Update tests for charset changes.
Fix test failure in ruby 1.9.2
fix some gem issues
Option for horizontal-list to skip padding.
rake examples was getting a non-existent branch. Default to master.
update changelog
Make it easier to disable the asset cache buster.
Turns out that IE6 & 7 don't support this.
Fixed typo.
HTML5 reset includes box-model reset for newer browsers.
Added @charset declaration to force UTF-8 encoding on systems with different default encodings
Some doc modifications.
Conflicts:
Gemfile
doc-src/content/CHANGELOG.markdown
lib/compass/app_integration/rails/installer.rb
