From aa30a327a8727a7ac5b37fe081345cabf009bbfe Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Thu, 16 Mar 2017 16:27:46 +0100 Subject: [PATCH 1/2] Rename config file to be sample and add previous one to gitignore --- .gitignore | 1 + dev/tools/grunt/configs/{themes.js => themes.js.sample} | 0 2 files changed, 1 insertion(+) rename dev/tools/grunt/configs/{themes.js => themes.js.sample} (100%) diff --git a/.gitignore b/.gitignore index b7f681b292e4d..21ba71c81d6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ atlassian* /.grunt /Gruntfile.js /package.json +/dev/tools/grunt/configs/themes.js /pub/media/*.* !/pub/media/.htaccess diff --git a/dev/tools/grunt/configs/themes.js b/dev/tools/grunt/configs/themes.js.sample similarity index 100% rename from dev/tools/grunt/configs/themes.js rename to dev/tools/grunt/configs/themes.js.sample From a0067192a79220860d0bd0a945ea73b13c60e983 Mon Sep 17 00:00:00 2001 From: Bartek Igielski Date: Thu, 16 Mar 2017 18:53:05 +0100 Subject: [PATCH 2/2] Revert of previous changes. Added proper config files to gitignore. --- .gitignore | 3 ++- dev/tools/grunt/configs/{themes.js.sample => themes.js} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename dev/tools/grunt/configs/{themes.js.sample => themes.js} (100%) diff --git a/.gitignore b/.gitignore index 21ba71c81d6b2..d4e35bd33d65e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,8 @@ atlassian* /.grunt /Gruntfile.js /package.json -/dev/tools/grunt/configs/themes.js +/grunt-config.json +/dev/tools/grunt/configs/local-themes.js /pub/media/*.* !/pub/media/.htaccess diff --git a/dev/tools/grunt/configs/themes.js.sample b/dev/tools/grunt/configs/themes.js similarity index 100% rename from dev/tools/grunt/configs/themes.js.sample rename to dev/tools/grunt/configs/themes.js