Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

9 files changed, 94 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a0b56bd3055..9950b1c3e62 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.12.0 (unreleased)
   - Don't notify users mentioned in code blocks or blockquotes.
+  - Omit link to generate labels if user does not have access to create them (Stan Hu)
   - Disable changing of the source branch in merge request update API (Stan Hu)
   - Shorten merge request WIP text.
   - Add option to disallow users from registering any application to use GitLab as an OAuth provider
@@ -13,6 +14,7 @@ v 7.12.0 (unreleased)
   - Add file attachment support in Milestone description (Stan Hu)
   - Fix milestone "Browse Issues" button.
   - Set milestone on new issue when creating issue from index with milestone filter active.
+  - Make namespace API available to all users (Stan Hu)
   - Add web hook support for note events (Stan Hu)
   - Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings (Stan Hu)
   - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu)
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a6af1a26ed..596dc7ea33a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -655,6 +655,12 @@ class User < ActiveRecord::Base
       end
   end
 
+  def namespaces
+    namespace_ids = groups.pluck(:id)
+    namespace_ids.push(namespace.id)
+    Namespace.where(id: namespace_ids)
+  end
+
   def oauth_authorized_tokens
     Doorkeeper::AccessToken.where(resource_owner_id: self.id, revoked_at: nil)
   end
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index a374a662333..12f83aae04b 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -35,7 +35,7 @@
             = diff.new_path
           - elsif diff.new_file
             %span.new-file
-              &plus;
+              &#43;
               = diff.new_path
           - else
             = diff.new_path
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index 7d19415a7f4..d44fe486212 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -13,4 +13,7 @@
     = paginate @labels, theme: 'gitlab'
   - else
     .light-well
-      .nothing-here-block Create first label or #{link_to 'generate', generate_namespace_project_labels_path(@project.namespace, @project), method: :post} default set of labels
+      - if can? current_user, :admin_label, @project
+        .nothing-here-block Create first label or #{link_to 'generate', generate_namespace_project_labels_path(@project.namespace, @project), method: :post} default set of labels
+      - else
+        .nothing-here-block No labels created
diff --git a/doc/api/README.md b/doc/api/README.md
index f6757b0a6aa..ca58c184543 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -19,6 +19,7 @@
 - [Deploy Keys](deploy_keys.md)
 - [System Hooks](system_hooks.md)
 - [Groups](groups.md)
+- [Namespaces](namespaces.md)
 
 ## Clients
 
diff --git a/doc/api/namespaces.md b/doc/api/namespaces.md
new file mode 100644
index 00000000000..7b3238441f6
--- /dev/null
+++ b/doc/api/namespaces.md
@@ -0,0 +1,44 @@
+# Namespaces
+
+## List namespaces
+
+Get a list of namespaces. (As user: my namespaces, as admin: all namespaces)
+
+```
+GET /namespaces
+```
+
+```json
+[
+  {
+    "id": 1,
+    "path": "user1",
+    "kind": "user"
+  },
+  {
+    "id": 2,
+    "path": "group1",
+    "kind": "group"
+  }
+]
+```
+
+You can search for namespaces by name or path, see below.
+
+## Search for namespace
+
+Get all namespaces that match your string in their name or path.
+
+```
+GET /namespaces?search=foobar
+```
+
+```json
+[
+  {
+    "id": 1,
+    "path": "user1",
+    "kind": "user"
+  }
+]
+```
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb
index b90ed6af5fb..50d3729449e 100644
--- a/lib/api/namespaces.rb
+++ b/lib/api/namespaces.rb
@@ -1,10 +1,7 @@
 module API
   # namespaces API
   class Namespaces < Grape::API
-    before do
-      authenticate!
-      authenticated_as_admin!
-    end
+    before { authenticate! }
 
     resource :namespaces do
       # Get a namespaces list
@@ -12,7 +9,11 @@ module API
       # Example Request:
       #  GET /namespaces
       get do
-        @namespaces = Namespace.all
+        @namespaces = if current_user.admin
+                        Namespace.all
+                      else
+                        current_user.namespaces
+                      end
         @namespaces = @namespaces.search(params[:search]) if params[:search].present?
         @namespaces = paginate @namespaces
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 49c7b7d99ce..be0b70395d6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -248,6 +248,7 @@ describe User do
     it { expect(@user.several_namespaces?).to be_truthy }
     it { expect(@user.authorized_groups).to eq([@group]) }
     it { expect(@user.owned_groups).to eq([@group]) }
+    it { expect(@user.namespaces).to match_array([@user.namespace, @group]) }
   end
 
   describe 'group multiple owners' do
@@ -270,6 +271,7 @@ describe User do
     end
 
     it { expect(@user.several_namespaces?).to be_falsey }
+    it { expect(@user.namespaces).to eq([@user.namespace]) }
   end
 
   describe 'blocking user' do
diff --git a/spec/requests/api/namespaces_spec.rb b/spec/requests/api/namespaces_spec.rb
index 6ddaaa0a6dd..21787fdd895 100644
--- a/spec/requests/api/namespaces_spec.rb
+++ b/spec/requests/api/namespaces_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe API::API, api: true  do
   include ApiHelpers
   let(:admin) { create(:admin) }
+  let(:user) { create(:user) }
   let!(:group1) { create(:group) }
   let!(:group2) { create(:group) }
 
@@ -14,7 +15,7 @@ describe API::API, api: true  do
       end
     end
 
-    context "when authenticated as  admin" do
+    context "when authenticated as admin" do
       it "admin: should return an array of all namespaces" do
         get api("/namespaces", admin)
         expect(response.status).to eq(200)
@@ -22,6 +23,32 @@ describe API::API, api: true  do
 
         expect(json_response.length).to eq(Namespace.count)
       end
+
+      it "admin: should return an array of matched namespaces" do
+        get api("/namespaces?search=#{group1.name}", admin)
+        expect(response.status).to eq(200)
+        expect(json_response).to be_an Array
+
+        expect(json_response.length).to eq(1)
+      end
+    end
+
+    context "when authenticated as a regular user" do
+      it "user: should return an array of namespaces" do
+        get api("/namespaces", user)
+        expect(response.status).to eq(200)
+        expect(json_response).to be_an Array
+
+        expect(json_response.length).to eq(1)
+      end
+
+      it "admin: should return an array of matched namespaces" do
+        get api("/namespaces?search=#{user.username}", user)
+        expect(response.status).to eq(200)
+        expect(json_response).to be_an Array
+
+        expect(json_response.length).to eq(1)
+      end
     end
   end
 end