Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

CHANGELOG

@@ -6,6 +6,9 @@ v 7.5.0
   - Add Atlassian Bamboo CI service (Drew Blessing)
   - Mentioned @user will receive email even if he is not participating in issue or commit
   - Session API: Use case-insensitive authentication like in UI (Andrey Krivko)
+  - Tie up loose ends with annotated tags: API & UI (Sean Edge)
+  - Return valid json for deleting branch via API (sponsored by O'Reilly Media)
+  - Expose username in project events API (sponsored by O'Reilly Media)
 
 v 7.4.2
   - Fix internal snippet exposing for unauthenticated users

CONTRIBUTING.md

@@ -54,6 +54,8 @@ We welcome merge requests with fixes and improvements to GitLab code, tests, and
 
 Merge requests can be filed either at [gitlab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests) or [github.com](https://github.com/gitlabhq/gitlabhq/pulls).
 
+If you are new to GitLab development (or web development in general), search for the label `easyfix` ([gitlab.com](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=easyfix), [github](https://github.com/gitlabhq/gitlabhq/labels/easyfix)). Those are issues easy to fix, marked by the GitLab core-team. If you are unsure how to proceed but want to help, mention one of the core-team members to give you a hint.
+
 ### Merge request guidelines
 
 If you can, please submit a merge request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a merge request is as follows:

Gemfile

@@ -143,7 +143,7 @@ gem "gitlab-flowdock-git-hook", "~> 0.4.2"
 gem "gemnasium-gitlab-service", "~> 0.2"
 
 # Slack integration
-gem "slack-notifier", "~> 0.3.2"
+gem "slack-notifier", "~> 1.0.0"
 
 # d3
 gem "d3_rails", "~> 3.1.4"

Gemfile.lock

@@ -488,7 +488,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     six (0.2.0)
-    slack-notifier (0.3.2)
+    slack-notifier (1.0.0)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
@@ -689,7 +689,7 @@ DEPENDENCIES
   simplecov
   sinatra
   six
-  slack-notifier (~> 0.3.2)
+  slack-notifier (~> 1.0.0)
   slim
   spinach-rails
   spring (= 1.1.3)

app/controllers/projects/branches_controller.rb

@@ -19,6 +19,7 @@ class Projects::BranchesController < Projects::ApplicationController
   def create
     result = CreateBranchService.new(project, current_user).
         execute(params[:branch_name], params[:ref])
+
     if result[:status] == :success
       @branch = result[:branch]
       redirect_to project_tree_path(@project, @branch.name)

app/models/project_services/slack_service.rb

@@ -30,25 +30,21 @@ class SlackService < Service
 
   def fields
     [
-      { type: 'text', name: 'webhook', placeholder: '' }
+      { type: 'text', name: 'webhook', placeholder: 'https://hooks.slack.com/services/...' }
     ]
   end
 
   def execute(push_data)
+    return unless webhook.present?
+
     message = SlackMessage.new(push_data.merge(
       project_url: project_url,
       project_name: project_name
     ))
 
-    credentials = webhook.match(/([\w-]*).slack.com.*services\/(.*)/)
-
-    if credentials.present?
-      subdomain =  credentials[1]
-      token = credentials[2].split("token=").last
-      notifier = Slack::Notifier.new(subdomain, token)
+    notifier = Slack::Notifier.new(webhook)
     notifier.ping(message.pretext, attachments: message.attachments)
   end
-  end
 
   private
 

app/views/projects/diffs/_file.html.haml

@@ -9,6 +9,9 @@
       .diff-btn-group
         - if @commit.parent_ids.present?
           = view_file_btn(@commit.parent_id, diff_file, project)
+    - else
+      - if diff_file.renamed_file
+        %span= "#{diff_file.old_path} renamed to #{diff_file.new_path}"
       - else
         %span= diff_file.new_path
       - if diff_file.mode_changed?

app/views/projects/tags/_tag.html.haml

@@ -4,6 +4,9 @@
     = link_to project_commits_path(@project, tag.name), class: "" do
       %i.fa.fa-tag
       = tag.name
+    - if tag.message.present?
+       
+      = tag.message
     .pull-right
       - if can? current_user, :download_code, @project
         = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'

config/application.rb

@@ -22,11 +22,6 @@ module Gitlab
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # NOTE: Please prefer set time zone on config/gitlab.yml configuration file.
-    # config.time_zone = 'Central Time (US & Canada)'
-
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de

config/unicorn.rb.example

@@ -15,6 +15,7 @@
 
 # Use at least one worker per core if you're on a dedicated server,
 # more will usually help for _short_ waits on databases/caches.
+# The minimum is 2
 worker_processes 2
 
 # Since Unicorn is never exposed to outside clients, it does not need to

db/migrate/20140907220153_serialize_service_properties.rb

@@ -23,7 +23,7 @@ class SerializeServiceProperties < ActiveRecord::Migration
       associations[service.type.to_sym].each do |attribute|
         service.send("#{attribute}=", service.attributes[attribute.to_s])
       end
-      service.save!
+      service.save
     end
 
     remove_column :services, :project_url, :string

db/migrate/20141006143943_move_slack_service_to_webhook.rb

@@ -10,7 +10,7 @@ class MoveSlackServiceToWebhook < ActiveRecord::Migration
         slack_service.properties.delete('subdomain')
         # Room is configured on the Slack side
         slack_service.properties.delete('room')
-        slack_service.save!
+        slack_service.save
       end
     end
   end

doc/api/branches.md

@@ -211,3 +211,11 @@ Parameters:
 
 It return 200 if succeed, 404 if the branch to be deleted does not exist
 or 400 for other reasons. In case of an error, an explaining message is provided.
+
+Success response: 
+
+```json
+{
+  "branch_name": "my-removed-branch"
+}
+```

doc/api/projects.md

@@ -186,6 +186,7 @@ Parameters:
     "target_id": 830,
     "target_type": "Issue",
     "author_id": 1,
+    "author_username": "john",
     "data": null,
     "target_title": "Public project search field"
   },
@@ -196,6 +197,7 @@ Parameters:
     "target_id": null,
     "target_type": null,
     "author_id": 1,
+    "author_username": "john",
     "data": {
       "before": "50d4420237a9de7be1304607147aec22e4a14af7",
       "after": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
@@ -231,6 +233,7 @@ Parameters:
     "target_id": 840,
     "target_type": "Issue",
     "author_id": 1,
+    "author_username": "john",
     "data": null,
     "target_title": "Finish & merge Code search PR"
   }

doc/api/repositories.md

@@ -56,6 +56,7 @@ Parameters:
 [
   {
     "name": "v1.0.0",
+    "message": "Release 1.0.0",
     "commit": {
       "id": "2695effb5807a22ff3d138d593fd856244e155e7",
       "parents": [],
@@ -67,10 +68,11 @@ Parameters:
       "committed_date": "2012-05-28T04:42:42-07:00",
       "committer_email": "jack@example.com"
     },
-    "protected": false
   }
 ]
 ```
+The message will be `nil` when creating a lightweight tag otherwise
+it will contain the annotation.
 
 It returns 200 if the operation succeed. In case of an error,
 405 with an explaining error message is returned.

doc/install/installation.md

@@ -76,6 +76,7 @@ Is the system packaged Git too old? Remove it and compile from source.
     cd /tmp
     curl -L --progress https://www.kernel.org/pub/software/scm/git/git-2.1.2.tar.gz | tar xz
     cd git-2.1.2/
+    ./configure
     make prefix=/usr/local all
 
     # Install into /usr/local/bin
@@ -91,7 +92,7 @@ Then select 'Internet Site' and press enter to confirm the hostname.
 
 ## 2. Ruby
 
-The use of ruby version managers such as [RVM](http://rvm.io/), [rbenv](https://github.com/sstephenson/rbenv) or [chruby](https://github.com/postmodern/chruby) with GitLab in production frequently leads to hard to diagnose problems. For example, GitLab Shell is called from OpenSSH and having a version manager can prevent pushing and pulling over SSH. Version managers are not supported and we strongly advise everyone to follow the instructions below to use a system ruby.
+The use of Ruby version managers such as [RVM](http://rvm.io/), [rbenv](https://github.com/sstephenson/rbenv) or [chruby](https://github.com/postmodern/chruby) with GitLab in production frequently leads to hard to diagnose problems. For example, GitLab Shell is called from OpenSSH and having a version manager can prevent pushing and pulling over SSH. Version managers are not supported and we strongly advise everyone to follow the instructions below to use a system Ruby.
 
 Remove the old Ruby 1.8 if present
 

doc/integration/slack.md

@@ -4,15 +4,23 @@
 
 To enable Slack integration you must create an Incoming WebHooks integration on Slack;
 
-1.  Sign in to [Slack](https://slack.com) (https://YOURSUBDOMAIN.slack.com/services)
-1.  Click on the Integrations menu at the top of the page.
-1.  Add a new Integration.
+1.  [Sign in to Slack](https://slack.com/signin)
+
+1.  Select **Configure Integrations** from the dropdown next to your team name.
+
+1.  Select the **All Services** tab
+
+1.  Click **Add** next to Incoming Webhooks
+
 1.  Pick Incoming WebHooks
-1.  Choose the channel name you want to send notifications to, in the Settings section
-1.  Add Integrations.
-    - Optional step; You can change bot's name and avatar by clicking "change the name of your bot", and "change the icon" after that you have to click "Save settings".
 
-Now, Slack is ready to get external hooks. Before you leave this page don't forget to get the Token that you'll need on GitLab. You can find it by clicking Expand button, located in the "Instructions for creating Incoming WebHooks" section. It's a random alpha-numeric text 24 characters long.
+1.  Choose the channel name you want to send notifications to
+
+1.  Click **Add Incoming WebHooks Integration**Add Integrations.
+    - Optional step; You can change bot's name and avatar by clicking modifying the bot name or avatar under **Integration Settings**.
+
+1. Copy the **Webhook URL**, we'll need this later for GitLab.
+
 
 ## On GitLab
 
@@ -26,10 +34,8 @@ After Slack is ready we need to setup GitLab. Here are the steps to achieve this
 
 1.  Fill in your Slack details
 
-    - Mark as active it
-    - Type your subdomain's prefix (If your subdomain is https://somedomain.slack.com you only have to type the somedomain)
-    - Type in the token you got from Slack
-    - Type in the channel name you want to use (eg. #announcements)
+    - Mark it as active
+    - Paste in the webhook url you got from Slack
 
 Have fun :)
 

doc/raketasks/import.md

-# Import
+# Import bare repositories into your GitLab instance
 
-## Import bare repositories into GitLab project instance
+## Notes
 
-Notes:
+- The owner of the project will be the first admin
+- The groups will be created as needed
+- The owner of the group will be the first admin
+- Existing projects will be skipped
 
-- project owner will be a first admin
-- groups will be created as needed
-- group owner will be the first admin
-- existing projects will be skipped
+## How to use
 
-How to use:
+### Create a new folder inside the git repositories path. This will be the name of the new group.
 
-1. copy your bare repos under git repos_path (see `config/gitlab.yml` gitlab_shell -> repos_path)
-1. run the command below
+- For omnibus-gitlab, it is located at: `/var/opt/gitlab/git-data/repositories` by default, unless you changed
+it in the `/etc/gitlab/gitlab.rb` file.
+- For manual installations, it is usually located at: `/home/git/repositories` or you can see where
+your repositories are located by looking at `config/gitlab.yml` under the `gitlab_shell => repos_path` entry.
 
+### Copy your bare repositories inside this newly created folder:
+
+```
+$ cp -r /old/git/foo.git/ /home/git/repositories/new_group/
+```
+
+### Run the command below depending on your type of installation:
+
+#### Omnibus Installation
+
+```
+$ sudo gitlab-rake gitlab:import:repos
 ```
-# omnibus-gitlab
-sudo gitlab-rake gitlab:import:repos
 
-# installation from source or cookbook
-bundle exec rake gitlab:import:repos RAILS_ENV=production
+#### Manual Installation
+
+Before running this command you need to change the directory to where your GitLab installation is located:
+
+```
+$ cd /home/git/gitlab
+$ sudo -u git -H bundle exec rake gitlab:import:repos RAILS_ENV=production
 ```
 
-Example output:
+#### Example output
 
 ```
 Processing abcd.git

doc/update/6.x-or-7.x-to-7.3.md → doc/update/6.x-or-7.x-to-7.4.md

-# From 6.x or 7.x to 7.3
+# From 6.x or 7.x to 7.4
 
-This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.3.
+This allows you to upgrade any version of GitLab from 6.0 and up (including 7.0 and up) to 7.4.
 
 ## Global issue numbers
 
@@ -70,7 +70,7 @@ sudo -u git -H git checkout -- db/schema.rb # local changes will be restored aut
 For GitLab Community Edition:
 
 ```bash
-sudo -u git -H git checkout 7-3-stable
+sudo -u git -H git checkout 7-4-stable
 ```
 
 OR
@@ -78,7 +78,7 @@ OR
 For GitLab Enterprise Edition:
 
 ```bash
-sudo -u git -H git checkout 7-3-stable-ee
+sudo -u git -H git checkout 7-4-stable-ee
 ```
 
 ## 4. Install additional packages
@@ -154,14 +154,14 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 TIP: to see what changed in `gitlab.yml.example` in this release use next command:
 
 ```
-git diff 6-0-stable:config/gitlab.yml.example 7-3-stable:config/gitlab.yml.example
+git diff 6-0-stable:config/gitlab.yml.example 7-4-stable:config/gitlab.yml.example
 ```
 
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/config/unicorn.rb.example but with your settings.
 * Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.0.1/config.yml.example but with your settings.
-* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/lib/support/nginx/gitlab but with your settings.
-* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-3-stable/lib/support/nginx/gitlab-ssl but with your settings.
+* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-4-stable/lib/support/nginx/gitlab-ssl but with your settings.
 * Copy rack attack middleware config
 
 ```bash
@@ -267,6 +267,7 @@ mysql> \q
 #   Set production -> username: git
 #   Set production -> password: the password your replaced $password with earlier
 sudo -u git -H editor /home/git/gitlab/config/database.yml
+```
 
 ## Things went south? Revert to previous version (6.0)
 

doc/update/7.3-to-7.4.md

@@ -9,6 +9,7 @@
 ```bash
 cd /home/git/gitlab
 sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
 
 ### 2. Get latest code
 

doc/update/patch_versions.md

@@ -26,16 +26,14 @@ sudo -u git -H git checkout LATEST_TAG
 
 Replace LATEST_TAG with the latest GitLab tag you want to upgrade to, for example `v6.6.3`.
 
-### 3. Update gitlab-shell if it is not the latest version
+### 3. Update gitlab-shell to the corresponding version
 
 ```bash
 cd /home/git/gitlab-shell
 sudo -u git -H git fetch
-sudo -u git -H git checkout LATEST_TAG
+sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`
 ```
 
-Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for example `v1.7.9`.
-
 ### 4. Install libs, migrations, etc.
 
 ```bash

features/steps/project/services.rb

@@ -109,12 +109,12 @@ class Spinach::Features::ProjectServices < Spinach::FeatureSteps
 
   step 'I fill Slack settings' do
     check 'Active'
-    fill_in 'Webhook', with: 'https://gitlabhq.slack.com/services/hooks?token=cdIj4r4LfXUOySDUjp0tk3OI'
+    fill_in 'Webhook', with: 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685'
     click_button 'Save'
   end
 
   step 'I should see Slack service settings saved' do
-    find_field('Webhook').value.should == 'https://gitlabhq.slack.com/services/hooks?token=cdIj4r4LfXUOySDUjp0tk3OI'
+    find_field('Webhook').value.should == 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685'
   end
 
   step 'I click Pushover service link' do

lib/api/branches.rb

@@ -82,6 +82,7 @@ module API
         authorize_push_project
         result = CreateBranchService.new(user_project, current_user).
           execute(params[:branch_name], params[:ref])
+
         if result[:status] == :success
           present result[:branch],
                   with: Entities::RepoObject,
@@ -104,7 +105,9 @@ module API
           execute(params[:branch])
 
         if result[:status] == :success
-          true
+          {
+            branch_name: params[:branch]
+          }
         else
           render_api_error!(result[:message], result[:return_code])
         end

lib/api/entities.rb

@@ -73,6 +73,25 @@ module API
       end
     end
 
+    class RepoTag < Grape::Entity
+      expose :name
+      expose :message do |repo_obj, _options|
+        if repo_obj.respond_to?(:message)
+          repo_obj.message
+        else
+          nil
+        end
+      end
+
+      expose :commit do |repo_obj, options|
+        if repo_obj.respond_to?(:commit)
+          repo_obj.commit
+        elsif options[:project]
+          options[:project].repository.commit(repo_obj.target)
+        end
+      end
+    end
+
     class RepoObject < Grape::Entity
       expose :name
 
@@ -164,6 +183,12 @@ module API
       expose :target_id, :target_type, :author_id
       expose :data, :target_title
       expose :created_at
+
+      expose :author_username do |event, options|
+        if event.author
+          event.author.username
+        end
+      end
     end
 
     class Namespace < Grape::Entity

lib/api/repositories.rb

@@ -23,7 +23,8 @@ module API
       # Example Request:
       #   GET /projects/:id/repository/tags
       get ":id/repository/tags" do
-        present user_project.repo.tags.sort_by(&:name).reverse, with: Entities::RepoObject, project: user_project
+        present user_project.repo.tags.sort_by(&:name).reverse,
+                with: Entities::RepoTag, project: user_project
       end
 
       # Create tag
@@ -43,7 +44,7 @@ module API
 
         if result[:status] == :success
           present result[:tag],
-                  with: Entities::RepoObject,
+                  with: Entities::RepoTag,
                   project: user_project
         else
           render_api_error!(result[:message], 400)

lib/gitlab/backend/shell.rb

@@ -16,7 +16,7 @@ module Gitlab
     #   add_repository("gitlab/gitlab-ci")
     #
     def add_repository(name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "add-project", "#{name}.git"
+      system gitlab_shell_projects_path, 'add-project', "#{name}.git"
     end
 
     # Import repository
@@ -27,7 +27,7 @@ module Gitlab
     #   import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git")
     #
     def import_repository(name, url)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "import-project", "#{name}.git", url, '240'
+      system gitlab_shell_projects_path, 'import-project', "#{name}.git", url, '240'
     end
 
     # Move repository
@@ -39,7 +39,7 @@ module Gitlab
     #   mv_repository("gitlab/gitlab-ci", "randx/gitlab-ci-new.git")
     #
     def mv_repository(path, new_path)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "mv-project", "#{path}.git", "#{new_path}.git"
+      system gitlab_shell_projects_path, 'mv-project', "#{path}.git", "#{new_path}.git"
     end
 
     # Update HEAD for repository
@@ -51,7 +51,7 @@ module Gitlab
     #  update_repository_head("gitlab/gitlab-ci", "3-1-stable")
     #
     def update_repository_head(path, branch)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "update-head", "#{path}.git", branch
+      system gitlab_shell_projects_path, 'update-head', "#{path}.git", branch
     end
 
     # Fork repository to new namespace
@@ -63,7 +63,7 @@ module Gitlab
     #  fork_repository("gitlab/gitlab-ci", "randx")
     #
     def fork_repository(path, fork_namespace)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "fork-project", "#{path}.git", fork_namespace
+      system gitlab_shell_projects_path, 'fork-project', "#{path}.git", fork_namespace
     end
 
     # Remove repository from file system
@@ -74,7 +74,7 @@ module Gitlab
     #   remove_repository("gitlab/gitlab-ci")
     #
     def remove_repository(name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "rm-project", "#{name}.git"
+      system gitlab_shell_projects_path, 'rm-project', "#{name}.git"
     end
 
     # Add repository branch from passed ref
@@ -87,7 +87,7 @@ module Gitlab
     #   add_branch("gitlab/gitlab-ci", "4-0-stable", "master")
     #
     def add_branch(path, branch_name, ref)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "create-branch", "#{path}.git", branch_name, ref
+      system gitlab_shell_projects_path, 'create-branch', "#{path}.git", branch_name, ref
     end
 
     # Remove repository branch
@@ -99,7 +99,7 @@ module Gitlab
     #   rm_branch("gitlab/gitlab-ci", "4-0-stable")
     #
     def rm_branch(path, branch_name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "rm-branch", "#{path}.git", branch_name
+      system gitlab_shell_projects_path, 'rm-branch', "#{path}.git", branch_name
     end
 
     # Add repository tag from passed ref
@@ -129,7 +129,7 @@ module Gitlab
     #   rm_tag("gitlab/gitlab-ci", "v4.0")
     #
     def rm_tag(path, tag_name)
-      system "#{gitlab_shell_path}/bin/gitlab-projects", "rm-tag", "#{path}.git", tag_name
+      system gitlab_shell_projects_path, 'rm-tag', "#{path}.git", tag_name
     end
 
     # Add new key to gitlab-shell
@@ -138,7 +138,7 @@ module Gitlab
     #   add_key("key-42", "sha-rsa ...")
     #
     def add_key(key_id, key_content)
-      system "#{gitlab_shell_path}/bin/gitlab-keys", "add-key", key_id, key_content
+      system gitlab_shell_keys_path, 'add-key', key_id, key_content
     end
 
     # Batch-add keys to authorized_keys
@@ -157,7 +157,7 @@ module Gitlab
     #   remove_key("key-342", "sha-rsa ...")
     #
     def remove_key(key_id, key_content)
-      system "#{gitlab_shell_path}/bin/gitlab-keys", "rm-key", key_id, key_content
+      system gitlab_shell_keys_path, 'rm-key', key_id, key_content
     end
 
     # Remove all ssh keys from gitlab shell
@@ -166,7 +166,7 @@ module Gitlab
     #   remove_all_keys
     #
     def remove_all_keys
-      system "#{gitlab_shell_path}/bin/gitlab-keys", "clear"
+      system gitlab_shell_keys_path, 'clear'
     end
 
     # Add empty directory for storing repositories
@@ -249,5 +249,13 @@ module Gitlab
     def exists?(dir_name)
       File.exists?(full_path(dir_name))
     end
+
+    def gitlab_shell_projects_path
+      File.join(gitlab_shell_path, 'bin', 'gitlab-projects')
+    end
+
+    def gitlab_shell_keys_path
+      File.join(gitlab_shell_path, 'bin', 'gitlab-keys')
+    end
   end
 end

lib/gitlab/issues_labels.rb

@@ -15,7 +15,6 @@ module Gitlab
           { title: "support", color: yellow },
           { title: "discussion", color: blue },
           { title: "suggestion", color: blue },
-          { title: "feature", color: green },
           { title: "enhancement", color: green }
         ]
 

spec/models/slack_message_spec.rb

-require_relative '../../app/models/project_services/slack_message'
+require 'spec_helper'
 
 describe SlackMessage do
   subject { SlackMessage.new(args) }

spec/models/slack_service_spec.rb

@@ -32,70 +32,26 @@ describe SlackService do
 
   describe "Execute" do
     let(:slack)   { SlackService.new }
-    let(:slack_service) { SlackService.new }
     let(:user)    { create(:user) }
     let(:project) { create(:project) }
     let(:sample_data) { GitPushService.new.sample_data(project, user) }
-    let(:webhook) { 'https://gitlabhq.slack.com/services/hooks?token=cdIj4r4LfXUOySDUjp0tk3OI' }
-    let(:new_webhook) { 'https://hooks.gitlabhq.slack.com/services/cdIj4r4LfXUOySDUjp0tk3OI' }
-    let(:api_url) {
-      'https://gitlabhq.slack.com/services/hooks/incoming-webhook?token=cdIj4r4LfXUOySDUjp0tk3OI'
-    }
+    let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' }
 
     before do
       slack.stub(
         project: project,
         project_id: project.id,
         service_hook: true,
-        webhook: webhook
+        webhook: webhook_url
       )
 
-      WebMock.stub_request(:post, api_url)
+      WebMock.stub_request(:post, webhook_url)
     end
 
     it "should call Slack API" do
       slack.execute(sample_data)
 
-      WebMock.should have_requested(:post, api_url).once
-    end
-
-    context 'with new webhook syntax' do
-      before do
-        slack_service.stub(
-          project: project,
-          project_id: project.id,
-          service_hook: true,
-          webhook: new_webhook
-        )
-
-        WebMock.stub_request(:post, api_url)
-      end
-
-      it "should call Slack API" do
-        slack_service.execute(sample_data)
-
-        WebMock.should have_requested(:post, api_url).once
-      end
-    end
-
-    context 'with new webhook syntax with slack allowed team name' do
-      before do
-        @allowed_webhook = 'https://gitlab-hq-123.slack.com/services/hooks/incoming-webhook?token=cdIj4r4LfXUOySDUjp0tk3OI'
-        slack_service.stub(
-          project: project,
-          project_id: project.id,
-          service_hook: true,
-          webhook: @allowed_webhook
-        )
-
-        WebMock.stub_request(:post, @allowed_webhook)
-      end
-
-      it "should call Slack API" do
-        slack_service.execute(sample_data)
-
-        WebMock.should have_requested(:post, @allowed_webhook).once
-      end
+      WebMock.should have_requested(:post, webhook_url).once
     end
   end
 end

spec/requests/api/branches_spec.rb

@@ -146,6 +146,7 @@ describe API::API, api: true  do
     it "should remove branch" do
       delete api("/projects/#{project.id}/repository/branches/#{branch_name}", user)
       response.status.should == 200
+      json_response['branch_name'].should == branch_name
     end
 
     it 'should return 404 if branch not exists' do

spec/requests/api/projects_spec.rb

@@ -339,6 +339,7 @@ describe API::API, api: true  do
 
       json_event['action_name'].should == 'joined'
       json_event['project_id'].to_i.should == project.id
+      json_event['author_username'].should == user.username
     end
 
     it "should return a 404 error if not found" do

spec/requests/api/repositories_spec.rb

@@ -34,21 +34,24 @@ describe API::API, api: true  do
       end
     end
 
-    # TODO: fix this test for CI
-    #context 'annotated tag' do
-      #it 'should create a new annotated tag' do
-        #post api("/projects/#{project.id}/repository/tags", user),
-             #tag_name: 'v7.1.0',
-             #ref: 'master',
-             #message: 'tag message'
-
-        #response.status.should == 201
-        #json_response['name'].should == 'v7.1.0'
-        # The message is not part of the JSON response.
-        # Additional changes to the gitlab_git gem may be required.
-        # json_response['message'].should == 'tag message'
-      #end
-    #end
+    context 'annotated tag' do
+      it 'should create a new annotated tag' do
+        # Identity must be set in .gitconfig to create annotated tag.
+        repo_path = File.join(Gitlab.config.gitlab_shell.repos_path,
+                              project.path_with_namespace + '.git')
+        system(*%W(git --git-dir=#{repo_path} config user.name #{user.name}))
+        system(*%W(git --git-dir=#{repo_path} config user.email #{user.email}))
+
+        post api("/projects/#{project.id}/repository/tags", user),
+             tag_name: 'v7.1.0',
+             ref: 'master',
+             message: 'Release 7.1.0'
+
+        response.status.should == 201
+        json_response['name'].should == 'v7.1.0'
+        json_response['message'].should == 'Release 7.1.0'
+      end
+    end
 
     it 'should deny for user without push access' do
       post api("/projects/#{project.id}/repository/tags", user2),