Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts: # Gemfile.lock
This commit is contained in:
Kamil Trzcinski
commit
e21deaee8e
|
|
@ -3,10 +3,12 @@ Please view this file on the master branch, on stable branches it's out of date.
|
|||
v 8.0.0 (unreleased)
|
||||
- Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
|
||||
- Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)
|
||||
- Add "replace" and "upload" functionalities to allow user replace existing file and upload new file into current repository
|
||||
- Fix URL construction for merge requests, issues, notes, and commits for relative URL config (Stan Hu)
|
||||
- Fix emoji URLs in Markdown when relative_url_root is used (Stan Hu)
|
||||
- Omit filename in Content-Disposition header in raw file download to avoid RFC 6266 encoding issues (Stan HU)
|
||||
- Fix broken Wiki Page History (Stan Hu)
|
||||
- Import forked repositories asynchronously to prevent large repositories from timing out (Stan Hu)
|
||||
- Prevent anchors from being hidden by header (Stan Hu)
|
||||
- Fix bug where only the first 15 Bitbucket issues would be imported (Stan Hu)
|
||||
- Sort issues by creation date in Bitbucket importer (Stan Hu)
|
||||
|
|
@ -31,7 +33,7 @@ v 8.0.0 (unreleased)
|
|||
- Fix 500 error when submit project snippet without body
|
||||
- Improve search page usability
|
||||
- Bring more UI consistency in way how projects, snippets and groups lists are rendered
|
||||
- Make all profiles public
|
||||
- Make all profiles and group public
|
||||
- Fixed login failure when extern_uid changes (Joel Koglin)
|
||||
- Don't notify users without access to the project when they are (accidentally) mentioned in a note.
|
||||
- Retrieving oauth token with LDAP credentials
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -167,7 +167,7 @@ gem "slack-notifier", "~> 1.0.0"
|
|||
gem 'asana', '~> 0.0.6'
|
||||
|
||||
# FogBugz integration
|
||||
gem 'ruby-fogbugz'
|
||||
gem 'ruby-fogbugz', '~> 0.2.0'
|
||||
|
||||
# d3
|
||||
gem 'd3_rails', '~> 3.5.5'
|
||||
|
|
|
|||
14
Gemfile.lock
14
Gemfile.lock
|
|
@ -274,8 +274,7 @@ GEM
|
|||
charlock_holmes (~> 0.6.6)
|
||||
escape_utils (~> 0.2.4)
|
||||
mime-types (~> 1.19)
|
||||
gitlab_ci_meta (4.0)
|
||||
gitlab_emoji (0.1.0)
|
||||
gitlab_emoji (0.1.1)
|
||||
gemojione (~> 2.0)
|
||||
gitlab_git (7.2.15)
|
||||
activesupport (~> 4.0)
|
||||
|
|
@ -597,8 +596,8 @@ GEM
|
|||
powerpack (~> 0.0.6)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
ruby-fogbugz (0.1.1)
|
||||
crack
|
||||
ruby-fogbugz (0.2.0)
|
||||
crack (~> 0.4)
|
||||
ruby-progressbar (1.7.5)
|
||||
ruby-saml (1.0.0)
|
||||
nokogiri (>= 1.5.10)
|
||||
|
|
@ -888,8 +887,8 @@ DEPENDENCIES
|
|||
rerun (~> 0.10.0)
|
||||
rqrcode-rails3 (~> 0.1.7)
|
||||
rspec-rails (~> 3.3.0)
|
||||
rubocop (~> 0.28.0)
|
||||
ruby-fogbugz
|
||||
rubocop (= 0.28.0)
|
||||
ruby-fogbugz (~> 0.2.0)
|
||||
sanitize (~> 2.0)
|
||||
sass-rails (~> 4.0.5)
|
||||
sdoc (~> 0.3.20)
|
||||
|
|
@ -930,6 +929,3 @@ DEPENDENCIES
|
|||
webmock (~> 1.21.0)
|
||||
whenever (~> 0.8.4)
|
||||
wikicloth (= 0.8.1)
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.6
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
[](https://ci.gitlab.com/projects/1?ref=master)
|
||||
[](https://semaphoreci.com/gitlabhq/gitlabhq)
|
||||
[](https://codeclimate.com/github/gitlabhq/gitlabhq)
|
||||
[](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
|
||||
[](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
|
||||
|
||||
## Canonical source
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
class @BlobFileDropzone
|
||||
constructor: (form, method) ->
|
||||
form_dropzone = form.find('.dropzone')
|
||||
Dropzone.autoDiscover = false
|
||||
dropzone = form_dropzone.dropzone(
|
||||
autoDiscover: false
|
||||
autoProcessQueue: false
|
||||
url: form.attr('action')
|
||||
# Rails uses a hidden input field for PUT
|
||||
# http://stackoverflow.com/questions/21056482/how-to-set-method-put-in-form-tag-in-rails
|
||||
method: method
|
||||
clickable: true
|
||||
uploadMultiple: false
|
||||
paramName: "file"
|
||||
maxFilesize: gon.max_file_size or 10
|
||||
parallelUploads: 1
|
||||
maxFiles: 1
|
||||
addRemoveLinks: true
|
||||
previewsContainer: '.dropzone-previews'
|
||||
headers:
|
||||
"X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
|
||||
|
||||
success: (header, response) ->
|
||||
window.location.href = response.filePath
|
||||
return
|
||||
|
||||
error: (temp, errorMessage) ->
|
||||
stripped = $("<div/>").html(errorMessage).text();
|
||||
$('.dropzone-alerts').html('Error uploading file: \"' + stripped + '\"').show()
|
||||
return
|
||||
|
||||
maxfilesexceeded: (file) ->
|
||||
@removeFile file
|
||||
return
|
||||
|
||||
removedfile: (file) ->
|
||||
$('.dropzone-previews')[0].removeChild(file.previewTemplate)
|
||||
$('.dropzone-alerts').html('').hide()
|
||||
return true
|
||||
|
||||
sending: (file, xhr, formData) ->
|
||||
formData.append('commit_message', form.find('#commit_message').val())
|
||||
return
|
||||
)
|
||||
|
||||
submitButton = form.find('#submit-all')[0]
|
||||
submitButton.addEventListener 'click', (e) ->
|
||||
e.preventDefault()
|
||||
e.stopPropagation()
|
||||
alert "Please select a file" if dropzone[0].dropzone.getQueuedFiles().length == 0
|
||||
dropzone[0].dropzone.processQueue()
|
||||
return false
|
||||
|
|
@ -36,6 +36,11 @@
|
|||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
&.clear-block {
|
||||
margin-bottom: $gl-padding - 1px;
|
||||
padding-bottom: $gl-padding;
|
||||
}
|
||||
|
||||
&.second-block {
|
||||
margin-top: -1px;
|
||||
margin-bottom: 0;
|
||||
|
|
@ -51,6 +56,6 @@
|
|||
}
|
||||
|
||||
.oneline {
|
||||
line-height: 44px;
|
||||
line-height: 42px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -377,4 +377,8 @@ table {
|
|||
height: 56px;
|
||||
margin-top: -$gl-padding;
|
||||
padding-top: $gl-padding;
|
||||
|
||||
&.no-bottom {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,7 +152,6 @@
|
|||
}
|
||||
|
||||
.collapse-nav a {
|
||||
left: 0px;
|
||||
width: $sidebar_collapsed_width;
|
||||
}
|
||||
|
||||
|
|
@ -171,6 +170,7 @@
|
|||
width: $sidebar_width;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
font-size: 13px;
|
||||
background: transparent;
|
||||
height: 40px;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
.ace_gutter-cell {
|
||||
background-color: $background-color;
|
||||
}
|
||||
|
||||
.cancel-btn {
|
||||
color: #B94A48;
|
||||
&:hover {
|
||||
|
|
@ -32,14 +36,12 @@
|
|||
|
||||
.file-title {
|
||||
@extend .monospace;
|
||||
font-size: 14px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.editor-ref {
|
||||
background: $background-color;
|
||||
padding: 11px 15px;
|
||||
border-right: 1px solid #CCC;
|
||||
border-right: 1px solid $border-color;
|
||||
display: inline-block;
|
||||
margin: -5px -5px;
|
||||
margin-right: 10px;
|
||||
|
|
@ -50,5 +52,15 @@
|
|||
display: inline-block;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
.form-control {
|
||||
margin-top: -3px;
|
||||
}
|
||||
}
|
||||
|
||||
.form-actions {
|
||||
margin: -$gl-padding;
|
||||
margin-top: 0;
|
||||
padding: $gl-padding
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -235,8 +235,6 @@ ul.notes {
|
|||
filter: alpha(opacity=0);
|
||||
|
||||
&:hover {
|
||||
width: 38px;
|
||||
font-size: 20px;
|
||||
background: $gl-info;
|
||||
color: #FFF;
|
||||
@include show-add-diff-note;
|
||||
|
|
|
|||
|
|
@ -116,3 +116,15 @@
|
|||
}
|
||||
|
||||
#modal-remove-blob > .modal-dialog { width: 850px; }
|
||||
|
||||
.blob-upload-dropzone-previews {
|
||||
text-align: center;
|
||||
border: 2px;
|
||||
border-style: dashed;
|
||||
min-height: 200px;
|
||||
}
|
||||
|
||||
.upload-link {
|
||||
font-weight: normal;
|
||||
color: #0000EE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,21 @@
|
|||
class Dashboard::ProjectsController < Dashboard::ApplicationController
|
||||
before_action :event_filter
|
||||
|
||||
def index
|
||||
@projects = current_user.authorized_projects.sorted_by_activity.non_archived
|
||||
@projects = @projects.includes(:namespace)
|
||||
@last_push = current_user.recent_push
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.atom do
|
||||
event_filter
|
||||
load_events
|
||||
render layout: false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def starred
|
||||
@projects = current_user.starred_projects
|
||||
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
class Dashboard::SnippetsController < Dashboard::ApplicationController
|
||||
def index
|
||||
@snippets = SnippetsFinder.new.execute(current_user,
|
||||
filter: :by_user,
|
||||
user: current_user,
|
||||
scope: params[:scope]
|
||||
)
|
||||
@snippets = @snippets.page(params[:page]).per(PER_PAGE)
|
||||
end
|
||||
end
|
||||
|
|
@ -1,23 +1,8 @@
|
|||
class DashboardController < Dashboard::ApplicationController
|
||||
before_action :load_projects, except: :activity
|
||||
before_action :event_filter, only: :activity
|
||||
|
||||
respond_to :html
|
||||
|
||||
def show
|
||||
@projects = @projects.includes(:namespace)
|
||||
@last_push = current_user.recent_push
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.atom do
|
||||
event_filter
|
||||
load_events
|
||||
render layout: false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def merge_requests
|
||||
@merge_requests = get_merge_requests_collection
|
||||
@merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
|
||||
|
|
@ -50,10 +35,6 @@ class DashboardController < Dashboard::ApplicationController
|
|||
|
||||
protected
|
||||
|
||||
def load_projects
|
||||
@projects = current_user.authorized_projects.sorted_by_activity.non_archived
|
||||
end
|
||||
|
||||
def load_events
|
||||
project_ids =
|
||||
if params[:filter] == "starred"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
class Explore::ApplicationController < ApplicationController
|
||||
skip_before_action :authenticate_user!, :reject_blocked
|
||||
|
||||
layout 'explore'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
class Explore::GroupsController < Explore::ApplicationController
|
||||
skip_before_action :authenticate_user!,
|
||||
:reject_blocked, :set_current_user_for_observers
|
||||
|
||||
def index
|
||||
@groups = GroupsFinder.new.execute(current_user)
|
||||
@groups = @groups.search(params[:search]) if params[:search].present?
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
class Explore::ProjectsController < Explore::ApplicationController
|
||||
skip_before_action :authenticate_user!,
|
||||
:reject_blocked
|
||||
|
||||
def index
|
||||
@projects = ProjectsFinder.new.execute(current_user)
|
||||
@tags = @projects.tags_on(:tags)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
class Explore::SnippetsController < Explore::ApplicationController
|
||||
def index
|
||||
@snippets = SnippetsFinder.new.execute(current_user, filter: :all)
|
||||
@snippets = @snippets.page(params[:page]).per(PER_PAGE)
|
||||
end
|
||||
end
|
||||
|
|
@ -4,7 +4,7 @@ class GroupsController < Groups::ApplicationController
|
|||
before_action :group, except: [:new, :create]
|
||||
|
||||
# Authorize
|
||||
before_action :authorize_read_group!, except: [:new, :create]
|
||||
before_action :authorize_read_group!, except: [:show, :new, :create]
|
||||
before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
|
||||
before_action :authorize_create_group!, only: [:new, :create]
|
||||
|
||||
|
|
@ -14,6 +14,10 @@ class GroupsController < Groups::ApplicationController
|
|||
|
||||
layout :determine_layout
|
||||
|
||||
def index
|
||||
redirect_to(current_user ? dashboard_groups_path : explore_groups_path)
|
||||
end
|
||||
|
||||
def new
|
||||
@group = Group.new
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
class HelpController < ApplicationController
|
||||
skip_before_action :authenticate_user!, :reject_blocked
|
||||
|
||||
layout 'help'
|
||||
|
||||
def index
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ class Import::FogbugzController < Import::BaseController
|
|||
before_action :verify_fogbugz_import_enabled
|
||||
before_action :user_map, only: [:new_user_map, :create_user_map]
|
||||
|
||||
# Doesn't work yet due to bug in ruby-fogbugz, see below
|
||||
rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized
|
||||
|
||||
def new
|
||||
|
|
@ -13,8 +12,8 @@ class Import::FogbugzController < Import::BaseController
|
|||
begin
|
||||
res = Gitlab::FogbugzImport::Client.new(import_params.symbolize_keys)
|
||||
rescue
|
||||
# Needed until https://github.com/firmafon/ruby-fogbugz/pull/9 is merged
|
||||
return redirect_to :back, alert: 'Could not authenticate with FogBugz, check your URL, email, and password'
|
||||
# If the URI is invalid various errors can occur
|
||||
return redirect_to new_import_fogbugz_path, alert: 'Could not connect to FogBugz, check your URL'
|
||||
end
|
||||
session[:fogbugz_token] = res.get_token
|
||||
session[:fogbugz_uri] = params[:uri]
|
||||
|
|
@ -92,8 +91,7 @@ class Import::FogbugzController < Import::BaseController
|
|||
end
|
||||
|
||||
def fogbugz_unauthorized(exception)
|
||||
flash[:alert] = exception.message
|
||||
redirect_to new_import_fogbugz_path
|
||||
redirect_to new_import_fogbugz_path, alert: exception.message
|
||||
end
|
||||
|
||||
def import_params
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class InvitesController < ApplicationController
|
|||
|
||||
path =
|
||||
if current_user
|
||||
dashboard_path
|
||||
dashboard_projects_path
|
||||
else
|
||||
new_user_session_path
|
||||
end
|
||||
|
|
@ -73,7 +73,7 @@ class InvitesController < ApplicationController
|
|||
path = group_path(group)
|
||||
else
|
||||
label = "who knows what"
|
||||
path = dashboard_path
|
||||
path = dashboard_projects_path
|
||||
end
|
||||
|
||||
[label, path]
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class NamespacesController < ApplicationController
|
|||
|
||||
if user
|
||||
redirect_to user_path(user)
|
||||
elsif group && can?(current_user, :read_group, group)
|
||||
elsif group
|
||||
redirect_to group_path(group)
|
||||
elsif current_user.nil?
|
||||
authenticate_user!
|
||||
|
|
|
|||
|
|
@ -26,10 +26,16 @@ class Projects::BlobController < Projects::ApplicationController
|
|||
|
||||
if result[:status] == :success
|
||||
flash[:notice] = "Your changes have been successfully committed"
|
||||
redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path))
|
||||
respond_to do |format|
|
||||
format.html { redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) }
|
||||
format.json { render json: { message: "success", filePath: namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) } }
|
||||
end
|
||||
else
|
||||
flash[:alert] = result[:message]
|
||||
render :new
|
||||
respond_to do |format|
|
||||
format.html { render :new }
|
||||
format.json { render json: { message: "failed", filePath: namespace_project_new_blob_path(@project.namespace, @project, @id) } }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -45,10 +51,16 @@ class Projects::BlobController < Projects::ApplicationController
|
|||
|
||||
if result[:status] == :success
|
||||
flash[:notice] = "Your changes have been successfully committed"
|
||||
redirect_to after_edit_path
|
||||
respond_to do |format|
|
||||
format.html { redirect_to after_edit_path }
|
||||
format.json { render json: { message: "success", filePath: after_edit_path } }
|
||||
end
|
||||
else
|
||||
flash[:alert] = result[:message]
|
||||
render :edit
|
||||
respond_to do |format|
|
||||
format.html { render :edit }
|
||||
format.json { render json: { message: "failed", filePath: namespace_project_new_blob_path(@project.namespace, @project, @id) } }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -146,11 +158,19 @@ class Projects::BlobController < Projects::ApplicationController
|
|||
|
||||
@file_path =
|
||||
if action_name.to_s == 'create'
|
||||
if params[:file].present?
|
||||
params[:file_name] = params[:file].original_filename
|
||||
end
|
||||
File.join(@path, File.basename(params[:file_name]))
|
||||
else
|
||||
@path
|
||||
end
|
||||
|
||||
if params[:file].present?
|
||||
params[:content] = Base64.encode64(params[:file].read)
|
||||
params[:encoding] = 'base64'
|
||||
end
|
||||
|
||||
@commit_params = {
|
||||
file_path: @file_path,
|
||||
current_branch: @current_branch,
|
||||
|
|
|
|||
|
|
@ -13,10 +13,14 @@ class Projects::ForksController < Projects::ApplicationController
|
|||
@forked_project = ::Projects::ForkService.new(project, current_user, namespace: namespace).execute
|
||||
|
||||
if @forked_project.saved? && @forked_project.forked?
|
||||
redirect_to(
|
||||
namespace_project_path(@forked_project.namespace, @forked_project),
|
||||
notice: 'Project was successfully forked.'
|
||||
)
|
||||
if @forked_project.import_in_progress?
|
||||
redirect_to namespace_project_import_path(@forked_project.namespace, @forked_project)
|
||||
else
|
||||
redirect_to(
|
||||
namespace_project_path(@forked_project.namespace, @forked_project),
|
||||
notice: 'Project was successfully forked.'
|
||||
)
|
||||
end
|
||||
else
|
||||
render :error
|
||||
end
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
|
|||
@project.project_members.find_by(user_id: current_user).destroy
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_to dashboard_path }
|
||||
format.html { redirect_to dashboard_projects_path }
|
||||
format.js { render nothing: true }
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ class ProjectsController < ApplicationController
|
|||
|
||||
layout :determine_layout
|
||||
|
||||
def index
|
||||
redirect_to(current_user ? root_path : explore_root_path)
|
||||
end
|
||||
|
||||
def new
|
||||
@project = Project.new
|
||||
end
|
||||
|
|
@ -105,7 +109,7 @@ class ProjectsController < ApplicationController
|
|||
if request.referer.include?('/admin')
|
||||
redirect_to admin_namespaces_projects_path
|
||||
else
|
||||
redirect_to dashboard_path
|
||||
redirect_to dashboard_projects_path
|
||||
end
|
||||
rescue Projects::DestroyService::DestroyError => ex
|
||||
redirect_to edit_project_path(@project), alert: ex.message
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
#
|
||||
# For users who haven't customized the setting, we simply delegate to
|
||||
# `DashboardController#show`, which is the default.
|
||||
class RootController < DashboardController
|
||||
before_action :redirect_to_custom_dashboard, only: [:show]
|
||||
class RootController < Dashboard::ProjectsController
|
||||
before_action :redirect_to_custom_dashboard, only: [:index]
|
||||
|
||||
def show
|
||||
def index
|
||||
super
|
||||
end
|
||||
|
||||
|
|
@ -20,6 +20,7 @@ class RootController < DashboardController
|
|||
|
||||
case current_user.dashboard
|
||||
when 'stars'
|
||||
flash.keep
|
||||
redirect_to starred_dashboard_projects_path
|
||||
else
|
||||
return
|
||||
|
|
|
|||
|
|
@ -24,13 +24,9 @@ class SnippetsController < ApplicationController
|
|||
scope: params[:scope] }).
|
||||
page(params[:page]).per(PER_PAGE)
|
||||
|
||||
if @user == current_user
|
||||
render 'current_user_index'
|
||||
else
|
||||
render 'user_index'
|
||||
end
|
||||
render 'index'
|
||||
else
|
||||
@snippets = SnippetsFinder.new.execute(current_user, filter: :all).page(params[:page]).per(PER_PAGE)
|
||||
redirect_to(current_user ? dashboard_snippets_path : explore_snippets_path)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ module ApplicationHelper
|
|||
class: "#{html_class} js-timeago",
|
||||
datetime: time.getutc.iso8601,
|
||||
title: time.in_time_zone.stamp('Aug 21, 2011 9:23pm'),
|
||||
data: { toggle: 'tooltip', placement: placement }
|
||||
data: { toggle: 'tooltip', placement: placement, container: 'body' }
|
||||
|
||||
element += javascript_tag "$('.js-timeago').timeago()" unless skip_js
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,14 @@ module GitlabRoutingHelper
|
|||
namespace_project_path(project.namespace, project, *args)
|
||||
end
|
||||
|
||||
def project_files_path(project, *args)
|
||||
namespace_project_tree_path(project.namespace, project, @ref || project.repository.root_ref)
|
||||
end
|
||||
|
||||
def project_commits_path(project, *args)
|
||||
namespace_project_commits_path(project.namespace, project, @ref || project.repository.root_ref)
|
||||
end
|
||||
|
||||
def activity_project_path(project, *args)
|
||||
activity_namespace_project_path(project.namespace, project, *args)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -43,24 +43,22 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def project_title(project)
|
||||
if project.group
|
||||
content_tag :span do
|
||||
link_to(
|
||||
simple_sanitize(project.group.name), group_path(project.group)
|
||||
) + ' / ' +
|
||||
link_to(simple_sanitize(project.name),
|
||||
project_path(project))
|
||||
end
|
||||
else
|
||||
owner = project.namespace.owner
|
||||
content_tag :span do
|
||||
link_to(
|
||||
simple_sanitize(owner.name), user_path(owner)
|
||||
) + ' / ' +
|
||||
link_to(simple_sanitize(project.name),
|
||||
project_path(project))
|
||||
def project_title(project, name = nil, url = nil)
|
||||
namespace_link =
|
||||
if project.group
|
||||
link_to(simple_sanitize(project.group.name), group_path(project.group))
|
||||
else
|
||||
owner = project.namespace.owner
|
||||
link_to(simple_sanitize(owner.name), user_path(owner))
|
||||
end
|
||||
|
||||
project_link = link_to(simple_sanitize(project.name), project_path(project))
|
||||
|
||||
full_title = namespace_link + ' / ' + project_link
|
||||
full_title += ' · '.html_safe + link_to(simple_sanitize(name), url) if name
|
||||
|
||||
content_tag :span do
|
||||
full_title
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -315,6 +313,45 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def current_ref
|
||||
@ref || @repository.try(:root_ref)
|
||||
end
|
||||
|
||||
def detect_project_title(project)
|
||||
name, url =
|
||||
if current_controller? 'wikis'
|
||||
['Wiki', get_project_wiki_path(project)]
|
||||
elsif current_controller? 'project_members'
|
||||
['Members', namespace_project_project_members_path(project.namespace, project)]
|
||||
elsif current_controller? 'labels'
|
||||
['Labels', namespace_project_labels_path(project.namespace, project)]
|
||||
elsif current_controller? 'members'
|
||||
['Members', project_files_path(project)]
|
||||
elsif current_controller? 'commits'
|
||||
['Commits', project_commits_path(project)]
|
||||
elsif current_controller? 'graphs'
|
||||
['Graphs', namespace_project_graph_path(project.namespace, project, current_ref)]
|
||||
elsif current_controller? 'network'
|
||||
['Network', namespace_project_network_path(project.namespace, project, current_ref)]
|
||||
elsif current_controller? 'milestones'
|
||||
['Milestones', namespace_project_milestones_path(project.namespace, project)]
|
||||
elsif current_controller? 'snippets'
|
||||
['Snippets', namespace_project_snippets_path(project.namespace, project)]
|
||||
elsif current_controller? 'issues'
|
||||
['Issues', namespace_project_issues_path(project.namespace, project)]
|
||||
elsif current_controller? 'merge_requests'
|
||||
['Merge Requests', namespace_project_merge_requests_path(project.namespace, project)]
|
||||
elsif current_controller? 'tree', 'blob'
|
||||
['Files', project_files_path(project)]
|
||||
elsif current_path? 'projects#activity'
|
||||
['Activity', activity_project_path(project)]
|
||||
else
|
||||
[nil, nil]
|
||||
end
|
||||
|
||||
project_title(project, name, url)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def filename_path(project, filename)
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ class Project < ActiveRecord::Base
|
|||
validates_uniqueness_of :path, scope: :namespace_id
|
||||
validates :import_url,
|
||||
format: { with: /\A#{URI.regexp(%w(ssh git http https))}\z/, message: 'should be a valid url' },
|
||||
if: :import?
|
||||
if: :external_import?
|
||||
validates :star_count, numericality: { greater_than_or_equal_to: 0 }
|
||||
validate :check_limit, on: :create
|
||||
validate :avatar_type,
|
||||
|
|
@ -275,7 +275,13 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def add_import_job
|
||||
RepositoryImportWorker.perform_in(2.seconds, id)
|
||||
if forked?
|
||||
unless RepositoryForkWorker.perform_async(id, forked_from_project.path_with_namespace, self.namespace.path)
|
||||
import_fail
|
||||
end
|
||||
else
|
||||
RepositoryImportWorker.perform_in(2.seconds, id)
|
||||
end
|
||||
end
|
||||
|
||||
def clear_import_data
|
||||
|
|
@ -283,6 +289,10 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def import?
|
||||
external_import? || forked?
|
||||
end
|
||||
|
||||
def external_import?
|
||||
import_url.present?
|
||||
end
|
||||
|
||||
|
|
@ -702,14 +712,8 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def create_repository
|
||||
if forked?
|
||||
if gitlab_shell.fork_repository(forked_from_project.path_with_namespace, self.namespace.path)
|
||||
true
|
||||
else
|
||||
errors.add(:base, 'Failed to fork repository via gitlab-shell')
|
||||
false
|
||||
end
|
||||
else
|
||||
# Forked import is handled asynchronously
|
||||
unless forked?
|
||||
if gitlab_shell.add_repository(path_with_namespace)
|
||||
true
|
||||
else
|
||||
|
|
|
|||
|
|
@ -34,6 +34,12 @@ class SlackService < Service
|
|||
'slack'
|
||||
end
|
||||
|
||||
def help
|
||||
'This service sends notifications to your Slack channel.<br/>
|
||||
To setup this Service you need to create a new <b>"Incoming webhook"</b> in your Slack integration panel,
|
||||
and enter the Webhook URL below.'
|
||||
end
|
||||
|
||||
def fields
|
||||
[
|
||||
{ type: 'text', name: 'webhook',
|
||||
|
|
|
|||
|
|
@ -19,10 +19,12 @@ module Files
|
|||
end
|
||||
|
||||
unless project.empty_repo?
|
||||
@file_path.slice!(0) if @file_path.start_with?('/')
|
||||
|
||||
blob = repository.blob_at_branch(@current_branch, @file_path)
|
||||
|
||||
if blob
|
||||
raise_error("Your changes could not be committed, because file with such name exists")
|
||||
raise_error("Your changes could not be committed because a file with the same name already exists")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -55,9 +55,7 @@ module Projects
|
|||
@project.save
|
||||
|
||||
if @project.persisted? && !@project.import?
|
||||
unless @project.create_repository
|
||||
raise 'Failed to create repository'
|
||||
end
|
||||
raise 'Failed to create repository' unless @project.create_repository
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
- if current_user
|
||||
%ul.nav.nav-pills.event_filter.pull-right
|
||||
%li.pull-right
|
||||
= link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
|
||||
= link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
|
||||
%i.fa.fa-rss
|
||||
= render 'shared/event_filter'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
%ul.center-top-menu
|
||||
= nav_link(page: [dashboard_groups_path]) do
|
||||
= nav_link(page: dashboard_groups_path) do
|
||||
= link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do
|
||||
Your Groups
|
||||
= nav_link(page: [explore_groups_path]) do
|
||||
= nav_link(page: explore_groups_path) do
|
||||
= link_to explore_groups_path, title: 'Explore groups', data: {placement: 'bottom'} do
|
||||
Explore Groups
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%ul.center-top-menu
|
||||
= nav_link(path: ['dashboard#show', 'root#show']) do
|
||||
= link_to dashboard_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
|
||||
= nav_link(path: ['projects#index', 'root#index']) do
|
||||
= link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
|
||||
Your Projects
|
||||
= nav_link(page: starred_dashboard_projects_path) do
|
||||
= link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
%ul.center-top-menu
|
||||
= nav_link(page: dashboard_snippets_path, html_options: {class: 'home'}) do
|
||||
= link_to dashboard_snippets_path, title: 'Your snippets', data: {placement: 'right'} do
|
||||
Your Snippets
|
||||
= nav_link(page: explore_snippets_path) do
|
||||
= link_to explore_snippets_path, title: 'Explore snippets', data: {placement: 'right'} do
|
||||
Explore Snippets
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
= content_for :meta_tags do
|
||||
- if current_user
|
||||
= auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
|
||||
= auto_discovery_link_tag(:atom, dashboard_projects_url(format: :atom, private_token: current_user.private_token), title: "All activity")
|
||||
|
||||
- page_title "Activity"
|
||||
- header_title "Activity", activity_dashboard_path
|
||||
|
||||
= render 'dashboard/activity_head'
|
||||
|
||||
%section.activities
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
xml.instruct!
|
||||
xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
|
||||
xml.title "Activity"
|
||||
xml.link href: dashboard_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
|
||||
xml.link href: dashboard_url, rel: "alternate", type: "text/html"
|
||||
xml.id dashboard_url
|
||||
xml.link href: dashboard_projects_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
|
||||
xml.link href: dashboard_projects_url, rel: "alternate", type: "text/html"
|
||||
xml.id dashboard_projects_url
|
||||
xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
|
||||
|
||||
@events.each do |event|
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
= content_for :meta_tags do
|
||||
- if current_user
|
||||
= auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
|
||||
= auto_discovery_link_tag(:atom, dashboard_projects_url(format: :atom, private_token: current_user.private_token), title: "All activity")
|
||||
|
||||
- page_title "Projects"
|
||||
- header_title "Projects", root_path
|
||||
|
||||
- header_title "Projects", (current_user ? root_path : explore_root_path)
|
||||
= render 'dashboard/projects_head'
|
||||
|
||||
- if @last_push
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
- page_title "Starred Projects"
|
||||
- header_title "Projects", (current_user ? root_path : explore_root_path)
|
||||
- header_title "Projects", projects_path
|
||||
|
||||
= render 'dashboard/projects_head'
|
||||
|
||||
- if @projects.any?
|
||||
= render 'dashboard/projects'
|
||||
= render 'projects'
|
||||
- else
|
||||
%h3 You don't have starred projects yet
|
||||
%p.slead Visit project page and press on star icon and it will appear on this page.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
- page_title "Snippets"
|
||||
- header_title "Snippets", dashboard_snippets_path
|
||||
|
||||
= render 'dashboard/snippets_head'
|
||||
|
||||
.gray-content-block
|
||||
.pull-right
|
||||
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
|
||||
Add new snippet
|
||||
|
||||
.oneline
|
||||
Share code pastes with others out of git repository
|
||||
|
||||
%ul.nav.nav-tabs.prepend-top-20
|
||||
= nav_tab :scope, nil do
|
||||
= link_to dashboard_snippets_path do
|
||||
All
|
||||
%span.badge
|
||||
= current_user.snippets.count
|
||||
= nav_tab :scope, 'are_private' do
|
||||
= link_to dashboard_snippets_path(scope: 'are_private') do
|
||||
Private
|
||||
%span.badge
|
||||
= current_user.snippets.are_private.count
|
||||
= nav_tab :scope, 'are_internal' do
|
||||
= link_to dashboard_snippets_path(scope: 'are_internal') do
|
||||
Internal
|
||||
%span.badge
|
||||
= current_user.snippets.are_internal.count
|
||||
= nav_tab :scope, 'are_public' do
|
||||
= link_to dashboard_snippets_path(scope: 'are_public') do
|
||||
Public
|
||||
%span.badge
|
||||
= current_user.snippets.are_public.count
|
||||
|
||||
.my-snippets
|
||||
= render 'snippets/snippets'
|
||||
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
- if show_last_push_widget?(event)
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
%span at
|
||||
%strong= link_to_project event.project
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
.gray-content-block.clear-block
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
%span at
|
||||
%strong= link_to_project event.project
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
%hr
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
.explore-title
|
||||
%h3
|
||||
Explore GitLab
|
||||
%p.lead
|
||||
Discover projects, groups and snippets. Share your projects with others
|
||||
%br
|
||||
|
|
@ -1,7 +1,11 @@
|
|||
- page_title "Groups"
|
||||
- header_title "Groups", (current_user ? dashboard_groups_path : explore_groups_path)
|
||||
- page_title "Groups"
|
||||
- header_title "Groups", dashboard_groups_path
|
||||
|
||||
- if current_user
|
||||
= render 'dashboard/groups_head'
|
||||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.gray-content-block.clearfix
|
||||
.pull-left
|
||||
= form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
- page_title "Projects"
|
||||
- page_title "Projects"
|
||||
- header_title "Projects", root_path
|
||||
|
||||
- if current_user
|
||||
= render 'dashboard/projects_head'
|
||||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.gray-content-block.clearfix
|
||||
= render 'filter'
|
||||
= render 'projects', projects: @projects
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
- page_title "Starred Projects"
|
||||
- page_title "Projects"
|
||||
- header_title "Projects", root_path
|
||||
|
||||
- if current_user
|
||||
= render 'dashboard/projects_head'
|
||||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.explore-trending-block
|
||||
.gray-content-block
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
- page_title "Trending Projects"
|
||||
- page_title "Projects"
|
||||
- header_title "Projects", root_path
|
||||
|
||||
- if current_user
|
||||
= render 'dashboard/projects_head'
|
||||
- else
|
||||
.explore-title
|
||||
%h3
|
||||
Explore GitLab
|
||||
%p.lead
|
||||
Discover projects and groups. Share your projects with others
|
||||
%br
|
||||
= render 'explore/head'
|
||||
|
||||
.explore-trending-block
|
||||
.gray-content-block
|
||||
.pull-right
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
- page_title "Snippets"
|
||||
- header_title "Snippets", snippets_path
|
||||
|
||||
- if current_user
|
||||
= render 'dashboard/snippets_head'
|
||||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.gray-content-block
|
||||
- if current_user
|
||||
.pull-right
|
||||
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
|
||||
Add new snippet
|
||||
|
||||
.oneline
|
||||
Public snippets created by you and other users are listed here
|
||||
|
||||
= render 'snippets/snippets'
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
- header_title group_title(@group, "Settings", edit_group_path(@group))
|
||||
- @blank_container = true
|
||||
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
%strong= @group.name
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
- page_title "Projects"
|
||||
- header_title group_title(@group, "Projects", projects_group_path(@group))
|
||||
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
%strong= @group.name
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
- unless can?(current_user, :read_group, @group)
|
||||
- @disable_search_panel = true
|
||||
|
||||
= content_for :meta_tags do
|
||||
- if current_user
|
||||
= auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
|
||||
|
|
@ -16,22 +19,25 @@
|
|||
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
%section.activities.col-md-7
|
||||
.hidden-xs
|
||||
- if current_user
|
||||
= render "events/event_last_push", event: @last_push
|
||||
|
||||
- if can?(current_user, :read_group, @group)
|
||||
.row
|
||||
%section.activities.col-md-7
|
||||
.hidden-xs
|
||||
- if current_user
|
||||
= render "events/event_last_push", event: @last_push
|
||||
|
||||
%ul.nav.nav-pills.event_filter.pull-right
|
||||
%li
|
||||
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
|
||||
%i.fa.fa-rss
|
||||
|
||||
= render 'shared/event_filter'
|
||||
%hr
|
||||
= render 'shared/event_filter'
|
||||
%hr
|
||||
|
||||
.content_list
|
||||
= spinner
|
||||
%aside.side.col-md-5
|
||||
= render "projects", projects: @projects
|
||||
.content_list
|
||||
= spinner
|
||||
%aside.side.col-md-5
|
||||
= render "projects", projects: @projects
|
||||
- else
|
||||
%p
|
||||
This group does not have public projects
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
- page_title @file.humanize, *@category.split("/").reverse.map(&:humanize)
|
||||
.documentation.wiki
|
||||
= markdown @markdown.gsub('$your_email', current_user.email)
|
||||
= markdown @markdown.gsub('$your_email', current_user.try(:email) || "email@example.com")
|
||||
|
|
|
|||
|
|
@ -6,10 +6,14 @@
|
|||
= brand_header_logo
|
||||
.gitlab-text-container
|
||||
%h3 GitLab
|
||||
|
||||
- if defined?(sidebar) && sidebar
|
||||
= render "layouts/nav/#{sidebar}"
|
||||
- elsif current_user
|
||||
= render 'layouts/nav/dashboard'
|
||||
- else
|
||||
= render 'layouts/nav/explore'
|
||||
|
||||
.collapse-nav
|
||||
= render partial: 'layouts/collapse_button'
|
||||
- if current_user
|
||||
|
|
|
|||
|
|
@ -31,5 +31,5 @@
|
|||
.container
|
||||
.footer-links
|
||||
= link_to "Explore", explore_root_path
|
||||
= link_to "Documentation", "http://doc.gitlab.com/"
|
||||
= link_to "Help", help_path
|
||||
= link_to "About GitLab", "https://about.gitlab.com/"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
- page_title "Explore"
|
||||
- if current_user
|
||||
- unless @header_title
|
||||
- header_title "Projects", (current_user ? root_path : explore_root_path)
|
||||
- else
|
||||
- unless current_user
|
||||
- header_title "Explore GitLab", explore_root_path
|
||||
- sidebar "dashboard"
|
||||
|
||||
= render template: "layouts/application"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@
|
|||
|
||||
.navbar-collapse.collapse
|
||||
%ul.nav.navbar-nav.pull-right
|
||||
%li.hidden-sm.hidden-xs
|
||||
= render 'layouts/search'
|
||||
- unless @disable_search_panel
|
||||
%li.hidden-sm.hidden-xs
|
||||
= render 'layouts/search'
|
||||
%li.visible-sm.visible-xs
|
||||
= link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
|
||||
= icon('search')
|
||||
|
|
|
|||
|
|
@ -1,31 +1,30 @@
|
|||
%ul.nav.nav-sidebar
|
||||
= nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
|
||||
= link_to (current_user ? root_path : explore_root_path), title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
|
||||
= nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
|
||||
= link_to root_path, title: 'Projects', data: {placement: 'right'} do
|
||||
= icon('home fw')
|
||||
%span
|
||||
Projects
|
||||
= nav_link(path: 'dashboard#activity') do
|
||||
= link_to activity_dashboard_path, title: 'Activity', data: {placement: 'right'} do
|
||||
= link_to activity_dashboard_path, class: 'shortcuts-activity', title: 'Activity', data: {placement: 'right'} do
|
||||
= icon('dashboard fw')
|
||||
%span
|
||||
Activity
|
||||
= nav_link(controller: :groups) do
|
||||
= link_to (current_user ? dashboard_groups_path : explore_groups_path), title: 'Groups', data: {placement: 'right'} do
|
||||
= link_to dashboard_groups_path, title: 'Groups', data: {placement: 'right'} do
|
||||
= icon('group fw')
|
||||
%span
|
||||
Groups
|
||||
- if current_user
|
||||
= nav_link(controller: :milestones) do
|
||||
= link_to dashboard_milestones_path, title: 'Milestones', data: {placement: 'right'} do
|
||||
= icon('clock-o fw')
|
||||
%span
|
||||
Milestones
|
||||
= nav_link(path: 'dashboard#issues') do
|
||||
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues', data: {placement: 'right'} do
|
||||
= icon('exclamation-circle fw')
|
||||
%span
|
||||
Issues
|
||||
%span.count= current_user.assigned_issues.opened.count
|
||||
= nav_link(controller: :milestones) do
|
||||
= link_to dashboard_milestones_path, title: 'Milestones', data: {placement: 'right'} do
|
||||
= icon('clock-o fw')
|
||||
%span
|
||||
Milestones
|
||||
= nav_link(path: 'dashboard#issues') do
|
||||
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues', data: {placement: 'right'} do
|
||||
= icon('exclamation-circle fw')
|
||||
%span
|
||||
Issues
|
||||
%span.count= current_user.assigned_issues.opened.count
|
||||
= nav_link(path: 'dashboard#merge_requests') do
|
||||
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'shortcuts-merge_requests', data: {placement: 'right'} do
|
||||
= icon('tasks fw')
|
||||
|
|
@ -33,7 +32,7 @@
|
|||
Merge Requests
|
||||
%span.count= current_user.assigned_merge_requests.opened.count
|
||||
= nav_link(controller: :snippets) do
|
||||
= link_to (current_user ? user_snippets_path(current_user) : snippets_path), title: 'Your snippets', data: {placement: 'right'} do
|
||||
= link_to dashboard_snippets_path, title: 'Your snippets', data: {placement: 'right'} do
|
||||
= icon('clipboard fw')
|
||||
%span
|
||||
Snippets
|
||||
|
|
@ -42,10 +41,8 @@
|
|||
= icon('question-circle fw')
|
||||
%span
|
||||
Help
|
||||
- if current_user
|
||||
%li.separate-item
|
||||
= nav_link(controller: :profile) do
|
||||
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
|
||||
= icon('user fw')
|
||||
%span
|
||||
Profile Settings
|
||||
= nav_link(controller: :profile) do
|
||||
= link_to profile_path, title: 'Profile settings', data: {placement: 'bottom'} do
|
||||
= icon('user fw')
|
||||
%span
|
||||
Profile Settings
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
%ul.nav.nav-sidebar
|
||||
= nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
|
||||
= link_to explore_root_path, title: 'Projects', data: {placement: 'right'} do
|
||||
= icon('home fw')
|
||||
%span
|
||||
Projects
|
||||
= nav_link(controller: :groups) do
|
||||
= link_to explore_groups_path, title: 'Groups', data: {placement: 'right'} do
|
||||
= icon('group fw')
|
||||
%span
|
||||
Groups
|
||||
= nav_link(controller: :snippets) do
|
||||
= link_to explore_snippets_path, title: 'Snippets', data: {placement: 'right'} do
|
||||
= icon('clipboard fw')
|
||||
%span
|
||||
Snippets
|
||||
= nav_link(controller: :help) do
|
||||
= link_to help_path, title: 'Help', data: {placement: 'right'} do
|
||||
= icon('question-circle fw')
|
||||
%span
|
||||
Help
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
= link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to Dashboard
|
||||
Back to dashboard
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
|
@ -12,34 +12,35 @@
|
|||
= icon('dashboard fw')
|
||||
%span
|
||||
Group
|
||||
- if current_user
|
||||
= nav_link(controller: [:group, :milestones]) do
|
||||
= link_to group_milestones_path(@group), title: 'Milestones', data: {placement: 'right'} do
|
||||
= icon('clock-o fw')
|
||||
- if can?(current_user, :read_group, @group)
|
||||
- if current_user
|
||||
= nav_link(controller: [:group, :milestones]) do
|
||||
= link_to group_milestones_path(@group), title: 'Milestones', data: {placement: 'right'} do
|
||||
= icon('clock-o fw')
|
||||
%span
|
||||
Milestones
|
||||
= nav_link(path: 'groups#issues') do
|
||||
= link_to issues_group_path(@group), title: 'Issues', data: {placement: 'right'} do
|
||||
= icon('exclamation-circle fw')
|
||||
%span
|
||||
Milestones
|
||||
= nav_link(path: 'groups#issues') do
|
||||
= link_to issues_group_path(@group), title: 'Issues', data: {placement: 'right'} do
|
||||
= icon('exclamation-circle fw')
|
||||
%span
|
||||
Issues
|
||||
- if current_user
|
||||
%span.count= Issue.opened.of_group(@group).count
|
||||
= nav_link(path: 'groups#merge_requests') do
|
||||
= link_to merge_requests_group_path(@group), title: 'Merge Requests', data: {placement: 'right'} do
|
||||
= icon('tasks fw')
|
||||
%span
|
||||
Merge Requests
|
||||
- if current_user
|
||||
%span.count= MergeRequest.opened.of_group(@group).count
|
||||
= nav_link(controller: [:group_members]) do
|
||||
= link_to group_group_members_path(@group), title: 'Members', data: {placement: 'right'} do
|
||||
= icon('users fw')
|
||||
%span
|
||||
Members
|
||||
- if can?(current_user, :admin_group, @group)
|
||||
= nav_link(html_options: { class: "separate-item" }) do
|
||||
= link_to edit_group_path(@group), title: 'Settings', data: {placement: 'right'} do
|
||||
= icon ('cogs fw')
|
||||
Issues
|
||||
- if current_user
|
||||
%span.count= Issue.opened.of_group(@group).count
|
||||
= nav_link(path: 'groups#merge_requests') do
|
||||
= link_to merge_requests_group_path(@group), title: 'Merge Requests', data: {placement: 'right'} do
|
||||
= icon('tasks fw')
|
||||
%span
|
||||
Settings
|
||||
Merge Requests
|
||||
- if current_user
|
||||
%span.count= MergeRequest.opened.of_group(@group).count
|
||||
= nav_link(controller: [:group_members]) do
|
||||
= link_to group_group_members_path(@group), title: 'Members', data: {placement: 'right'} do
|
||||
= icon('users fw')
|
||||
%span
|
||||
Members
|
||||
- if can?(current_user, :admin_group, @group)
|
||||
= nav_link(html_options: { class: "separate-item" }) do
|
||||
= link_to edit_group_path(@group), title: 'Settings', data: {placement: 'right'} do
|
||||
= icon ('cogs fw')
|
||||
%span
|
||||
Settings
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
= link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to Dashboard
|
||||
Back to dashboard
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
= link_to group_path(@project.group), title: 'Back to group', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to Group
|
||||
Back to group
|
||||
- else
|
||||
= nav_link do
|
||||
= link_to root_path, title: 'Back to dashboard', data: {placement: 'right'}, class: 'back-link' do
|
||||
= icon('caret-square-o-left fw')
|
||||
%span
|
||||
Back to Dashboard
|
||||
Back to dashboard
|
||||
|
||||
%li.separate-item
|
||||
|
||||
|
|
@ -26,28 +26,28 @@
|
|||
Activity
|
||||
- if project_nav_tab? :files
|
||||
= nav_link(controller: %w(tree blob blame edit_tree new_tree)) do
|
||||
= link_to namespace_project_tree_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Files', class: 'shortcuts-tree', data: {placement: 'right'} do
|
||||
= link_to project_files_path(@project), title: 'Files', class: 'shortcuts-tree', data: {placement: 'right'} do
|
||||
= icon('files-o fw')
|
||||
%span
|
||||
Files
|
||||
|
||||
- if project_nav_tab? :commits
|
||||
= nav_link(controller: %w(commit commits compare repositories tags branches)) do
|
||||
= link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Commits', class: 'shortcuts-commits', data: {placement: 'right'} do
|
||||
= link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits', data: {placement: 'right'} do
|
||||
= icon('history fw')
|
||||
%span
|
||||
Commits
|
||||
|
||||
- if project_nav_tab? :network
|
||||
= nav_link(controller: %w(network)) do
|
||||
= link_to namespace_project_network_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Network', class: 'shortcuts-network', data: {placement: 'right'} do
|
||||
= link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network', data: {placement: 'right'} do
|
||||
= icon('code-fork fw')
|
||||
%span
|
||||
Network
|
||||
|
||||
- if project_nav_tab? :graphs
|
||||
= nav_link(controller: %w(graphs)) do
|
||||
= link_to namespace_project_graph_path(@project.namespace, @project, @ref || @repository.root_ref), title: 'Graphs', class: 'shortcuts-graphs', data: {placement: 'right'} do
|
||||
= link_to namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Graphs', class: 'shortcuts-graphs', data: {placement: 'right'} do
|
||||
= icon('area-chart fw')
|
||||
%span
|
||||
Graphs
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
- page_title @project.name_with_namespace
|
||||
- header_title project_title(@project)
|
||||
- header_title detect_project_title(@project)
|
||||
- sidebar "project" unless sidebar
|
||||
|
||||
- content_for :scripts_body_top do
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
- page_title 'Snippets'
|
||||
- if current_user
|
||||
- header_title "Snippets", user_snippets_path(current_user)
|
||||
- else
|
||||
- header_title 'Snippets', snippets_path
|
||||
- sidebar "dashboard"
|
||||
- header_title "Snippets", snippets_path
|
||||
|
||||
= render template: "layouts/application"
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
- if event = last_push_event
|
||||
- if show_last_push_widget?(event)
|
||||
.hidden-xs.center
|
||||
.slead
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
branch
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
%div
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
%hr
|
||||
.gray-content-block.top-block.clear-block.hidden-xs
|
||||
.event-last-push
|
||||
.event-last-push-text
|
||||
%span You pushed to
|
||||
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
branch
|
||||
#{time_ago_with_tooltip(event.created_at)}
|
||||
|
||||
.pull-right
|
||||
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
|
||||
Create Merge Request
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
- page_title "Activity"
|
||||
= render 'projects/activity'
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@
|
|||
tree_join(@commit.sha, @path)), class: 'btn btn-sm'
|
||||
|
||||
- if allowed_tree_edit?
|
||||
= button_tag class: 'remove-blob btn btn-sm btn-remove',
|
||||
'data-toggle' => 'modal', 'data-target' => '#modal-remove-blob' do
|
||||
Remove
|
||||
.btn-group{:role => "group"}
|
||||
%button.btn.btn-default{class: 'btn-primary', href: '#modal-replace-blob', 'data-target' => '#modal-replace-blob', 'data-toggle' => 'modal'} Replace
|
||||
%button.btn.btn-default{class: 'btn-remove', href: '#modal-remove-blob', 'data-target' => '#modal-remove-blob', 'data-toggle' => 'modal'} Remove
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
#modal-replace-blob.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3.page-title Replace #{@blob.name}
|
||||
%p.light
|
||||
From branch
|
||||
%strong= @ref
|
||||
.modal-body
|
||||
= form_tag namespace_project_update_blob_path(@project.namespace, @project, @id), method: :put, class: 'blob-file-upload-form-js form-horizontal' do
|
||||
.dropzone
|
||||
.dropzone-previews{class: "blob-upload-dropzone-previews"}
|
||||
%p.dz-message{class: "hint"}<
|
||||
Attach files by dragging & dropping or
|
||||
%a{href: '#', class: "markdown-selector"}>click to upload
|
||||
%br
|
||||
.dropzone-alerts{class: "alert alert-danger data", "data-dismiss" => "alert", style: "display:none"}
|
||||
= render 'shared/commit_message_container', params: params,
|
||||
placeholder: 'Replace this file because...'
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
= button_tag 'Replace file', class: 'btn btn-small btn-primary btn-replace-file', id: 'submit-all'
|
||||
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
|
||||
|
||||
:coffeescript
|
||||
disableButtonIfEmptyField $('.blob-file-upload-form-js').find('#commit_message'), '.btn-replace-file'
|
||||
new BlobFileDropzone($('.blob-file-upload-form-js'), 'put')
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
#modal-upload-blob.modal
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3.page-title Upload
|
||||
%p.light
|
||||
From branch
|
||||
%strong= @ref
|
||||
.modal-body
|
||||
= form_tag namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post, class: 'blob-file-upload-form-js form-horizontal' do
|
||||
.dropzone
|
||||
.dropzone-previews{class: "blob-upload-dropzone-previews"}
|
||||
%p.dz-message{class: "hint"}<
|
||||
Attach files by dragging & dropping or
|
||||
%a{href: '#', class: "markdown-selector"}>click to upload
|
||||
%br
|
||||
.dropzone-alerts{class: "alert alert-danger data", "data-dismiss" => "alert", style: "display:none"}
|
||||
= render 'shared/commit_message_container', params: params,
|
||||
placeholder: 'Upload this file because...'
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
= button_tag 'Upload file', class: 'btn btn-small btn-primary btn-upload-file', id: 'submit-all'
|
||||
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
|
||||
|
||||
:coffeescript
|
||||
disableButtonIfEmptyField $('.blob-file-upload-form-js').find('#commit_message'), '.btn-upload-file'
|
||||
new BlobFileDropzone($('.blob-file-upload-form-js'), 'post')
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
- page_title "Edit", @blob.path, @ref
|
||||
.file-editor
|
||||
%ul.nav.nav-tabs.js-edit-mode
|
||||
%ul.center-top-menu.no-bottom.js-edit-mode
|
||||
%li.active
|
||||
= link_to '#editor' do
|
||||
%i.fa.fa-edit
|
||||
|
|
|
|||
|
|
@ -1,5 +1,11 @@
|
|||
- page_title "New File", @ref
|
||||
%h3.page-title New file
|
||||
%h3.page-title<
|
||||
Create new file or
|
||||
%a.upload-link{href: '#modal-upload-blob', 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal'}>upload existing one
|
||||
|
||||
.file-title
|
||||
= render 'projects/blob/upload'
|
||||
%br
|
||||
|
||||
.file-editor
|
||||
= form_tag(namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post, class: 'form-horizontal form-new-file js-requires-input') do
|
||||
= render 'projects/blob/editor', ref: @ref
|
||||
|
|
|
|||
|
|
@ -10,3 +10,4 @@
|
|||
|
||||
- if allowed_tree_edit?
|
||||
= render 'projects/blob/remove'
|
||||
= render 'projects/blob/replace'
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
%ul.center-top-menu
|
||||
= nav_link(controller: [:commit, :commits]) do
|
||||
= link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
|
||||
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
|
||||
Commits
|
||||
%span.badge= number_with_delimiter(@repository.commit_count)
|
||||
= nav_link(controller: :compare) do
|
||||
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref) do
|
||||
= link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: current_ref) do
|
||||
Compare
|
||||
|
||||
= nav_link(html_options: {class: branches_tab_class}) do
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
= render "home_panel"
|
||||
|
||||
.center.light-well
|
||||
.gray-content-block.center
|
||||
%h3.page-title
|
||||
The repository for this project is empty
|
||||
%p
|
||||
|
|
|
|||
|
|
@ -3,8 +3,12 @@
|
|||
.center
|
||||
%h2
|
||||
%i.fa.fa-spinner.fa-spin
|
||||
Import in progress.
|
||||
%p.monospace git clone --bare #{hidden_pass_url(@project.import_url)}
|
||||
- if @project.forked?
|
||||
Forking in progress.
|
||||
- else
|
||||
Import in progress.
|
||||
- unless @project.forked?
|
||||
%p.monospace git clone --bare #{hidden_pass_url(@project.import_url)}
|
||||
%p Please wait while we import the repository for you. Refresh at will.
|
||||
:javascript
|
||||
new ProjectImport();
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
- page_title "Labels"
|
||||
- if can? current_user, :admin_label, @project
|
||||
= link_to new_namespace_project_label_path(@project.namespace, @project), class: "pull-right btn btn-new" do
|
||||
New label
|
||||
%h3.page-title
|
||||
Labels
|
||||
%hr
|
||||
|
||||
.gray-content-block.top-block
|
||||
- if can? current_user, :admin_label, @project
|
||||
= link_to new_namespace_project_label_path(@project.namespace, @project), class: "pull-right btn btn-new" do
|
||||
New label
|
||||
.oneline
|
||||
Labels can be applied to issues and merge requests.
|
||||
|
||||
.labels
|
||||
- if @labels.present?
|
||||
%ul.bordered-list.manage-labels-list
|
||||
%ul.content-list.manage-labels-list
|
||||
= render @labels
|
||||
= paginate @labels, theme: 'gitlab'
|
||||
- else
|
||||
|
|
|
|||
|
|
@ -1,30 +1,28 @@
|
|||
- page_title "Members"
|
||||
%h3.page-title
|
||||
Users with access to this project
|
||||
|
||||
%p.light
|
||||
.gray-content-block.top-block
|
||||
.clearfix.js-toggle-container
|
||||
= form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input' }
|
||||
= button_tag 'Search', class: 'btn'
|
||||
|
||||
- if can?(current_user, :admin_project_member, @project)
|
||||
%span.pull-right
|
||||
= button_tag class: 'btn btn-new btn-grouped js-toggle-button', type: 'button' do
|
||||
Add members
|
||||
%i.fa.fa-chevron-down
|
||||
= link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
|
||||
Import members
|
||||
|
||||
.js-toggle-content.hide.new-group-member-holder
|
||||
= render "new_project_member"
|
||||
|
||||
%p.prepend-top-default.light
|
||||
Users with access to this project are listed below.
|
||||
Read more about project permissions
|
||||
%strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
|
||||
|
||||
%hr
|
||||
|
||||
.clearfix.js-toggle-container
|
||||
= form_tag namespace_project_project_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input' }
|
||||
= button_tag 'Search', class: 'btn'
|
||||
|
||||
- if can?(current_user, :admin_project_member, @project)
|
||||
%span.pull-right
|
||||
= button_tag class: 'btn btn-new btn-grouped js-toggle-button', type: 'button' do
|
||||
Add members
|
||||
%i.fa.fa-chevron-down
|
||||
= link_to import_namespace_project_project_members_path(@project.namespace, @project), class: "btn btn-grouped", title: "Import members from another project" do
|
||||
Import members
|
||||
|
||||
.js-toggle-content.hide.new-group-member-holder
|
||||
= render "new_project_member"
|
||||
|
||||
= render "team", members: @project_members
|
||||
|
||||
- if @group
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
.project-stats.gray-content-block
|
||||
%ul.nav.nav-pills
|
||||
%li
|
||||
= link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
|
||||
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
|
||||
= pluralize(number_with_delimiter(@project.commit_count), 'commit')
|
||||
%li
|
||||
= link_to namespace_project_branches_path(@project.namespace, @project) do
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
%ul.center-top-menu
|
||||
= nav_link(page: user_snippets_path(current_user), html_options: {class: 'home'}) do
|
||||
= link_to user_snippets_path(current_user), title: 'Your snippets', data: {placement: 'right'} do
|
||||
Your Snippets
|
||||
= nav_link(page: snippets_path) do
|
||||
= link_to snippets_path, title: 'Explore snippets', data: {placement: 'right'} do
|
||||
Explore Snippets
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
- page_title "Your Snippets"
|
||||
= render 'head'
|
||||
|
||||
.gray-content-block
|
||||
.pull-right
|
||||
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
|
||||
Add new snippet
|
||||
|
||||
.oneline
|
||||
Share code pastes with others out of git repository
|
||||
|
||||
%ul.nav.nav-tabs.prepend-top-20
|
||||
= nav_tab :scope, nil do
|
||||
= link_to user_snippets_path(@user) do
|
||||
All
|
||||
%span.badge
|
||||
= @user.snippets.count
|
||||
= nav_tab :scope, 'are_private' do
|
||||
= link_to user_snippets_path(@user, scope: 'are_private') do
|
||||
Private
|
||||
%span.badge
|
||||
= @user.snippets.are_private.count
|
||||
= nav_tab :scope, 'are_internal' do
|
||||
= link_to user_snippets_path(@user, scope: 'are_internal') do
|
||||
Internal
|
||||
%span.badge
|
||||
= @user.snippets.are_internal.count
|
||||
= nav_tab :scope, 'are_public' do
|
||||
= link_to user_snippets_path(@user, scope: 'are_public') do
|
||||
Public
|
||||
%span.badge
|
||||
= @user.snippets.are_public.count
|
||||
|
||||
.my-snippets
|
||||
= render 'snippets'
|
||||
|
||||
|
|
@ -1,15 +1,13 @@
|
|||
- page_title "Public Snippets"
|
||||
- if current_user
|
||||
= render 'head'
|
||||
- page_title "By #{@user.name}", "Snippets"
|
||||
|
||||
.gray-content-block
|
||||
- if current_user
|
||||
.pull-right
|
||||
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
|
||||
Add new snippet
|
||||
|
||||
.oneline
|
||||
Public snippets created by you and other users are listed here
|
||||
%ol.breadcrumb
|
||||
%li
|
||||
= link_to snippets_path do
|
||||
Snippets
|
||||
%li
|
||||
= @user.name
|
||||
.pull-right.hidden-xs
|
||||
= link_to user_path(@user) do
|
||||
#{@user.name} profile page
|
||||
|
||||
= render 'snippets'
|
||||
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
.back-link
|
||||
- if @snippet.author == current_user
|
||||
= link_to user_snippets_path(current_user) do
|
||||
= link_to dashboard_snippets_path do
|
||||
← your snippets
|
||||
- else
|
||||
= link_to snippets_path do
|
||||
= link_to explore_snippets_path do
|
||||
← explore snippets
|
||||
|
||||
.file-holder
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
- page_title "Snippets", @user.name
|
||||
|
||||
%ol.breadcrumb
|
||||
%li
|
||||
= link_to snippets_path do
|
||||
Snippets
|
||||
%li
|
||||
= @user.name
|
||||
.pull-right.hidden-xs
|
||||
= link_to user_path(@user) do
|
||||
#{@user.name} profile page
|
||||
|
||||
= render 'snippets'
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
- if @user == current_user
|
||||
.pull-right.hidden-xs
|
||||
= link_to profile_path, class: 'btn btn-sm' do
|
||||
%i.fa.fa-pencil-square-o
|
||||
Edit Profile settings
|
||||
= icon('user')
|
||||
Profile settings
|
||||
- elsif current_user
|
||||
.pull-right
|
||||
%span.dropdown
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
class RepositoryForkWorker
|
||||
include Sidekiq::Worker
|
||||
include Gitlab::ShellAdapter
|
||||
|
||||
sidekiq_options queue: :gitlab_shell
|
||||
|
||||
def perform(project_id, source_path, target_path)
|
||||
project = Project.find_by_id(project_id)
|
||||
|
||||
unless project.present?
|
||||
logger.error("Project #{project_id} no longer exists!")
|
||||
return
|
||||
end
|
||||
|
||||
result = gitlab_shell.fork_repository(source_path, target_path)
|
||||
|
||||
unless result
|
||||
logger.error("Unable to fork project #{project_id} for repository #{source_path} -> #{target_path}")
|
||||
project.import_fail
|
||||
project.save
|
||||
return
|
||||
end
|
||||
|
||||
if project.valid_repo?
|
||||
ProjectCacheWorker.perform_async(project.id)
|
||||
project.import_finish
|
||||
else
|
||||
project.import_fail
|
||||
logger.error("Project #{id} had an invalid repository after fork")
|
||||
end
|
||||
|
||||
project.save
|
||||
end
|
||||
end
|
||||
|
|
@ -242,6 +242,7 @@ Gitlab::Application.routes.draw do
|
|||
end
|
||||
|
||||
resources :groups, only: [:index]
|
||||
resources :snippets, only: [:index]
|
||||
root to: 'projects#trending'
|
||||
end
|
||||
|
||||
|
|
@ -362,24 +363,25 @@ Gitlab::Application.routes.draw do
|
|||
#
|
||||
# Dashboard Area
|
||||
#
|
||||
resource :dashboard, controller: 'dashboard', only: [:show] do
|
||||
member do
|
||||
get :issues
|
||||
get :merge_requests
|
||||
get :activity
|
||||
end
|
||||
resource :dashboard, controller: 'dashboard', only: [] do
|
||||
get :issues
|
||||
get :merge_requests
|
||||
get :activity
|
||||
|
||||
scope module: :dashboard do
|
||||
resources :milestones, only: [:index, :show]
|
||||
|
||||
resources :groups, only: [:index]
|
||||
resources :snippets, only: [:index]
|
||||
|
||||
resources :projects, only: [] do
|
||||
resources :projects, only: [:index] do
|
||||
collection do
|
||||
get :starred
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
root to: "dashboard/projects#index"
|
||||
end
|
||||
|
||||
#
|
||||
|
|
@ -403,7 +405,7 @@ Gitlab::Application.routes.draw do
|
|||
end
|
||||
end
|
||||
|
||||
resources :projects, constraints: { id: /[^\/]+/ }, only: [:new, :create]
|
||||
resources :projects, constraints: { id: /[^\/]+/ }, only: [:index, :new, :create]
|
||||
|
||||
devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations , passwords: :passwords, sessions: :sessions, confirmations: :confirmations }
|
||||
|
||||
|
|
@ -411,7 +413,7 @@ Gitlab::Application.routes.draw do
|
|||
get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
|
||||
end
|
||||
|
||||
root to: "root#show"
|
||||
root to: "root#index"
|
||||
|
||||
#
|
||||
# Project Area
|
||||
|
|
@ -455,6 +457,16 @@ Gitlab::Application.routes.draw do
|
|||
to: 'blob#destroy',
|
||||
constraints: { id: /.+/, format: false }
|
||||
)
|
||||
put(
|
||||
'/blob/*id',
|
||||
to: 'blob#update',
|
||||
constraints: { id: /.+/, format: false }
|
||||
)
|
||||
post(
|
||||
'/blob/*id',
|
||||
to: 'blob#create',
|
||||
constraints: { id: /.+/, format: false }
|
||||
)
|
||||
end
|
||||
|
||||
scope do
|
||||
|
|
|
|||
|
|
@ -369,4 +369,7 @@ For more information see similar questions on postgresql issue tracker[here](htt
|
|||
|
||||
## Note
|
||||
This documentation is for GitLab CE.
|
||||
We backup GitLab.com and make sure your data is secure, but you can't use these methods to export / backup your data yourself from GitLab.com.
|
||||
We backup GitLab.com and make sure your data is secure, but you can't use these methods
|
||||
to export / backup your data yourself from GitLab.com.
|
||||
|
||||
Issues are stored in the database. They can't be stored in Git itself.
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ months after this vulnerability became known the GitLab installation guide
|
|||
still contained instructions that would install the outdated, 'vulnerable' Git
|
||||
version 2.1.2.
|
||||
|
||||
Run the following command to get your current Git version.
|
||||
Run the following command to get your current Git version:
|
||||
|
||||
```
|
||||
```sh
|
||||
/usr/local/bin/git --version
|
||||
```
|
||||
|
||||
|
|
@ -63,39 +63,44 @@ sudo -u git -H git checkout 8-0-stable-ee
|
|||
```bash
|
||||
cd /home/git/gitlab-shell
|
||||
sudo -u git -H git fetch
|
||||
sudo -u git -H git checkout v2.6.4
|
||||
sudo -u git -H git checkout v2.6.5
|
||||
```
|
||||
|
||||
### 5. Install gitlab-git-http-server
|
||||
|
||||
First we download Go 1.5 and install it into /usr/local/go.
|
||||
First we download Go 1.5 and install it into `/usr/local/go`:
|
||||
|
||||
curl -O --progress https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz
|
||||
echo '5817fa4b2252afdb02e11e8b9dc1d9173ef3bd5a go1.5.linux-amd64.tar.gz' | shasum -c - && \
|
||||
sudo tar -C /usr/local -xzf go1.5.linux-amd64.tar.gz
|
||||
sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
|
||||
rm go1.5.linux-amd64.tar.gz
|
||||
```bash
|
||||
curl -O --progress https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz
|
||||
echo '5817fa4b2252afdb02e11e8b9dc1d9173ef3bd5a go1.5.linux-amd64.tar.gz' | shasum -c - && \
|
||||
sudo tar -C /usr/local -xzf go1.5.linux-amd64.tar.gz
|
||||
sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
|
||||
rm go1.5.linux-amd64.tar.gz
|
||||
```
|
||||
|
||||
Now we download gitlab-git-http-server and install it in /home/git/gitlab-git-http-server.
|
||||
Now we download `gitlab-git-http-server` and install it in `/home/git/gitlab-git-http-server`:
|
||||
|
||||
cd /home/git
|
||||
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git
|
||||
cd gitlab-git-http-server
|
||||
sudo -u git -H make
|
||||
```bash
|
||||
cd /home/git
|
||||
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git
|
||||
cd gitlab-git-http-server
|
||||
sudo -u git -H make
|
||||
```
|
||||
|
||||
If you put your Git repositories in a directory different from /home/git/repositories, you need to tell gitlab-git-http-server about it via /etc/gitlab/default.
|
||||
See lib/support/init.d/gitlab.default.example for the options.
|
||||
If your Git repositories are in a directory other than `/home/git/repositories`,
|
||||
you need to tell `gitlab-git-http-server` about it via `/etc/gitlab/default`.
|
||||
See `lib/support/init.d/gitlab.default.example` for the options.
|
||||
|
||||
### 6. Install libs, migrations, etc.
|
||||
|
||||
```bash
|
||||
cd /home/git/gitlab
|
||||
|
||||
# MySQL installations (note: the line below states '--without ... postgres')
|
||||
sudo -u git -H bundle install --without development test postgres --deployment
|
||||
# MySQL installations (note: the line below states '--without postgres')
|
||||
sudo -u git -H bundle install --without postgres development test --deployment
|
||||
|
||||
# PostgreSQL installations (note: the line below states '--without ... mysql')
|
||||
sudo -u git -H bundle install --without development test mysql --deployment
|
||||
# PostgreSQL installations (note: the line below states '--without mysql')
|
||||
sudo -u git -H bundle install --without mysql development test --deployment
|
||||
|
||||
# Run database migrations
|
||||
sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
|
||||
|
|
@ -111,20 +116,27 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
|
|||
|
||||
#### New configuration options for `gitlab.yml`
|
||||
|
||||
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
|
||||
There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them manually to your current `gitlab.yml`:
|
||||
|
||||
```
|
||||
```sh
|
||||
git diff origin/7-14-stable:config/gitlab.yml.example origin/8-0-stable:config/gitlab.yml.example
|
||||
``````
|
||||
|
||||
#### New NGINX configuration
|
||||
|
||||
Because of the new gitlab-git-http-server you need to update your NGINX configuration.
|
||||
If you skip this step 'git clone' and 'git push' over HTTP(S) will stop working.
|
||||
|
||||
```
|
||||
# Remove '-ssl' twice in the diff command below if you use HTTP instead of HTTPS
|
||||
|
||||
#### New Nginx configuration
|
||||
|
||||
Because of the new `gitlab-git-http-server` you need to update your Nginx
|
||||
configuration. If you skip this step 'git clone' and 'git push' over HTTP(S)
|
||||
will stop working.
|
||||
|
||||
View changes between the previous recommended Nginx configuration and the
|
||||
current one:
|
||||
|
||||
```sh
|
||||
# For HTTPS configurations
|
||||
git diff origin/7-14-stable:lib/support/nginx/gitlab-ssl origin/8-0-stable:lib/support/nginx/gitlab-ssl
|
||||
|
||||
# For HTTP configurations
|
||||
git diff origin/7-14-stable:lib/support/nginx/gitlab origin/8-0-stable:lib/support/nginx/gitlab
|
||||
```
|
||||
|
||||
### 8. Start application
|
||||
|
|
@ -138,7 +150,7 @@ Check if GitLab and its environment are configured correctly:
|
|||
|
||||
sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
|
||||
|
||||
To make sure you didn't miss anything run a more thorough check with:
|
||||
To make sure you didn't miss anything run a more thorough check:
|
||||
|
||||
sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
|
||||
|
||||
|
|
@ -147,13 +159,15 @@ If all items are green, then congratulations, the upgrade is complete!
|
|||
## Things went south? Revert to previous version (7.14)
|
||||
|
||||
### 1. Revert the code to the previous version
|
||||
|
||||
Follow the [upgrade guide from 7.13 to 7.14](7.13-to-7.14.md), except for the database migration
|
||||
(The backup is already migrated to the previous version)
|
||||
|
||||
### 2. Restore from the backup:
|
||||
### 2. Restore from the backup
|
||||
|
||||
```bash
|
||||
cd /home/git/gitlab
|
||||
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
|
||||
```
|
||||
If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
|
||||
|
||||
If you have more than one backup `*.tar` file(s) please add `BACKUP=timestamp_of_backup` to the command above.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Universal update guide for patch versions
|
||||
*Make sure you view this [upgrade guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/patch_versions.md) from the `master` branch for the most up to date instructions.*
|
||||
|
||||
For example from 6.2.0 to 6.2.1, also see the [semantic versioning specification](http://semver.org/).
|
||||
For example from 7.14.0 to 7.14.3, also see the [semantic versioning specification](http://semver.org/).
|
||||
|
||||
### 0. Backup
|
||||
|
||||
|
|
@ -23,17 +23,16 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
|
|||
cd /home/git/gitlab
|
||||
sudo -u git -H git fetch --all
|
||||
sudo -u git -H git checkout -- Gemfile.lock db/schema.rb
|
||||
sudo -u git -H git checkout LATEST_TAG
|
||||
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
|
||||
sudo -u git -H git checkout $LATEST_TAG -b $LATEST_TAG
|
||||
```
|
||||
|
||||
Replace LATEST_TAG with the latest GitLab tag you want to upgrade to, for example `v6.6.3`.
|
||||
|
||||
### 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 v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`
|
||||
sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION` -b v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`
|
||||
```
|
||||
|
||||
### 4. Install libs, migrations, etc.
|
||||
|
|
|
|||
|
|
@ -3,20 +3,6 @@ Feature: Explore Groups
|
|||
Background:
|
||||
Given group "TestGroup" has private project "Enterprise"
|
||||
|
||||
Scenario: I should not see group with private projects as visitor
|
||||
When I visit group "TestGroup" page
|
||||
Then I should be redirected to sign in page
|
||||
|
||||
Scenario: I should not see group with private projects group as user
|
||||
When I sign in as a user
|
||||
And I visit group "TestGroup" page
|
||||
Then page status code should be 404
|
||||
|
||||
Scenario: I should not see group with private and internal projects as visitor
|
||||
Given group "TestGroup" has internal project "Internal"
|
||||
When I visit group "TestGroup" page
|
||||
Then I should be redirected to sign in page
|
||||
|
||||
Scenario: I should see group with private and internal projects as user
|
||||
Given group "TestGroup" has internal project "Internal"
|
||||
When I sign in as a user
|
||||
|
|
|
|||
|
|
@ -159,3 +159,14 @@ Feature: Groups
|
|||
When I visit group "Owned" projects page
|
||||
Then I should see group "Owned" projects list
|
||||
And I should see "archived" label
|
||||
|
||||
# Public group
|
||||
@javascript
|
||||
Scenario: Signed out user should see group
|
||||
Given "Mary Jane" is owner of group "Owned"
|
||||
And I am a signed out user
|
||||
And Group "Owned" has a public project "Public-project"
|
||||
When I visit group "Owned" page
|
||||
Then I should see group "Owned"
|
||||
Then I should see project "Public-project"
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,29 @@ Feature: Project Source Browse Files
|
|||
And I click on "Commit Changes"
|
||||
Then I am redirected to the new file
|
||||
And I should see its new content
|
||||
|
||||
@javascript
|
||||
Scenario: I can upload file and commit
|
||||
Given I click on "new file" link in repo
|
||||
Then I can see new file page
|
||||
And I can see "upload existing one"
|
||||
And I click on "upload existing one"
|
||||
And I upload a new text file
|
||||
And I fill the upload file commit message
|
||||
And I click on "Upload file"
|
||||
Then I can see the new text file
|
||||
And I can see the new commit message
|
||||
|
||||
@javascript
|
||||
Scenario: I can replace file and commit
|
||||
Given I click on ".gitignore" file in repo
|
||||
And I see the ".gitignore"
|
||||
And I click on "Replace"
|
||||
And I replace it with a text file
|
||||
And I fill the replace file commit message
|
||||
And I click on "Replace file"
|
||||
Then I can see the new text file
|
||||
And I can see the replacement commit message
|
||||
|
||||
@javascript
|
||||
Scenario: I can create and commit file and specify new branch
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
|||
include Select2Helper
|
||||
|
||||
step 'I should see back to dashboard button' do
|
||||
expect(page).to have_content 'Back to Dashboard'
|
||||
expect(page).to have_content 'Back to dashboard'
|
||||
end
|
||||
|
||||
step 'gitlab user "Mike"' do
|
||||
|
|
@ -17,6 +17,26 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
|||
find(:css, 'button.btn-new').click
|
||||
end
|
||||
|
||||
step 'I should see group "Owned"' do
|
||||
expect(page).to have_content '@owned'
|
||||
end
|
||||
|
||||
step 'I am a signed out user' do
|
||||
logout
|
||||
end
|
||||
|
||||
step 'Group "Owned" has a public project "Public-project"' do
|
||||
group = Group.find_by(name: "Owned")
|
||||
|
||||
@project = create :empty_project, :public,
|
||||
group: group,
|
||||
name: "Public-project"
|
||||
end
|
||||
|
||||
step 'I should see project "Public-project"' do
|
||||
expect(page).to have_content 'Public-project'
|
||||
end
|
||||
|
||||
step 'I select "Mike" as "Reporter"' do
|
||||
user = User.find_by(name: "Mike")
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class Spinach::Features::Invites < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I should be redirected to the dashboard' do
|
||||
expect(current_path).to eq(dashboard_path)
|
||||
expect(current_path).to eq(dashboard_projects_path)
|
||||
end
|
||||
|
||||
step 'I should see a notice telling me I have declined' do
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I should see the forked project page' do
|
||||
expect(page).to have_content "Project was successfully forked."
|
||||
expect(page).to have_content "Forked from"
|
||||
end
|
||||
|
||||
step 'I already have a project named "Shop" in my namespace' do
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue