[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Remove config.yaml from the repository

2017-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382133 )

Change subject: Remove config.yaml from the repository
..


Remove config.yaml from the repository

It is a symlink to config.dev.yaml. But having the default configuration
tracked in git makes development and debugging with local customization
difficult. Extra care needed to avoid changes getting committed.

Instructions in README already recommends copying config.dev.yaml to
config.yaml and do customization.

Tests will use config.dev.yaml

Change-Id: I6137c12b998fce4cbd70a34f0ccbfacd6c3cb9e8
---
M .gitignore
D config.yaml
M test/utils/server.js
3 files changed, 2 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, approved



diff --git a/.gitignore b/.gitignore
index 5d27e98..bcf2333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 .idea
 .bundle/
 *.log
-config.js
+config.yaml
 docs
 node_modules
 log/
diff --git a/config.yaml b/config.yaml
deleted file mode 12
index c11eec8..000
--- a/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-config.dev.yaml
\ No newline at end of file
diff --git a/test/utils/server.js b/test/utils/server.js
index 17fb251..f3a2e83 100644
--- a/test/utils/server.js
+++ b/test/utils/server.js
@@ -14,7 +14,7 @@
 
 // set up the configuration
 config = {
-   conf: yaml.safeLoad( fs.readFileSync( __dirname + '/../../config.yaml' 
) )
+   conf: yaml.safeLoad( fs.readFileSync( __dirname + 
'/../../config.dev.yaml' ) )
 };
 // build the API endpoint URI by supposing the actual service
 // is the last one in the 'services' list in the config file

-- 
To view, visit https://gerrit.wikimedia.org/r/382133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6137c12b998fce4cbd70a34f0ccbfacd6c3cb9e8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Remove config.yaml from the repository

2017-10-04 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382133 )

Change subject: Remove config.yaml from the repository
..

Remove config.yaml from the repository

It is a symlink to config.dev.yaml. But having the default configuration
tracked in git makes development and debugging with local customization
difficult. Extra care needed to avoid changes getting committed.

Instructions in README already recommends copying config.dev.yaml to
config.yaml and do customization.

Change-Id: I6137c12b998fce4cbd70a34f0ccbfacd6c3cb9e8
---
D config.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/33/382133/1

diff --git a/config.yaml b/config.yaml
deleted file mode 12
index c11eec8..000
--- a/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-config.dev.yaml
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/382133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6137c12b998fce4cbd70a34f0ccbfacd6c3cb9e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits