Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -12,24 +12,13 @@ assignees: Nikhil-Nandagopal
 [What happened]
 
 ### Steps to reproduce the behaviour:
+Add steps to reproduce this behaviour, include console / network logs & screenshots
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-Good items to include here include:
-- Console / network logs from your browser
-- Screenshots
-
 ### Important Details
-
-How are you running appsmith?
-<!-- Please pick one of the following -->
-On-Premise w/ Docker, version x.y.z
-<!-- --------------- -->
-SaaS (appsmith.com)
-<!-- --------------- -->
-
-Which browser / OS are you using?
+ - Version: [Cloud / Self-Hosted vx.x]
  - OS: [e.g.MacOSX]
  - Browser [e.g. chrome, safari]

app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java

@@ -71,6 +71,8 @@ public class Action extends BaseDomain {
     @JsonIgnore
     Boolean userSetOnLoad = false;
 
+    Boolean confirmBeforeExecute = false;
+
     Documentation documentation;
 
     /**

app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java

@@ -38,4 +38,8 @@ public class Application extends BaseDomain {
     @JsonIgnore
     String clonedFromApplicationId;
 
+    String colour;
+
+    String icon;
+
 }