From 2ce07e922beb6d1effe3d4484fda90b00e3fabff Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Fri, 11 Oct 2019 15:27:24 +0530
Subject: [PATCH 1/2] Fixed member section visibility for owner

no issue

Previously we were just hiding the toggle for member section in case of user not being owner. This updates to hide full section in case of non-owner user which is expected behavior
---
 ghost/admin/app/templates/settings/labs.hbs | 67 +++++++++++----------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 74518d862c..4b3b12139c 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -214,42 +214,43 @@
                 {{/gh-uploader}}
             </div>
         </div>
-
-        {{#if config.enableDeveloperExperiments}}
-        <div class="gh-setting-header">Members (BETA) </div>
-        <div class="flex flex-column br3 shadow-1 bg-grouped-table mt2">
-            <div class="gh-setting-first gh-setting-last">
-                <div class="gh-members-setting-content">
-                    <div class="flex">
-                        <div class="flex flex-column flex-grow-1">
-                            <div class="gh-setting-title pl5 pt5">Members</div>
-                            <div class="gh-setting-desc pl5 pb5">Enable membership for your site</div>
-                        </div>
-                        <div class="gh-setting-action">
-                            <div class="for-switch pa5">{{gh-feature-flag "members"}}</div>
+        {{#if session.user.isOwner}}
+            {{#if config.enableDeveloperExperiments}}
+                <div class="gh-setting-header">Members (BETA) </div>
+                <div class="flex flex-column br3 shadow-1 bg-grouped-table mt2">
+                    <div class="gh-setting-first gh-setting-last">
+                        <div class="gh-members-setting-content">
+                            <div class="flex">
+                                <div class="flex flex-column flex-grow-1">
+                                    <div class="gh-setting-title pl5 pt5">Members</div>
+                                    <div class="gh-setting-desc pl5 pb5">Enable membership for your site</div>
+                                </div>
+                                <div class="gh-setting-action">
+                                    <div class="for-switch pa5">{{gh-feature-flag "members"}}</div>
+                                </div>
+                            </div>
+                
+                            {{#liquid-if feature.labs.members}}
+                            {{gh-members-lab-setting
+                                                    settings=settings
+                                                    setDefaultContentVisibility=(action "setDefaultContentVisibility")
+                                                    setMembersSubscriptionSettings=(action "setMembersSubscriptionSettings")
+                                                }}
+                
+                            <div class="mt5 pl5 pr5 pb5">
+                                {{gh-task-button "Save members settings"
+                                                        task=saveSettings
+                                                        successText="Saved"
+                                                        runningText="Saving"
+                                                        class="gh-btn gh-btn-blue gh-btn-icon"
+                                                    }}
+                            </div>
+                            {{/liquid-if}}
                         </div>
+                
                     </div>
-        
-                    {{#liquid-if feature.labs.members}}
-                    {{gh-members-lab-setting
-                                            settings=settings
-                                            setDefaultContentVisibility=(action "setDefaultContentVisibility")
-                                            setMembersSubscriptionSettings=(action "setMembersSubscriptionSettings")
-                                        }}
-        
-                    <div class="mt5 pl5 pr5 pb5">
-                        {{gh-task-button "Save members settings"
-                                                task=saveSettings
-                                                successText="Saved"
-                                                runningText="Saving"
-                                                class="gh-btn gh-btn-blue gh-btn-icon"
-                                            }}
-                    </div>
-                    {{/liquid-if}}
                 </div>
-        
-            </div>
-        </div>
+            {{/if}}
         {{/if}}
     </section>
 </section>

From 083b1e4a5a0f56f90e505bff30143a1e18feb508 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Fri, 11 Oct 2019 16:59:08 +0530
Subject: [PATCH 2/2] Version bump to 2.36.0

---
 ghost/admin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 2dae8453c3..449705380c 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost-admin",
-  "version": "2.35.0",
+  "version": "2.36.0",
   "description": "Ember.js admin client for Ghost",
   "author": "Ghost Foundation",
   "homepage": "http://ghost.org",