Ben Hollis
|
9e9bed0043
|
pry-debugger is not available on Ruby 2.1
|
2014-03-03 23:07:32 -08:00 |
|
|
Ben Hollis
|
7b46fd6524
|
Merge remote-tracking branch 'origin/v3-stable'
Conflicts:
CHANGELOG.md
middleman-core/lib/middleman-core/core_extensions/rendering.rb
middleman-core/lib/middleman-core/extensions.rb
middleman-core/lib/middleman-core/version.rb
middleman-core/lib/middleman-more/core_extensions/compass.rb
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
middleman-core/middleman-core.gemspec
|
2014-02-22 18:11:37 -08:00 |
|
Thomas Reynolds
|
3995ad850c
|
update padrino.
|
2014-02-18 18:30:29 -08:00 |
|
|
Thomas Reynolds
|
bea2515a41
|
Move CLI into middleman-cli
|
2014-01-02 16:39:06 -08:00 |
|
|
Thomas Reynolds
|
a610608785
|
remove old style extension support
|
2014-01-01 15:10:49 -08:00 |
|
Karl Freeman
|
dcf527008e
|
StringLiterals 'cop' fix [ci skip]
|
2013-12-29 23:04:30 +00:00 |
|
|
Karl Freeman
|
f6f235c1fe
|
exclude development gems
|
2013-12-29 22:53:18 +00:00 |
|
|
Karl Freeman
|
03d6e6c990
|
Implemented Rubocop
- just took a stab at running the StringLiterals cop to get a taste.
|
2013-12-28 00:47:39 +00:00 |
|
|
Thomas Reynolds
|
22c977d426
|
Merge branch 'master' of github.com:middleman/middleman
|
2013-10-29 09:44:22 -07:00 |
|
|
Thomas Reynolds
|
ca4935361b
|
drop Ruby 1.8, add some extra tests
|
2013-10-29 09:43:56 -07:00 |
|
|
Thomas Reynolds
|
19c155349d
|
Merge pull request #1044 from mojavelinux/asciidoc-renderer
resolves #1043 added a renderer for AsciiDoc files
|
2013-10-29 09:37:36 -07:00 |
|
|
Ben Hollis
|
7143f53efa
|
Remove middleman-more files
|
2013-10-19 15:59:12 -07:00 |
|
Dan Allen
|
5439139b76
|
added cucumber tests for #1043, AsciiDoc support
|
2013-10-19 14:41:52 -06:00 |
|
|
Thomas Reynolds
|
cd9964edbe
|
prep
|
2013-09-07 13:12:31 -07:00 |
|
|
Thomas Reynolds
|
ba3b8c4db3
|
old redcarpet for ruby 1.8
|
2013-07-16 15:07:59 -07:00 |
|
|
Thomas Reynolds
|
7e405fc414
|
And by 1.8, I mean MRI 1.8
|
2013-06-12 17:58:59 -07:00 |
|
|
Thomas Reynolds
|
e03362e6f6
|
Apparently Ruby 1.8 doesn't have Proc.source_location
|
2013-06-12 17:40:17 -07:00 |
|
|
Thomas Reynolds
|
9d5a878713
|
prybegone
|
2013-06-09 17:15:15 -07:00 |
|
|
Thomas Reynolds
|
d71af3f5a1
|
Force padrino to skip safebuffer on erb
|
2013-06-08 15:36:14 -07:00 |
|
|
Thomas Reynolds
|
403d6abd05
|
fix up simplecov, add coveralls
|
2013-05-30 13:38:52 -04:00 |
|
|
Ben Hollis
|
994bd651f8
|
Add Simplecov
|
2013-05-28 22:29:58 -07:00 |
|
|
Thomas Reynolds
|
5b8c7a2494
|
move vendored gems into shared root
|
2013-05-23 16:06:20 -07:00 |
|
|
Thomas Reynolds
|
7a227b8bac
|
stub out blank middleman-more gem for backwards compat with extensions
|
2013-05-23 15:26:33 -07:00 |
|
|
Thomas Reynolds
|
9ebddeed1d
|
merge more into core, use gem availability to autoload
|
2013-05-09 14:41:26 -07:00 |
|
|
Thomas Reynolds
|
399af44c71
|
update uglifier dep
|
2013-04-22 22:22:36 -07:00 |
|
|
Thomas Reynolds
|
4b5e6aeb54
|
loosen fivemat dep
|
2013-04-14 09:24:35 -07:00 |
|
|
Ben Hollis
|
b4c2bf3098
|
Requiring sinatra messes stuff up
|
2013-04-12 23:32:17 -07:00 |
|
|
Thomas Reynolds
|
3f94df1eef
|
prep 3.1 beta
|
2013-04-12 16:19:47 -07:00 |
|
|
Thomas Reynolds
|
0574cc3d28
|
Support sideloading from .frontmatter files. Closes #855
|
2013-04-12 16:14:16 -07:00 |
|
|
Ben Hollis
|
b159946a6e
|
Upgrade fivemat
|
2013-04-06 23:53:51 -07:00 |
|
|
Ben Hollis
|
c602df30dd
|
Fix some 1.8.7 issues
|
2013-04-06 22:55:49 -07:00 |
|
|
Thomas Reynolds
|
16d6ac156c
|
looser test deps
|
2013-03-18 14:21:06 -07:00 |
|
|
Thomas Reynolds
|
f2f3ad21b6
|
bump tilt requirement, unregister plaintext template. fixes #824
|
2013-03-18 14:12:49 -07:00 |
|
|
Thomas Reynolds
|
0525902e43
|
what about no https travis?
|
2013-02-24 16:13:31 -08:00 |
|
|
Thomas Reynolds
|
18849c2eea
|
loosen testing deps
|
2013-02-24 13:55:59 -08:00 |
|
|
Karl Freeman
|
6f5804d6b2
|
Bundler advises not to use a source symbol anymore
- d30026e9c8
|
2013-02-24 13:35:43 -08:00 |
|
|
Thomas Reynolds
|
aa2102cbb7
|
update listen dep
|
2013-02-19 17:14:10 -08:00 |
|
|
Ben Hollis
|
9057b7a85e
|
Support Haml 4. Tests only run with Haml 4 now. Fixes #783
|
2013-02-17 19:40:17 -08:00 |
|
|
Ben Hollis
|
6dbe7f7a5a
|
Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs.
|
2013-01-25 22:31:40 -08:00 |
|
|
Thomas Reynolds
|
af132f6207
|
disable cane
|
2013-01-14 23:33:16 -08:00 |
|
|
Thomas Reynolds
|
ae9e6e722e
|
bye bye pry
|
2013-01-14 22:41:11 -08:00 |
|
|
Thomas Reynolds
|
18da6362ba
|
Allow multi-level i18n files. Fixes #725
|
2013-01-11 17:23:24 -08:00 |
|
|
Thomas Reynolds
|
63a82e6b1e
|
Lock therubyracer for now
|
2012-12-15 14:53:57 -08:00 |
|
|
Thomas Reynolds
|
01e9c336b0
|
Stylus support and tests. Fixes #649
|
2012-10-28 12:18:29 -07:00 |
|
|
Thomas Reynolds
|
d3818e8368
|
Prep 3.0.5
|
2012-09-23 19:00:40 -07:00 |
|
|
Thomas Reynolds
|
5a88184769
|
lock therubyrhino gem dep
|
2012-08-16 13:56:25 -07:00 |
|
|
Thomas Reynolds
|
446aa6a4ba
|
Clean up whitespace, play with cane for testing style quality and code complexity
|
2012-08-13 15:41:07 -07:00 |
|
|
Thomas Reynolds
|
174000c1a2
|
3.0 [ci skip]
|
2012-07-09 10:00:49 -07:00 |
|
|
Thomas Reynolds
|
2282657000
|
Use therubyrhino for jruby execjs tests
|
2012-07-07 14:31:39 -07:00 |
|
|
Thomas Reynolds
|
cdca063fb8
|
Add middleman-sprockets as a gitmodule [no ci]
|
2012-07-02 21:32:08 -07:00 |
|