Merge branch 'develop'

mig82 · Nov 27, 2019 · 235b5fe · 235b5fe
2 parents c09a2f9 + a996139
commit 235b5fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -19,9 +19,8 @@ HeadlessBuild.properties filter=kony_headless_props
 # Clean javascript files from all lines containing nothing but white spaces and tabs.
 #modules/**/*.js filter=rm_whiteline
 
-# Prettify and sort the file where Visualizer stores the Fabric services config.
-mobileFabricServiceConfigMap.json filter=pretty_json
-objectServicesConfigMap.json filter=pretty_json
+# Prettify and sort other config files.
+globalVariables.json filter=pretty_json
 
 # Filter out the url and filepath properties in Native API mappings.
 nativeapi.json filter=kony_native_api_json
diff --git a/.gitignore b/.gitignore
@@ -166,3 +166,6 @@ syncclientcode.zip
 # Snapshots of the Kony Fabric app services associated with the project.
 /mobileFabricServiceConfigMap.json
 /objectServicesConfigMap.json
+
+# Action editor generated javascript files are recreated by Vis. Only the JSON files need to be versioned.
+/actions/*/*.js