Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ember-cli/ember-resolver
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.0.1
Choose a base ref
...
head repository: ember-cli/ember-resolver
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.1.0
Choose a head ref
Loading
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.bundle
tmp
node_modules
.DS_Store
Gemfile.lock
6 changes: 5 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
@@ -23,7 +23,11 @@
"expect",
"minispade",
"async",
"invokeAsync"
"invokeAsync",
"expectAssertion",
"expectDeprecation",
"expectNoDeprecation",
"throws"
],

"node" : false,
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -4,5 +4,5 @@ rvm:
node_js:
- "0.10"
install:
- "bundle install --deployment"
script: rake test
- "bundle install"
script: bundle exec rake test[all]
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rake-pipeline', :git => 'https://github.com/livingsocial/rake-pipeline.git'
gem 'ember-dev', :git => 'https://github.com/emberjs/ember-dev.git', :branch => 'master'
gem 'rake-pipeline', git: 'https://github.com/livingsocial/rake-pipeline.git'
gem 'ember-dev', git: 'https://github.com/emberjs/ember-dev.git', branch: 'master'

gem 'ember-source', '~> 1.2.0.beta.2'
gem 'ember-source', '~> 1.5.0'
80 changes: 0 additions & 80 deletions Gemfile.lock

This file was deleted.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Ember JJ-Abrams Resolver
# Ember JJ-Abrams Resolver [![Build Status](https://travis-ci.org/stefanpenner/ember-jj-abrams-resolver.png?branch=master)](https://travis-ci.org/stefanpenner/ember-jj-abrams-resolver)

This project is tracking a new resolver based on ES6 semantics that has been extracted from (and used by) the following projects:

* https://github.com/stefanpenner/ember-app-kit
* https://github.com/dockyard/ember-appkit-rails
* [ember-cli](https://github.com/stefanpenner/ember-cli)
* [ember-app-kit](https://github.com/stefanpenner/ember-app-kit)
* [ember-appkit-rails](https://github.com/dockyard/ember-appkit-rails)

## Goal

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.1
0.1.0
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -23,6 +23,6 @@
"tests"
],
"dependencies": {
"ember": "~> 1.2.0-beta.2"
"ember": " > 1.5.0-beta.3"
}
}
4 changes: 1 addition & 3 deletions dist/ember-resolver-spade.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading