Commit 2474a592 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'master' into milestone-ref

parents 0b661516 95b1adb3
...@@ -26,6 +26,7 @@ config/initializers/smtp_settings.rb ...@@ -26,6 +26,7 @@ config/initializers/smtp_settings.rb
config/resque.yml config/resque.yml
config/unicorn.rb config/unicorn.rb
config/secrets.yml config/secrets.yml
config/sidekiq.yml
coverage/* coverage/*
db/*.sqlite3 db/*.sqlite3
db/*.sqlite3-journal db/*.sqlite3-journal
......
...@@ -20,12 +20,17 @@ v 8.4.0 (unreleased) ...@@ -20,12 +20,17 @@ v 8.4.0 (unreleased)
- Fix version check image in Safari - Fix version check image in Safari
- Show 'All' tab by default in the builds page - Show 'All' tab by default in the builds page
- Fix API project lookups when querying with a namespace with dots (Stan Hu) - Fix API project lookups when querying with a namespace with dots (Stan Hu)
- Update version check images to use SVG
- Validate README format before displaying
v 8.3.3 (unreleased) v 8.3.3 (unreleased)
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
- Enable "Add key" button when user fills in a proper key (Stan Hu) - Enable "Add key" button when user fills in a proper key (Stan Hu)
v 8.3.2 v 8.3.2
- Change single user API endpoint to return more detailed data (Michael Potthoff)
v 8.3.2 (unreleased)
- Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (Stan Hu) - Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll (Stan Hu)
- Add support for Google reCAPTCHA in user registration - Add support for Google reCAPTCHA in user registration
...@@ -158,6 +163,8 @@ v 8.2.0 ...@@ -158,6 +163,8 @@ v 8.2.0
- Allow to define cache in `.gitlab-ci.yml` - Allow to define cache in `.gitlab-ci.yml`
- Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu) - Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu)
- Remove deprecated CI events from project settings page - Remove deprecated CI events from project settings page
- Use issue editor as cross reference comment author when issue is edited with a new mention.
- Add graphs of commits ahead and behind default branch (Jeff Stubler)
- Improve personal snippet access workflow (Douglas Alexandre) - Improve personal snippet access workflow (Douglas Alexandre)
- [API] Add ability to fetch the commit ID of the last commit that actually touched a file - [API] Add ability to fetch the commit ID of the last commit that actually touched a file
- Fix omniauth documentation setting for omnibus configuration (Jon Cairns) - Fix omniauth documentation setting for omnibus configuration (Jon Cairns)
......
...@@ -122,3 +122,59 @@ li.commit { ...@@ -122,3 +122,59 @@ li.commit {
color: $gl-gray; color: $gl-gray;
} }
} }
.divergence-graph {
padding: 12px 12px 0 0;
float: right;
.graph-side {
position: relative;
width: 80px;
height: 22px;
padding: 5px 0 13px;
float: left;
.bar {
position: absolute;
height: 4px;
background-color: #ccc;
}
.bar-behind {
right: 0;
border-radius: 3px 0 0 3px;
}
.bar-ahead {
left: 0;
border-radius: 0 3px 3px 0;
}
.count {
padding-top: 6px;
padding-bottom: 0px;
font-size: 12px;
color: #333;
display: block;
}
.count-behind {
padding-right: 4px;
text-align: right;
}
.count-ahead {
padding-left: 4px;
text-align: left;
}
}
.graph-separator {
position: relative;
width: 1px;
height: 18px;
margin: 5px 0 0;
float: left;
background-color: #ccc;
}
}
...@@ -9,6 +9,11 @@ class Projects::BranchesController < Projects::ApplicationController ...@@ -9,6 +9,11 @@ class Projects::BranchesController < Projects::ApplicationController
@sort = params[:sort] || 'name' @sort = params[:sort] || 'name'
@branches = @repository.branches_sorted_by(@sort) @branches = @repository.branches_sorted_by(@sort)
@branches = Kaminari.paginate_array(@branches).page(params[:page]).per(PER_PAGE) @branches = Kaminari.paginate_array(@branches).page(params[:page]).per(PER_PAGE)
@max_commits = @branches.reduce(0) do |memo, branch|
diverging_commit_counts = repository.diverging_commit_counts(branch)
[memo, diverging_commit_counts[:behind], diverging_commit_counts[:ahead]].max
end
end end
def recent def recent
......
...@@ -775,6 +775,8 @@ class Project < ActiveRecord::Base ...@@ -775,6 +775,8 @@ class Project < ActiveRecord::Base
end end
def change_head(branch) def change_head(branch)
# Cached divergent commit counts are based on repository head
repository.expire_branch_cache
gitlab_shell.update_repository_head(self.path_with_namespace, branch) gitlab_shell.update_repository_head(self.path_with_namespace, branch)
reload_default_branch reload_default_branch
end end
......
...@@ -40,8 +40,8 @@ get the commit comment added to it. ...@@ -40,8 +40,8 @@ get the commit comment added to it.
You can also close a task with a message containing: `fix #123456`. You can also close a task with a message containing: `fix #123456`.
You can find your Api Keys here: You can create a Personal Access Token here:
http://developer.asana.com/documentation/#api_keys' http://app.asana.com/-/account_api'
end end
def to_param def to_param
...@@ -53,14 +53,12 @@ http://developer.asana.com/documentation/#api_keys' ...@@ -53,14 +53,12 @@ http://developer.asana.com/documentation/#api_keys'
{ {
type: 'text', type: 'text',
name: 'api_key', name: 'api_key',
placeholder: 'User API token. User must have access to task, placeholder: 'User Personal Access Token. User must have access to task, all comments will be attributed to this user.'
all comments will be attributed to this user.'
}, },
{ {
type: 'text', type: 'text',
name: 'restrict_to_branch', name: 'restrict_to_branch',
placeholder: 'Comma-separated list of branches which will be placeholder: 'Comma-separated list of branches which will be automatically inspected. Leave blank to include all branches.'
automatically inspected. Leave blank to include all branches.'
} }
] ]
end end
...@@ -69,58 +67,58 @@ automatically inspected. Leave blank to include all branches.' ...@@ -69,58 +67,58 @@ automatically inspected. Leave blank to include all branches.'
%w(push) %w(push)
end end
def client
@_client ||= begin
Asana::Client.new do |c|
c.authentication :access_token, api_key
end
end
end
def execute(data) def execute(data)
return unless supported_events.include?(data[:object_kind]) return unless supported_events.include?(data[:object_kind])
Asana.configure do |client| # check the branch restriction is poplulated and branch is not included
client.api_key = api_key
end
user = data[:user_name]
branch = Gitlab::Git.ref_name(data[:ref]) branch = Gitlab::Git.ref_name(data[:ref])
branch_restriction = restrict_to_branch.to_s branch_restriction = restrict_to_branch.to_s
# check the branch restriction is poplulated and branch is not included
if branch_restriction.length > 0 && branch_restriction.index(branch).nil? if branch_restriction.length > 0 && branch_restriction.index(branch).nil?
return return
end end
user = data[:user_name]
project_name = project.name_with_namespace project_name = project.name_with_namespace
push_msg = user + ' pushed to branch ' + branch + ' of ' + project_name
data[:commits].each do |commit| data[:commits].each do |commit|
check_commit(' ( ' + commit[:url] + ' ): ' + commit[:message], push_msg) push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} ):"
check_commit(commit[:message], push_msg)
end end
end end
def check_commit(message, push_msg) def check_commit(message, push_msg)
task_list = [] # matches either:
close_list = [] # - #1234
# - https://app.asana.com/0/0/1234
message.split("\n").each do |line| # optionally preceded with:
# look for a task ID or a full Asana url # - fix/ed/es/ing
task_list.concat(line.scan(/#(\d+)/)) # - close/s/d
task_list.concat(line.scan(/https:\/\/app\.asana\.com\/\d+\/\d+\/(\d+)/)) # - closing
# look for a word starting with 'fix' followed by a task ID issue_finder = /(fix\w*|clos[ei]\w*+)?\W*(?:https:\/\/app\.asana\.com\/\d+\/\d+\/(\d+)|#(\d+))/i
close_list.concat(line.scan(/(fix\w*)\W*#(\d+)/i))
end message.scan(issue_finder).each do |tuple|
# tuple will be
# post commit to every taskid found # [ 'fix', 'id_from_url', 'id_from_pound' ]
task_list.each do |taskid| taskid = tuple[2] || tuple[1]
task = Asana::Task.find(taskid[0])
begin
if task task = Asana::Task.find_by_id(client, taskid)
task.create_story(text: push_msg + ' ' + message) task.add_comment(text: "#{push_msg} #{message}")
end
end if tuple[0]
task.update(completed: true)
# close all tasks that had 'fix(ed/es/ing) #:id' in them end
close_list.each do |taskid| rescue => e
task = Asana::Task.find(taskid.last) Rails.logger.error(e.message)
next
if task
task.modify(completed: true)
end end
end end
end end
......
...@@ -175,11 +175,29 @@ class Repository ...@@ -175,11 +175,29 @@ class Repository
def size def size
cache.fetch(:size) { raw_repository.size } cache.fetch(:size) { raw_repository.size }
end end
def diverging_commit_counts(branch)
root_ref_hash = raw_repository.rev_parse_target(root_ref).oid
cache.fetch(:"diverging_commit_counts_#{branch.name}") do
# Rugged seems to throw a `ReferenceError` when given branch_names rather
# than SHA-1 hashes
number_commits_behind = commits_between(branch.target, root_ref_hash).size
number_commits_ahead = commits_between(root_ref_hash, branch.target).size
{ behind: number_commits_behind, ahead: number_commits_ahead }
end
end
def cache_keys def cache_keys
%i(size branch_names tag_names commit_count %i(size branch_names tag_names commit_count
readme version contribution_guide changelog license) readme version contribution_guide changelog license)
end end
def branch_cache_keys
branches.map do |branch|
:"diverging_commit_counts_#{branch.name}"
end
end
def build_cache def build_cache
cache_keys.each do |key| cache_keys.each do |key|
...@@ -187,6 +205,12 @@ class Repository ...@@ -187,6 +205,12 @@ class Repository
send(key) send(key)
end end
end end
branches.each do |branch|
unless cache.exist?(:"diverging_commit_counts_#{branch.name}")
send(:diverging_commit_counts, branch)
end
end
end end
def expire_tags_cache def expire_tags_cache
...@@ -203,6 +227,14 @@ class Repository ...@@ -203,6 +227,14 @@ class Repository
cache_keys.each do |key| cache_keys.each do |key|
cache.expire(key) cache.expire(key)
end end
expire_branch_cache
end
def expire_branch_cache
branches.each do |branch|
cache.expire(:"diverging_commit_counts_#{branch.name}")
end
end end
def rebuild_cache def rebuild_cache
...@@ -210,6 +242,11 @@ class Repository ...@@ -210,6 +242,11 @@ class Repository
cache.expire(key) cache.expire(key)
send(key) send(key)
end end
branches.each do |branch|
cache.expire(:"diverging_commit_counts_#{branch.name}")
diverging_commit_counts(branch)
end
end end
def lookup_cache def lookup_cache
......
...@@ -17,18 +17,16 @@ class Tree ...@@ -17,18 +17,16 @@ class Tree
def readme def readme
return @readme if defined?(@readme) return @readme if defined?(@readme)
available_readmes = blobs.select(&:readme?) # Take the first previewable readme, or return nil if none is available or
# we can't preview any of them
readme_tree = blobs.find do |blob|
blob.readme? && (previewable?(blob.name) || plain?(blob.name))
end
if available_readmes.count == 0 if readme_tree.nil?
return @readme = nil return @readme = nil
end end
# Take the first previewable readme, or the first available readme, if we
# can't preview any of them
readme_tree = available_readmes.find do |readme|
previewable?(readme.name)
end || available_readmes.first
readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name) readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name)
git_repo = repository.raw_repository git_repo = repository.raw_repository
......
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
= @abuse_report.message = @abuse_report.message
%p %p
= link_to "View details", abuse_reports_url = link_to "View details", admin_abuse_reports_url
- commit = @repository.commit(branch.target) - commit = @repository.commit(branch.target)
- bar_graph_width_factor = @max_commits > 0 ? 100.0/@max_commits : 0
- diverging_commit_counts = @repository.diverging_commit_counts(branch)
- number_commits_behind = diverging_commit_counts[:behind]
- number_commits_ahead = diverging_commit_counts[:ahead]
%li(class="js-branch-#{branch.name}") %li(class="js-branch-#{branch.name}")
%div %div
= link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do = link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do
...@@ -29,6 +33,17 @@ ...@@ -29,6 +33,17 @@
= link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row has_tooltip', title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row has_tooltip', title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do
= icon("trash-o") = icon("trash-o")
- if branch.name != @repository.root_ref
.divergence-graph{ title: "#{number_commits_ahead} commits ahead, #{number_commits_behind} commits behind #{@repository.root_ref}" }
.graph-side
.bar.bar-behind{ style: "width: #{number_commits_behind * bar_graph_width_factor}%" }
%span.count.count-behind= number_commits_behind
.graph-separator
.graph-side
.bar.bar-ahead{ style: "width: #{number_commits_ahead * bar_graph_width_factor}%" }
%span.count.count-ahead= number_commits_ahead
- if commit - if commit
= render 'projects/branches/commit', commit: commit, project: @project = render 'projects/branches/commit', commit: commit, project: @project
- else - else
......
...@@ -123,6 +123,13 @@ Parameters: ...@@ -123,6 +123,13 @@ Parameters:
"name": "John Smith", "name": "John Smith",
"state": "active", "state": "active",
"avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
"created_at": "2012-05-23T08:00:58Z",
"is_admin": false,
"bio": null,
"skype": "",
"linkedin": "",
"twitter": "",
"website_url": ""
} }
``` ```
......
...@@ -39,7 +39,7 @@ module API ...@@ -39,7 +39,7 @@ module API
if current_user.is_admin? if current_user.is_admin?
present @user, with: Entities::UserFull present @user, with: Entities::UserFull
else else
present @user, with: Entities::UserBasic present @user, with: Entities::User
end end
end end
......
...@@ -13,6 +13,6 @@ class VersionCheck ...@@ -13,6 +13,6 @@ class VersionCheck
end end
def host def host
'https://version.gitlab.com/check.png' 'https://version.gitlab.com/check.svg'
end end
end end
...@@ -40,6 +40,20 @@ describe AsanaService, models: true do ...@@ -40,6 +40,20 @@ describe AsanaService, models: true do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project) } let(:project) { create(:project) }
def create_data_for_commits(*messages)
{
object_kind: 'push',
ref: 'master',
user_name: user.name,
commits: messages.map do |m|
{
message: m,
url: 'https://gitlab.com/',
}
end
}
end
before do before do
@asana = AsanaService.new @asana = AsanaService.new
allow(@asana).to receive_messages( allow(@asana).to receive_messages(
...@@ -51,16 +65,67 @@ describe AsanaService, models: true do ...@@ -51,16 +65,67 @@ describe AsanaService, models: true do
) )
end end
it 'should call Asana service to created a story' do it 'should call Asana service to create a story' do
expect(Asana::Task).to receive(:find).with('123456').once data = create_data_for_commits('Message from commit. related to #123456')
expected_message = "#{data[:user_name]} pushed to branch #{data[:ref]} of #{project.name_with_namespace} ( #{data[:commits][0][:url]} ): #{data[:commits][0][:message]}"
@asana.check_commit('related to #123456', 'pushed') d1 = double('Asana::Task')
expect(d1).to receive(:add_comment).with(text: expected_message)
expect(Asana::Task).to receive(:find_by_id).with(anything, '123456').once.and_return(d1)
@asana.execute(data)
end end
it 'should call Asana service to created a story and close a task' do it 'should call Asana service to create a story and close a task' do
expect(Asana::Task).to receive(:find).with('456789').twice data = create_data_for_commits('fix #456789')
d1 = double('Asana::Task')
expect(d1).to receive(:add_comment)
expect(d1).to receive(:update).with(completed: true)
expect(Asana::Task).to receive(:find_by_id).with(anything, '456789').once.and_return(d1)
@asana.execute(data)
end
it 'should be able to close via url' do
data = create_data_for_commits('closes https://app.asana.com/19292/956299/42')
d1 = double('Asana::Task')
expect(d1).to receive(:add_comment)
expect(d1).to receive(:update).with(completed: true)
expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d1)
@asana.execute(data)
end
it 'should allow multiple matches per line' do
message = <<-EOF
minor bigfix, refactoring, fixed #123 and Closes #456 work on #789
ref https://app.asana.com/19292/956299/42 and closing https://app.asana.com/19292/956299/12
EOF
data = create_data_for_commits(message)
d1 = double('Asana::Task')
expect(d1).to receive(:add_comment)
expect(d1).to receive(:update).with(completed: true)
expect(Asana::Task).to receive(:find_by_id).with(anything, '123').once.and_return(d1)
d2 = double('Asana::Task')
expect(d2).to receive(:add_comment)
expect(d2).to receive(:update).with(completed: true)
expect(Asana::Task).to receive(:find_by_id).with(anything, '456').once.and_return(d2)
d3 = double('Asana::Task')
expect(d3).to receive(:add_comment)
expect(Asana::Task).to receive(:find_by_id).with(anything, '789').once.and_return(d3)
d4 = double('Asana::Task')
expect(d4).to receive(:add_comment)
expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d4)
d5 = double('Asana::Task')
expect(d5).to receive(:add_comment)
expect(d5).to receive(:update).with(completed: true)
expect(Asana::Task).to receive(:find_by_id).with(anything, '12').once.and_return(d5)
@asana.check_commit('fix #456789', 'pushed') @asana.execute(data)
end end
end end
end end
...@@ -53,7 +53,7 @@ describe NotificationService, services: true do ...@@ -53,7 +53,7 @@ describe NotificationService, services: true do
add_users_with_subscription(note.project, issue) add_users_with_subscription(note.project, issue)
# Ensure create SentNotification by noteable = issue 6 times, not noteable = note # Ensure create SentNotification by noteable = issue 6 times, not noteable = note
expect(SentNotification).to receive(:record).with(issue, any_args).exactly(6).times expect(SentNotification).to receive(:record).with(issue, any_args).exactly(7).times
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment