From d5e0f21389122cbe82bce158947ad591ebbe369d Mon Sep 17 00:00:00 2001 From: Tunghsiao Liu Date: Mon, 21 Dec 2015 12:44:18 +0800 Subject: [PATCH 1/6] Prevent committing `blob-store` --- dot-atom/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/dot-atom/.gitignore b/dot-atom/.gitignore index 81af3f689..569a62297 100644 --- a/dot-atom/.gitignore +++ b/dot-atom/.gitignore @@ -1,5 +1,6 @@ storage compile-cache dev +blob-store .npm .node-gyp From 754552cb476d60da7045748465b3651d736552ac Mon Sep 17 00:00:00 2001 From: Tunghsiao Liu Date: Mon, 21 Dec 2015 12:45:21 +0800 Subject: [PATCH 2/6] Reorder ignored items for .atom --- dot-atom/.gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dot-atom/.gitignore b/dot-atom/.gitignore index 569a62297..e5c80ce23 100644 --- a/dot-atom/.gitignore +++ b/dot-atom/.gitignore @@ -1,6 +1,6 @@ -storage +blob-store compile-cache dev -blob-store -.npm +storage .node-gyp +.npm From 6ee36b14b1774583f7d5305ea74edc945f0a3fa7 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 4 Jan 2016 09:58:19 -0800 Subject: [PATCH 3/6] Prepare 1.3.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5710de92d..959be0793 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom", "productName": "Atom", - "version": "1.3.2", + "version": "1.3.3", "description": "A hackable text editor for the 21st Century.", "main": "./src/browser/main.js", "repository": { From ba24364a89c2a0427e8fda270af768d54d667a35 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 4 Jan 2016 09:58:29 -0800 Subject: [PATCH 4/6] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 959be0793..1cb27543a 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "service-hub": "^0.7.0", "source-map-support": "^0.3.2", "temp": "0.8.1", - "text-buffer": "8.0.4", + "text-buffer": "8.0.4-hotfix.1", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", "yargs": "^3.23.0" From 3b8375d2b4163261e119481d0b5b63acdc07d727 Mon Sep 17 00:00:00 2001 From: Valerii Iatsko Date: Wed, 6 Jan 2016 00:05:58 +0100 Subject: [PATCH 5/6] This change gives custom repositoryProviders more priority - this wil allow us to override base git repository implementation --- src/project.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project.coffee b/src/project.coffee index d59c041cb..714511f9a 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -288,7 +288,7 @@ class Project extends Model 'atom.repository-provider', '^0.1.0', (provider) => - @repositoryProviders.push(provider) + @repositoryProviders.unshift(provider) @setPaths(@getPaths()) if null in @repositories new Disposable => @repositoryProviders.splice(@repositoryProviders.indexOf(provider), 1) From 972d62f9d2fffd8d32d7ad01bc2a73c4cfab6599 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 5 Jan 2016 17:23:32 -0800 Subject: [PATCH 6/6] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 591e1a2a0..d6eefcc7c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "service-hub": "^0.7.0", "source-map-support": "^0.3.2", "temp": "0.8.1", - "text-buffer": "8.1.3", + "text-buffer": "8.1.4", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", "yargs": "^3.23.0"