Merge branch 'master' into dh-async-repo

This commit is contained in:
joshaber 2016-01-06 13:52:18 -05:00
commit 6c4d97d0f2
3 changed files with 5 additions and 4 deletions

5
dot-atom/.gitignore vendored
View File

@ -1,5 +1,6 @@
storage blob-store
compile-cache compile-cache
dev dev
.npm storage
.node-gyp .node-gyp
.npm

View File

@ -53,7 +53,7 @@
"service-hub": "^0.7.0", "service-hub": "^0.7.0",
"source-map-support": "^0.3.2", "source-map-support": "^0.3.2",
"temp": "0.8.1", "temp": "0.8.1",
"text-buffer": "8.1.3", "text-buffer": "8.1.4",
"typescript-simple": "1.0.0", "typescript-simple": "1.0.0",
"underscore-plus": "^1.6.6", "underscore-plus": "^1.6.6",
"yargs": "^3.23.0" "yargs": "^3.23.0"

View File

@ -288,7 +288,7 @@ class Project extends Model
'atom.repository-provider', 'atom.repository-provider',
'^0.1.0', '^0.1.0',
(provider) => (provider) =>
@repositoryProviders.push(provider) @repositoryProviders.unshift(provider)
@setPaths(@getPaths()) if null in @repositories @setPaths(@getPaths()) if null in @repositories
new Disposable => new Disposable =>
@repositoryProviders.splice(@repositoryProviders.indexOf(provider), 1) @repositoryProviders.splice(@repositoryProviders.indexOf(provider), 1)