From 87e0429fb19426ecd33142a207a39245f719217e Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Tue, 4 Dec 2012 12:39:09 +0400 Subject: update link to travis-ci --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1816629d3aa..a8de834ceb6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://secure.travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://secure.travis-ci.org/gitlabhq/grit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq) +# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://travis-ci.org/gitlabhq/grit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq) GitLab is a free project and repository management application -- cgit v1.2.1 From 7f6bbf06f8d94f7e3830567167332ca2a42c4573 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 4 Dec 2012 11:18:13 +0200 Subject: Fix bug getting started message when navigate to personal projects w/o them exist --- app/controllers/dashboard_controller.rb | 2 + app/views/dashboard/_activities.html.haml | 13 ++++++ app/views/dashboard/_projects.html.haml | 3 ++ app/views/dashboard/_sidebar.html.haml | 14 +++++++ .../dashboard/_zero_authorized_projects.html.haml | 12 ++++++ app/views/dashboard/index.html.haml | 47 ++-------------------- 6 files changed, 48 insertions(+), 43 deletions(-) create mode 100644 app/views/dashboard/_activities.html.haml create mode 100644 app/views/dashboard/_sidebar.html.haml create mode 100644 app/views/dashboard/_zero_authorized_projects.html.haml diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 461dd51b570..1fcadbfefba 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -7,6 +7,8 @@ class DashboardController < ApplicationController def index @groups = current_user.authorized_groups + @has_authorized_projects = @projects.count > 0 + @projects = case params[:scope] when 'personal' then @projects.personal(current_user) diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml new file mode 100644 index 00000000000..c63ef24fca5 --- /dev/null +++ b/app/views/dashboard/_activities.html.haml @@ -0,0 +1,13 @@ += render "events/event_last_push", event: @last_push + +.event_filter + = event_filter_link EventFilter.push, 'Push events' + = event_filter_link EventFilter.merged, 'Merge events' + = event_filter_link EventFilter.comments, 'Comments' + = event_filter_link EventFilter.team, 'Team' + +- if @events.any? + .content_list= render @events +- else + %p.nothing_here_message Projects activity will be displayed here +.loading.hide diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index fac0a074691..d92983ff6a5 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -30,4 +30,7 @@ %span.last_activity %strong Last activity: %span= project_last_activity(project) + - if projects.blank? + %li.wll + %h3.nothing_here_message There are no projects here. .bottom= paginate projects, theme: "gitlab" diff --git a/app/views/dashboard/_sidebar.html.haml b/app/views/dashboard/_sidebar.html.haml new file mode 100644 index 00000000000..ca57cd30732 --- /dev/null +++ b/app/views/dashboard/_sidebar.html.haml @@ -0,0 +1,14 @@ +- if @groups.present? + = render "groups", groups: @groups += render "projects", projects: @projects +%div + %span.rss-icon + = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do + = image_tag "rss_ui.png", title: "feed" + %strong News Feed + +%hr +.gitlab-promo + = link_to "Homepage", "http://gitlabhq.com" + = link_to "Blog", "http://blog.gitlabhq.com" + = link_to "@gitlabhq", "https://twitter.com/gitlabhq" diff --git a/app/views/dashboard/_zero_authorized_projects.html.haml b/app/views/dashboard/_zero_authorized_projects.html.haml new file mode 100644 index 00000000000..d1676ed11fa --- /dev/null +++ b/app/views/dashboard/_zero_authorized_projects.html.haml @@ -0,0 +1,12 @@ +%h3.nothing_here_message + There are no projects you have access to. + %br + - if current_user.can_create_project? + You can create up to + = current_user.projects_limit + projects. Click on button below to add a new one + .link_holder + = link_to new_project_path, class: "btn primary" do + New Project » + - else + If you will be added to project - it will be displayed here diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 6b360dc1fef..0b4c4844a7f 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -1,50 +1,11 @@ -- if @projects.any? +- if @has_authorized_projects .projects .activities.span8 - = render "events/event_last_push", event: @last_push - - .event_filter - = event_filter_link EventFilter.push, 'Push events' - = event_filter_link EventFilter.merged, 'Merge events' - = event_filter_link EventFilter.comments, 'Comments' - = event_filter_link EventFilter.team, 'Team' - - - if @events.any? - .content_list= render @events - - else - %p.nothing_here_message Projects activity will be displayed here - .loading.hide + = render 'activities' .side - - if @groups.present? - = render "groups", groups: @groups - = render "projects", projects: @projects - %div - %span.rss-icon - = link_to dashboard_path(:atom, { private_token: current_user.private_token }) do - = image_tag "rss_ui.png", title: "feed" - %strong News Feed - - %hr - .gitlab-promo - = link_to "Homepage", "http://gitlabhq.com" - = link_to "Blog", "http://blog.gitlabhq.com" - = link_to "@gitlabhq", "https://twitter.com/gitlabhq" - + = render 'sidebar' - else - %h3.nothing_here_message There are no projects you have access to. - %br - %h4.nothing_here_message - - if current_user.can_create_project? - You can create up to - = current_user.projects_limit - projects. Click on button below to add a new one - .link_holder - = link_to new_project_path, class: "btn primary" do - New Project » - - else - If you will be added to project - it will be displayed here - - + = render "zero_authorized_projects" :javascript $(function(){ Pager.init(20); }); -- cgit v1.2.1 From ba74fa1413d3274f7a3282d7f59046beecb32912 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 3 Dec 2012 21:14:05 +0300 Subject: Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. --- .../stylesheets/gitlab_bootstrap/common.scss | 14 ----- app/assets/stylesheets/sections/projects.scss | 23 +++++++- app/controllers/admin/groups_controller.rb | 1 + app/controllers/admin/projects_controller.rb | 1 + app/views/admin/groups/_form.html.haml | 12 ---- app/views/admin/groups/edit.html.haml | 22 +++++++- app/views/admin/groups/index.html.haml | 6 +- app/views/admin/groups/show.html.haml | 64 +++++++++++++++++----- app/views/admin/projects/_form.html.haml | 5 +- app/views/dashboard/index.html.haml | 2 +- app/views/groups/show.html.haml | 2 +- 11 files changed, 101 insertions(+), 51 deletions(-) delete mode 100644 app/views/admin/groups/_form.html.haml diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index 9a4f2e80f87..d6089cea6dc 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -100,17 +100,3 @@ input[type='search'].search-text-input { } fieldset legend { font-size: 17px; } - -ul.nav.nav-projects-tabs { - @extend .nav-tabs; - - padding-left: 8px; - - li { - a { - padding: 4px 20px; - margin-top: 2px; - border-color: #DDD; - } - } -} diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index a230f296700..3f4b591a5dd 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -4,7 +4,6 @@ } .side { - @extend .span4; @extend .right; .groups_box, @@ -117,3 +116,25 @@ } } + +ul.nav.nav-projects-tabs { + @extend .nav-tabs; + + padding-left: 8px; + + li { + a { + padding: 4px 20px; + margin-top: 2px; + border-color: #DDD; + background-color: #EEE; + text-shadow: 0 1px 1px white; + color: #555; + } + &.active { + a { + font-weight: bold; + } + } + } +} diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 8a0a9e9b245..4fad8d2bdea 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -11,6 +11,7 @@ class Admin::GroupsController < AdminController @projects = Project.scoped @projects = @projects.not_in_group(@group) if @group.projects.present? @projects = @projects.all + @projects.reject!(&:empty_repo?) end def new diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index e61f94f8cf3..f8c2f2b2bf1 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -4,6 +4,7 @@ class Admin::ProjectsController < AdminController def index @projects = Project.scoped @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present? + @projects = @projects.where(namespace_id: nil) if params[:namespace_id] == Namespace.global_id @projects = @projects.search(params[:name]) if params[:name].present? @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20) end diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml deleted file mode 100644 index 67516eb26e3..00000000000 --- a/app/views/admin/groups/_form.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -= form_for [:admin, @group] do |f| - - if @group.errors.any? - .alert-message.block-message.error - %span= @group.errors.full_messages.first - .clearfix.group_name_holder - = f.label :name do - Group name is - .input - = f.text_field :name, placeholder: "Example Group", class: "xxlarge" - - .form-actions - = f.submit 'Save group', class: "btn save-btn" diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index 9904122c789..4026817496a 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -1,3 +1,19 @@ -%h3.page_title Edit Group -%br -= render 'form' +%h3.page_title Rename Group +%hr +.alert + Renaming group can have unintended side effects. + %br + Renaming group will rename directory for all related projects += form_for [:admin, @group] do |f| + - if @group.errors.any? + .alert-message.block-message.error + %span= @group.errors.full_messages.first + .clearfix.group_name_holder + = f.label :name do + Group name is + .input + = f.text_field :name, placeholder: "Example Group", class: "xxlarge" + + .form-actions + = f.submit 'Rename group', class: "btn save-btn" + = link_to 'Cancel', admin_groups_path, class: "btn cancel-btn" diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 952d515103c..455730a06c4 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -15,7 +15,6 @@ %th Name %th Path %th Projects - %th Edit %th.cred Danger Zone! - @groups.each do |group| @@ -23,6 +22,7 @@ %td= link_to group.name, [:admin, group] %td= group.path %td= group.projects.count - %td= link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small" - %td.bgred= link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger" + %td.bgred + = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small" + = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger" = paginate @groups, theme: "admin" diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index d371acadd15..4b6fedfd360 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -1,8 +1,5 @@ %h3.page_title Group: #{@group.name} - = link_to edit_admin_group_path(@group), class: "btn right" do - %i.icon-edit - Edit %br %table.zebra-striped @@ -16,6 +13,10 @@ Name: %td = @group.name +   + = link_to edit_admin_group_path(@group), class: "btn btn-small right" do + %i.icon-edit + Rename %tr %td %b @@ -28,24 +29,43 @@ Owner: %td = @group.owner_name -.ui-box - %h5 - Projects - %small - (#{@group.projects.count}) - %ul.unstyled + .right + = link_to "#", class: "btn btn-small change-owner-link" do + %i.icon-edit + Change owner + .change-owner-holder.hide + = form_for [:admin, @group] do |f| + = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'} + = f.submit 'Save', class: "btn btn-small save-btn" + = link_to "Cancel", "#", class: "btn btn-small change-owner-cancel-link" + +%fieldset + %legend Projects (#{@group.projects.count}) + %table + %thead + %tr + %th Project name + %th Path + %th Users + %th.cred Danger Zone! - @group.projects.each do |project| - %li.wll - %strong - = link_to project.name, [:admin, project] - .right - = link_to 'Remove from group', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Are you sure?', method: :delete, class: "btn danger small" - .clearfix + %tr + %td + = link_to project.name_with_namespace, [:admin, project] + %td + %span.monospace= project.path_with_namespace + ".git" + %td= project.users.count + %td.bgred + = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn danger small" = form_tag project_update_admin_group_path(@group), class: "bulk_import", method: :put do %fieldset %legend Move projects to group + .alert + You can move only projects with existing repos + %br + Group projects will be moved in group directory and will not be accessible by old path .clearfix = label_tag :project_ids do Projects @@ -53,3 +73,17 @@ = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' .form-actions = submit_tag 'Add', class: "btn primary" + +:javascript + $(function(){ + var modal = $('.change-owner-holder'); + $('.change-owner-link').bind("click", function(){ + $(this).hide(); + modal.show(); + }); + $('.change-owner-cancel-link').bind("click", function(){ + modal.hide(); + $('.change-owner-link').show(); + }) + }) + diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index e515c68c382..d306cfd84a7 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -22,7 +22,10 @@ - unless project.new_record? .clearfix = f.label :namespace_id - .input= f.select :namespace_id, namespaces_options(@project.namespace_id), {}, {class: 'chosen'} + .input + = f.select :namespace_id, namespaces_options(@project.namespace_id), {}, {class: 'chosen'} +   + %span.cred Be careful. Changing project namespace can have unintended side effects - if project.repo_exists? .clearfix diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 0b4c4844a7f..b64aa86cf73 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -2,7 +2,7 @@ .projects .activities.span8 = render 'activities' - .side + .side.span4 = render 'sidebar' - else diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index b929b267e8b..76bc2639d61 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -11,7 +11,7 @@ - else %p.nothing_here_message Projects activity will be displayed here .loading.hide - .side + .side.span4 = render "projects", projects: @projects %div %span.rss-icon -- cgit v1.2.1 From d8398921eb34fe7cee59df99ac4fffceca0c19fc Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 4 Dec 2012 15:22:22 +0200 Subject: Dont allow select block user as new team member --- app/controllers/admin/projects_controller.rb | 2 +- app/views/team_members/_form.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index f8c2f2b2bf1..4fea8709b70 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -10,7 +10,7 @@ class Admin::ProjectsController < AdminController end def show - @users = User.scoped + @users = User.active @users = @users.not_in_project(@project) if @project.users.present? @users = @users.all end diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml index 92167138081..e5d9a4a4b5e 100644 --- a/app/views/team_members/_form.html.haml +++ b/app/views/team_members/_form.html.haml @@ -11,7 +11,7 @@ %h6 1. Choose people you want in the team .clearfix = f.label :user_ids, "People" - .input= select_tag(:user_ids, options_from_collection_for_select(User.not_in_project(@project).all, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true}) + .input= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).all, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true}) %h6 2. Set access level for them .clearfix -- cgit v1.2.1 From 9acd7cf1bdc53fefe28b516e7e39523b866a8daa Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 4 Dec 2012 15:26:12 +0200 Subject: Show namespaces when adding projects to user in admin area --- app/views/admin/users/show.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 6a42f787bab..f9410161453 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -76,7 +76,7 @@ %th Project Access: %tr - %td= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' + %td= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' %td= select_tag :project_access, options_for_select(Project.access_options), class: "project-access-select chosen span3" %tr @@ -101,7 +101,7 @@ - @admin_user.users_projects.each do |tm| - project = tm.project %tr - %td= link_to project.name, admin_project_path(project) + %td= link_to project.name_with_namespace, admin_project_path(project) %td= tm.project_access_human %td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small" %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn small danger" -- cgit v1.2.1 From 107a4e386a84484f2d966f95416d8fe2a99ce0c2 Mon Sep 17 00:00:00 2001 From: skarphet Date: Tue, 4 Dec 2012 19:19:26 +0100 Subject: Devise locale updated to stay consistent with GitLab --- config/locales/devise.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index a78cb6b670b..3b763cf410d 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -14,7 +14,7 @@ en: devise: failure: already_authenticated: 'You are already signed in.' - unauthenticated: 'You need to sign in or sign up before continuing.' + unauthenticated: 'You need to sign in before continuing.' unconfirmed: 'You have to confirm your account before continuing.' locked: 'Your account is locked.' invalid: 'Invalid email or password.' -- cgit v1.2.1 From 2a1c5cdf99e943950af7630742299222a591827c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 4 Dec 2012 22:06:55 +0200 Subject: Only owner of current namespace can change project namespace --- app/contexts/project_update_context.rb | 2 +- app/models/ability.rb | 10 +++++----- app/views/projects/_form.html.haml | 12 +++++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/contexts/project_update_context.rb b/app/contexts/project_update_context.rb index e28d43d0e81..90ced7600ed 100644 --- a/app/contexts/project_update_context.rb +++ b/app/contexts/project_update_context.rb @@ -2,7 +2,7 @@ class ProjectUpdateContext < BaseContext def execute(role = :default) namespace_id = params[:project].delete(:namespace_id) - if namespace_id.present? + if can?(current_user, :change_namespace, project) && namespace_id.present? if namespace_id == Namespace.global_id if project.namespace.present? # Transfer to global namespace from anyone diff --git a/app/models/ability.rb b/app/models/ability.rb index b09899f17dc..cffb6e4277b 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -17,9 +17,7 @@ class Ability # Rules based on role in project if project.master_access_for?(user) - # TODO: replace with master rules. - # Only allow project administration for namespace owners - rules << project_admin_rules + rules << project_master_rules elsif project.dev_access_for?(user) rules << project_dev_rules @@ -93,13 +91,15 @@ class Ability :admin_merge_request, :admin_note, :accept_mr, - :admin_wiki + :admin_wiki, + :admin_project ] end def project_admin_rules project_master_rules + [ - :admin_project + :change_namespace, + :rename_project ] end diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 9bb411ada3e..879f1073f01 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -21,9 +21,15 @@ = f.label :namespace_id do %span Namespace .controls - = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} -   - %span.cred Be careful. Changing project namespace can have unintended side effects + - if can? current_user, :change_namespace, @project + = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} +   + %span.cred Be careful. Changing project namespace can have unintended side effects + - else + %a.btn.btn-small.disabled= @project.namespace.try(:human_name) || "/" +   + %span.cred Only owner can change project namespace. + - unless @project.heads.empty? .clearfix -- cgit v1.2.1 From e376f3150736e7936082529a3f6c92395f4c9720 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 4 Dec 2012 22:48:24 +0200 Subject: Admin can move project to ANY namespace. Updated permissions page --- app/contexts/project_update_context.rb | 4 +- app/models/ability.rb | 3 +- app/views/admin/projects/_form.html.haml | 2 +- app/views/help/permissions.html.haml | 112 ++++++++++++++++--------------- 4 files changed, 64 insertions(+), 57 deletions(-) diff --git a/app/contexts/project_update_context.rb b/app/contexts/project_update_context.rb index 90ced7600ed..5b77d0a7964 100644 --- a/app/contexts/project_update_context.rb +++ b/app/contexts/project_update_context.rb @@ -2,7 +2,9 @@ class ProjectUpdateContext < BaseContext def execute(role = :default) namespace_id = params[:project].delete(:namespace_id) - if can?(current_user, :change_namespace, project) && namespace_id.present? + allowed_transfer = can?(current_user, :change_namespace, project) || role == :admin + + if allowed_transfer && namespace_id.present? if namespace_id == Namespace.global_id if project.namespace.present? # Transfer to global namespace from anyone diff --git a/app/models/ability.rb b/app/models/ability.rb index cffb6e4277b..2d80c6720b7 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -99,7 +99,8 @@ class Ability def project_admin_rules project_master_rules + [ :change_namespace, - :rename_project + :rename_project, + :remove_project ] end diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index d306cfd84a7..d90d4a03d67 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -23,7 +23,7 @@ .clearfix = f.label :namespace_id .input - = f.select :namespace_id, namespaces_options(@project.namespace_id), {}, {class: 'chosen'} + = f.select :namespace_id, namespaces_options(@project.namespace_id, :all), {}, {class: 'chosen'}   %span.cred Be careful. Changing project namespace can have unintended side effects diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index f9287fa0996..cf8ce9c5560 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -4,61 +4,65 @@ ← to index %hr -.row - .ui-box.span2 - %h5 Guest - %ul.unstyled - %li Create new issue - %li Leave comments - %li Write on project wall +%fieldset + %legend Guest + %ul + %li Create new issue + %li Leave comments + %li Write on project wall - .ui-box.span3 - %h5 Reporter - %ul.unstyled - %li Create new issue - %li Leave comments - %li Write on project wall - %li Pull project code - %li Download project - %li Create new merge request - %li Create a code snippets +%fieldset + %legend Reporter + %ul + %li Create new issue + %li Leave comments + %li Write on project wall + %li Pull project code + %li Download project + %li Create new merge request + %li Create a code snippets - .ui-box.span3 - %h5 Developer - %ul.unstyled - %li Create new issue - %li Leave comments - %li Write on project wall - %li Pull project code - %li Download project - %li Create new merge request - %li Create a code snippets - %li Create new branches - %li Push to non-protected branches - %li Remove non-protected branches - %li Add tags - %li Write a wiki +%fieldset + %legend Developer + %ul + %li Create new issue + %li Leave comments + %li Write on project wall + %li Pull project code + %li Download project + %li Create new merge request + %li Create a code snippets + %li Create new branches + %li Push to non-protected branches + %li Remove non-protected branches + %li Add tags + %li Write a wiki - .ui-box.span3 - %h5 Master - %ul.unstyled - %li Create new issue - %li Leave comments - %li Write on project wall - %li Pull project code - %li Download project - %li Create new merge request - %li Create a code snippets - %li Create new branches - %li Push to non-protected branches - %li Remove non-protected branches - %li Add tags - %li Write a wiki - %li Add new team members - %li Push to protected branches - %li Remove protected branches - %li Push with force option - %li Edit project - %li Add Deploy Keys to project - %li Configure Project Hooks +%fieldset + %legend Master + %ul + %li Create new issue + %li Leave comments + %li Write on project wall + %li Pull project code + %li Download project + %li Create new merge request + %li Create a code snippets + %li Create new branches + %li Push to non-protected branches + %li Remove non-protected branches + %li Add tags + %li Write a wiki + %li Add new team members + %li Push to protected branches + %li Remove protected branches + %li Push with force option + %li Edit project + %li Add Deploy Keys to project + %li Configure Project Hooks + +%fieldset + %legend Owner + %ul + %li Transfer project to another namespace -- cgit v1.2.1 From 61140b71cdc74ee3d9e31bfb62e44fa941b465d3 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Wed, 5 Dec 2012 01:19:58 +0100 Subject: overflow: auto so content won't break layout #1612 --- app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index ecd6cf7e4e8..2969e8bb26d 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -31,7 +31,7 @@ .middle_box_content, .bottom_box_content { padding: 15px; - + overflow: auto; pre { background: none !important; margin: 0; -- cgit v1.2.1 From 2519fd8376ba3ecf674bade735fbd4d31238f01c Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 02:14:08 +0100 Subject: Update pygments.rb Fixes #1774 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 25a3fa076d9..c899c510414 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: gem "gitolite", '1.1.0' # Syntax highlighter -gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", ref: '4db80c599067e2d5f23c5c243bf85b8ca0368ad4' +gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: "master" # Language detection gem "github-linguist", "~> 2.3.4" , require: "linguist" diff --git a/Gemfile.lock b/Gemfile.lock index 8242c3c703a..b4eced37182 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,8 +45,8 @@ GIT GIT remote: https://github.com/gitlabhq/pygments.rb.git - revision: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4 - ref: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4 + revision: db1da0343adf86b49bdc3add04d02d2e80438d38 + branch: master specs: pygments.rb (0.3.2) posix-spawn (~> 0.3.6) -- cgit v1.2.1 From 6ea6ab7c8d152ce17f6321a984a213b17d7f5e7e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 2 Dec 2012 08:41:06 +0300 Subject: Restyled services page in order to make it more usable --- app/assets/images/service-disabled-gitlab-ci.png | Bin 2178 -> 0 bytes app/assets/images/service-gitlab-ci.png | Bin 2393 -> 0 bytes app/views/services/_gitlab_ci.html.haml | 19 +++++++----- app/views/services/index.html.haml | 36 +++++++++++++++-------- 4 files changed, 35 insertions(+), 20 deletions(-) delete mode 100644 app/assets/images/service-disabled-gitlab-ci.png delete mode 100644 app/assets/images/service-gitlab-ci.png diff --git a/app/assets/images/service-disabled-gitlab-ci.png b/app/assets/images/service-disabled-gitlab-ci.png deleted file mode 100644 index 8d1f9d0b50d..00000000000 Binary files a/app/assets/images/service-disabled-gitlab-ci.png and /dev/null differ diff --git a/app/assets/images/service-gitlab-ci.png b/app/assets/images/service-gitlab-ci.png deleted file mode 100644 index bcb30a3fb1a..00000000000 Binary files a/app/assets/images/service-gitlab-ci.png and /dev/null differ diff --git a/app/views/services/_gitlab_ci.html.haml b/app/views/services/_gitlab_ci.html.haml index 4c1ec5bc348..09d139c0d2c 100644 --- a/app/views/services/_gitlab_ci.html.haml +++ b/app/views/services/_gitlab_ci.html.haml @@ -1,16 +1,19 @@ %h3.page_title - Services → GitLab CI Integration - + GitLab CI + %small Continuous integration server from GitLab .right - .thumbnail - - if @service.active - = image_tag 'service-gitlab-ci.png', class: 'small' - - else - = image_tag 'service-disabled-gitlab-ci.png', class: 'small' + - if @service.active + %small.cgreen Enabled + - else + %small.btn Disabled -%hr +.back_link + = link_to project_services_path(@project) do + ← to services + +%hr = form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f| - if @service.errors.any? .alert-message.block-message.error diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 3894fcee369..65e94383da3 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -1,15 +1,27 @@ = render "projects/project_head" %h3.page_title Services -%hr - -.row - .span6 - .padded - %p.slead Continuous integration server from GitLab - .thumbnail.left - = link_to edit_project_service_path(@project, :gitlab_ci) do - - if @gitlab_ci_service.try :active - = image_tag 'service-gitlab-ci.png' - - else - = image_tag 'service-disabled-gitlab-ci.png' +%br +%ul.unstyled.ui-box + %li.wll + %h4 + = link_to edit_project_service_path(@project, :gitlab_ci) do + GitLab CI + %small Continuous integration server from GitLab + .right + - if @gitlab_ci_service.active + %small.cgreen Enabled + - else + %small.btn Disabled + %li.wll + %h4 + Jenkins CI + %small An extendable open source continuous integration server + .right + %small Not implemented yet + %li.wll + %h4 + Campfire + %small Web-based group chat tool + .right + %small Not implemented yet -- cgit v1.2.1 From cc0295b789a89a3f52e83e34b08ddf17b464308a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 5 Dec 2012 06:14:05 +0300 Subject: Only owner can remove project --- app/controllers/application_controller.rb | 4 ++++ app/controllers/projects_controller.rb | 2 ++ app/views/help/permissions.html.haml | 1 + app/views/projects/_form.html.haml | 7 ++++--- app/views/services/_gitlab_ci.html.haml | 2 +- app/views/services/index.html.haml | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5735c1d2916..75cd8f15605 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -112,6 +112,10 @@ class ApplicationController < ActionController::Base render file: Rails.root.join("public", "404"), layout: false, status: "404" end + def render_403 + render file: Rails.root.join("public", "403"), layout: false, status: "403" + end + def require_non_empty_project redirect_to @project if @project.empty_repo? end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a6e7f1f93fb..272a6e95411 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -89,6 +89,8 @@ class ProjectsController < ProjectResourceController end def destroy + return access_denied! unless can?(current_user, :remove_project, project) + # Disable the UsersProject update_repository call, otherwise it will be # called once for every person removed from the project UsersProject.skip_callback(:destroy, :after, :update_repository) diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index cf8ce9c5560..c9ec701add7 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -66,3 +66,4 @@ %legend Owner %ul %li Transfer project to another namespace + %li Remove project diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 879f1073f01..448293ca080 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -26,7 +26,7 @@   %span.cred Be careful. Changing project namespace can have unintended side effects - else - %a.btn.btn-small.disabled= @project.namespace.try(:human_name) || "/" + %a.btn.disabled= @project.namespace.try(:human_name) || "/"   %span.cred Only owner can change project namespace. @@ -69,5 +69,6 @@ = f.submit 'Save', class: "btn save-btn" = link_to 'Cancel', @project, class: "btn" - unless @project.new_record? - .right - = link_to 'Remove', @project, confirm: 'Are you sure?', method: :delete, class: "btn danger" + - if can?(current_user, :remove_project, @project) + .right + = link_to 'Remove', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn danger" diff --git a/app/views/services/_gitlab_ci.html.haml b/app/views/services/_gitlab_ci.html.haml index 09d139c0d2c..649c5cc4c3c 100644 --- a/app/views/services/_gitlab_ci.html.haml +++ b/app/views/services/_gitlab_ci.html.haml @@ -5,7 +5,7 @@ - if @service.active %small.cgreen Enabled - else - %small.btn Disabled + %small.cgray Disabled diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 65e94383da3..81599ec7c3f 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -12,7 +12,7 @@ - if @gitlab_ci_service.active %small.cgreen Enabled - else - %small.btn Disabled + %small.cgray Disabled %li.wll %h4 Jenkins CI -- cgit v1.2.1 From 674efd38d83d6f805d2ed9637028d195470b309b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 5 Dec 2012 14:17:40 +0200 Subject: Fix 500 error on services page. Fixed active project tab when on services --- app/helpers/tab_helper.rb | 2 +- app/views/services/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb index a4bec87caa7..d52d8af6641 100644 --- a/app/helpers/tab_helper.rb +++ b/app/helpers/tab_helper.rb @@ -72,7 +72,7 @@ module TabHelper return "active" if current_page?(controller: "projects", action: action, id: @project) end - if ['snippets', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name + if ['snippets', 'services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name "active" end end diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 81599ec7c3f..ae3dbef97ad 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -9,7 +9,7 @@ GitLab CI %small Continuous integration server from GitLab .right - - if @gitlab_ci_service.active + - if @gitlab_ci_service.try(:active) %small.cgreen Enabled - else %small.cgray Disabled -- cgit v1.2.1 From a350b52c9b621a5f37b27f8ca6cfc424ff573425 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 5 Dec 2012 17:06:15 +0200 Subject: Rewrite project security model tests --- app/models/project.rb | 12 +++++ spec/models/project_security_spec.rb | 93 +++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 11 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 74d981f26d6..372b94d2066 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -36,6 +36,10 @@ class Project < ActiveRecord::Base # Relations belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'" belongs_to :namespace + + # TODO: replace owner with creator. + # With namespaces a project owner will be a namespace owner + # so this field makes sense only for global projects belongs_to :owner, class_name: "User" has_many :users, through: :users_projects has_many :events, dependent: :destroy @@ -296,4 +300,12 @@ class Project < ActiveRecord::Base def namespace_owner namespace.try(:owner) end + + def chief + if namespace + namespace_owner + else + owner + end + end end diff --git a/spec/models/project_security_spec.rb b/spec/models/project_security_spec.rb index 60f8d45c9c8..92c6bce08f6 100644 --- a/spec/models/project_security_spec.rb +++ b/spec/models/project_security_spec.rb @@ -4,38 +4,109 @@ describe Project do describe :authorization do before do @p1 = create(:project) + @u1 = create(:user) @u2 = create(:user) + @u3 = create(:user) + @u4 = @p1.chief + @abilities = Six.new @abilities << Ability end - describe "read access" do + let(:guest_actions) { Ability.project_guest_rules } + let(:report_actions) { Ability.project_report_rules } + let(:dev_actions) { Ability.project_dev_rules } + let(:master_actions) { Ability.project_master_rules } + let(:admin_actions) { Ability.project_admin_rules } + + describe "Non member rules" do + it "should deny for non-project users any actions" do + admin_actions.each do |action| + @abilities.allowed?(@u1, action, @p1).should be_false + end + end + end + + describe "Guest Rules" do + before do + @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::GUEST) + end + + it "should allow for project user any guest actions" do + guest_actions.each do |action| + @abilities.allowed?(@u2, action, @p1).should be_true + end + end + end + + describe "Report Rules" do before do @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::REPORTER) end - it { @abilities.allowed?(@u1, :read_project, @p1).should be_false } - it { @abilities.allowed?(@u2, :read_project, @p1).should be_true } + it "should allow for project user any report actions" do + report_actions.each do |action| + @abilities.allowed?(@u2, action, @p1).should be_true + end + end end - describe "write access" do + describe "Developer Rules" do + before do + @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::REPORTER) + @p1.users_projects.create(project: @p1, user: @u3, project_access: UsersProject::DEVELOPER) + end + + it "should deny for developer master-specific actions" do + [dev_actions - report_actions].each do |action| + @abilities.allowed?(@u2, action, @p1).should be_false + end + end + + it "should allow for project user any dev actions" do + dev_actions.each do |action| + @abilities.allowed?(@u3, action, @p1).should be_true + end + end + end + + describe "Master Rules" do before do @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::DEVELOPER) + @p1.users_projects.create(project: @p1, user: @u3, project_access: UsersProject::MASTER) end - it { @abilities.allowed?(@u1, :write_project, @p1).should be_false } - it { @abilities.allowed?(@u2, :write_project, @p1).should be_true } + it "should deny for developer master-specific actions" do + [master_actions - dev_actions].each do |action| + @abilities.allowed?(@u2, action, @p1).should be_false + end + end + + it "should allow for project user any master actions" do + master_actions.each do |action| + @abilities.allowed?(@u3, action, @p1).should be_true + end + end end - describe "admin access" do + describe "Admin Rules" do before do - @p1.users_projects.create(project: @p1, user: @u1, project_access: UsersProject::DEVELOPER) - @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::MASTER) + @p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::DEVELOPER) + @p1.users_projects.create(project: @p1, user: @u3, project_access: UsersProject::MASTER) end - it { @abilities.allowed?(@u1, :admin_project, @p1).should be_false } - it { @abilities.allowed?(@u2, :admin_project, @p1).should be_true } + it "should deny for masters admin-specific actions" do + [admin_actions - master_actions].each do |action| + @abilities.allowed?(@u2, action, @p1).should be_false + end + end + + it "should allow for project owner any admin actions" do + admin_actions.each do |action| + @abilities.allowed?(@u4, action, @p1).should be_true + end + end end end end -- cgit v1.2.1 From 4c3cdfa4fffb221d797e35913361bedbe1060d44 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 5 Dec 2012 17:08:24 +0200 Subject: Make profile dropbown a bit bigger --- app/assets/stylesheets/sections/header.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 4171c00ab8b..1efe23a127f 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -172,7 +172,7 @@ header { display: none; z-index: 100000; @include border-radius(4px); - width: 100px; + width: 130px; position: absolute; right: 5px; top: 38px; @@ -181,7 +181,7 @@ header { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); a { color: #fff; - padding: 7px 10px; + padding: 12px 15px; display: block; text-shadow: none; border-bottom: 1px solid #666; @@ -204,8 +204,8 @@ header { } &:last-child { @include border-radius(0 0 5px 5px); - border-bottom: 0; - } + border-bottom: 0; + } } -- cgit v1.2.1 From d1e31bfce96e4d385c1441c43f7d5ec3552731fe Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 17:38:54 +0100 Subject: Remove generic database.yml.example --- config/database.yml.example | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 config/database.yml.example diff --git a/config/database.yml.example b/config/database.yml.example deleted file mode 100644 index c5a2b8d605b..00000000000 --- a/config/database.yml.example +++ /dev/null @@ -1,39 +0,0 @@ -# -# PRODUCTION -# -production: - adapter: mysql2 - encoding: utf8 - reconnect: false - database: gitlabhq_production - pool: 5 - username: root - password: "secure password" - # host: localhost - # socket: /tmp/mysql.sock - -# -# Development specific -# -development: - adapter: mysql2 - encoding: utf8 - reconnect: false - database: gitlabhq_development - pool: 5 - username: root - password: "secure password" - # socket: /tmp/mysql.sock - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: &test - adapter: mysql2 - encoding: utf8 - reconnect: false - database: gitlabhq_test - pool: 5 - username: root - password: "secure password" - # socket: /tmp/mysql.sock -- cgit v1.2.1 From 95ffe08674787b21172e38f9e1a4b47309c56418 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 17:53:24 +0100 Subject: Update database setup instructions to be more consistent --- doc/install/databases.md | 50 ++++++++++++++++++++++++++------------------- doc/install/installation.md | 24 ++-------------------- 2 files changed, 31 insertions(+), 43 deletions(-) diff --git a/doc/install/databases.md b/doc/install/databases.md index 1a6f739ecdc..1e714d793be 100644 --- a/doc/install/databases.md +++ b/doc/install/databases.md @@ -1,47 +1,63 @@ -# Databases: +# Setup Database -GitLab use MySQL as default database but you are free to use PostgreSQL. +GitLab supports the following databases: + +* MySQL (preferred) +* PostgreSQL ## MySQL + # Install the database packages sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev + # Install only the necessary gems + sudo -u gitlab -H bundle install --deployment --without development test postgres + # Login to MySQL $ mysql -u root -p + # Create a user for GitLab. (change $password to a real password) + mysql> CREATE USER 'gitlab'@'localhost' IDENTIFIED BY '$password'; + # Create the GitLab production database mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; - # Create the MySQL User change $password to a real password - mysql> CREATE USER 'gitlab'@'localhost' IDENTIFIED BY '$password'; - - # Grant proper permissions to the MySQL User + # Grant the GitLab user necessary permissopns on the table. mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'gitlab'@'localhost'; + # Quit the database session + mysql> \q + + # Try connecting to the new database with the new user + sudo -u gitlab -H mysql -u gitlab -p -D gitlabhq_production ## PostgreSQL + # Install the database packages sudo apt-get install -y postgresql-9.1 postgresql-server-dev-9.1 - # Connect to database server + # Install only the necessary gems + sudo -u gitlab -H bundle install --deployment --without development test mysql + + # Login to PostgreSQL sudo -u postgres psql -d template1 - # Add a user called gitlab. Change $password to a real password + # Create a user for GitLab. (change $password to a real password) template1=# CREATE USER gitlab WITH PASSWORD '$password'; # Create the GitLab production database & grant all privileges on database template1=# CREATE DATABASE gitlabhq_production OWNER gitlab; - # Quit from PostgreSQL server + # Quit the database session template1=# \q - # Try connect to new database - sudo -u gitlab psql -d gitlabhq_production + # Try connecting to the new database with the new user + sudo -u gitlab -H psql -d gitlabhq_production -#### Select the database you want to use +# Configure GitLab # Mysql sudo -u gitlab cp config/database.yml.mysql config/database.yml @@ -49,12 +65,4 @@ GitLab use MySQL as default database but you are free to use PostgreSQL. # PostgreSQL sudo -u gitlab cp config/database.yml.postgresql config/database.yml - # make sure to update username/password in config/database.yml - -#### Install gems - - # mysql - sudo -u gitlab -H bundle install --without development test postgres --deployment - - # or postgres - sudo -u gitlab -H bundle install --without development test mysql --deployment +Make sure to update username/password in config/database.yml. diff --git a/doc/install/installation.md b/doc/install/installation.md index 6876a8756b1..2702aa899a1 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -122,21 +122,9 @@ Check the [Trouble Shooting Guide](https://github.com/gitlabhq/gitlab-public-wik and ensure you have followed all of the above steps carefully. -# 5. Mysql database +# 5. Database - sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev - - # Login to MySQL - $ mysql -u root -p - - # Create the GitLab production database - mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; - - # Create the MySQL User change $password to a real password - mysql> CREATE USER 'gitlab'@'localhost' IDENTIFIED BY '$password'; - - # Grant proper permissions to the MySQL User - mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON `gitlabhq_production`.* TO 'gitlab'@'localhost'; +See doc/install/databases.md # 6. GitLab @@ -162,12 +150,6 @@ and ensure you have followed all of the above steps carefully. # sudo -u gitlab cp config/gitlab.yml.example config/gitlab.yml - # Copy mysql db config - # - # make sure to update username/password in config/database.yml - # - sudo -u gitlab cp config/database.yml.mysql config/database.yml - # Copy unicorn config # sudo -u gitlab cp config/unicorn.rb.example config/unicorn.rb @@ -269,8 +251,6 @@ You can login via web using admin generated with setup: # Advanced setup tips: -_Checkout databases.md for PostgreSQL_ - ## Customizing Resque's Redis connection If you'd like Resque to connect to a Redis server on a non-standard port or on -- cgit v1.2.1 From 78d3611eba515beb85b86c1fc238cbbdbb1bc02f Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 18:18:09 +0100 Subject: Remove redundant packages and move database specific ones to the db setup * build-essential requires make, gcc * remove libmysql++-dev: the mysql2 gem only requires libmysqlclient-dev * remove postgresql-server-dev-9.1: the pg gem only requires libpq-dev * replace python-dev, python-pip with python2.7: the pygments.rb gem only requires python2.7 --- doc/install/databases.md | 2 +- doc/install/installation.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/install/databases.md b/doc/install/databases.md index 1e714d793be..92011647f11 100644 --- a/doc/install/databases.md +++ b/doc/install/databases.md @@ -35,7 +35,7 @@ GitLab supports the following databases: ## PostgreSQL # Install the database packages - sudo apt-get install -y postgresql-9.1 postgresql-server-dev-9.1 + sudo apt-get install -y postgresql-9.1 libpq-dev # Install only the necessary gems sudo -u gitlab -H bundle install --deployment --without development test mysql diff --git a/doc/install/installation.md b/doc/install/installation.md index 2702aa899a1..0c4cbf3c337 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -44,7 +44,7 @@ Now install the required packages: sudo apt-get update sudo apt-get upgrade - sudo apt-get install -y wget curl gcc checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev libicu-dev redis-server openssh-server git-core python-dev python-pip libyaml-dev postfix libpq-dev + sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core python2.7 libyaml-dev postfix sudo pip install pygments -- cgit v1.2.1 From 7591718ef206fcf3f0c4380b2d8928e1258d37a0 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 18:21:28 +0100 Subject: Consistently use sudo -u foo -H --- doc/install/installation.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 0c4cbf3c337..09a47a19324 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -83,21 +83,21 @@ Add your users to groups: Generate key: - sudo -H -u gitlab ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa + sudo -u gitlab -H ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa # 4. Gitolite Clone GitLab's fork of the Gitolite source code: - sudo -H -u git git clone -b gl-v304 https://github.com/gitlabhq/gitolite.git /home/git/gitolite + sudo -u git -H git clone -b gl-v304 https://github.com/gitlabhq/gitolite.git /home/git/gitolite Setup: cd /home/git sudo -u git -H mkdir bin - sudo -u git sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" >> /home/git/.profile' - sudo -u git sh -c 'gitolite/install -ln /home/git/bin' + sudo -u git -H sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" >> /home/git/.profile' + sudo -u git -H sh -c 'gitolite/install -ln /home/git/bin' sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub sudo chmod 0444 /home/git/gitlab.pub @@ -107,7 +107,7 @@ Setup: Permissions: - sudo chmod -R g+rwX /home/git/repositories/ + sudo chmod -R ug+rwXs /home/git/repositories/ sudo chown -R git:git /home/git/repositories/ # clone admin repo to add localhost to known_hosts @@ -135,11 +135,11 @@ See doc/install/databases.md #### Get source code # Get gitlab code. Use this for stable setup - sudo -H -u gitlab git clone -b stable https://github.com/gitlabhq/gitlabhq.git gitlab + sudo -u gitlab -H git clone -b stable https://github.com/gitlabhq/gitlabhq.git gitlab # Skip this for stable setup. # Master branch (recent changes, less stable) - sudo -H -u gitlab git clone -b master https://github.com/gitlabhq/gitlabhq.git gitlab + sudo -u gitlab -H git clone -b master https://github.com/gitlabhq/gitlabhq.git gitlab #### Copy configs @@ -148,11 +148,11 @@ See doc/install/databases.md # Rename config files # - sudo -u gitlab cp config/gitlab.yml.example config/gitlab.yml + sudo -u gitlab -H cp config/gitlab.yml.example config/gitlab.yml # Copy unicorn config # - sudo -u gitlab cp config/unicorn.rb.example config/unicorn.rb + sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb #### Install gems @@ -172,7 +172,7 @@ Git requires a username and email in order to be able to do that. #### Setup application - sudo -u gitlab bundle exec rake gitlab:app:setup RAILS_ENV=production + sudo -u gitlab -H bundle exec rake gitlab:app:setup RAILS_ENV=production #### Setup GitLab hooks @@ -184,7 +184,7 @@ Git requires a username and email in order to be able to do that. Checking status: - sudo -u gitlab bundle exec rake gitlab:app:status RAILS_ENV=production + sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production # OUTPUT EXAMPLE -- cgit v1.2.1 From 198e93ccf2b880d9dba52240dc8759b930b4ebf3 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 19:31:08 +0100 Subject: Update hardware and platform requirements guide --- doc/install/installation.md | 5 +++-- doc/install/requirements.md | 52 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 09a47a19324..f531baf9744 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -1,6 +1,7 @@ -_This installation guide created for Debian/Ubuntu and properly tested._ +This installation guide was created for Debian/Ubuntu and tested on it. + +Please read doc/install/requirements.md for hardware andplatform requirements. -_Checkout requirements before setup_ ### IMPORTANT diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 75b02d6456f..ec5b013c5d8 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -1,28 +1,56 @@ -## Platform requirements: +# Hardware -**The project is designed for the Linux operating system.** +We recommend you to run GitLab on a server with at least 1GB RAM. -It may work on FreeBSD and Mac OS, but we don't test our application for these systems and can't guarantee stability and full functionality. +The necessary hard disk space largely depends on the size of the repos you want +to use GitLab with. But as a *rule of thumb* you should have at least as much +free space as your all repos combined take up. -We officially support (recent versions of) these Linux distributions: + + +# Operating Systems + +## Linux + +GitLab is developed for the Linux operating system. + +GitLab officially supports (recent versions of) these Linux distributions: - Ubuntu Linux - Debian/GNU Linux -It should work on: +It should also work on (though they are not officially supported): +- Arch +- CentOS - Fedora -- CentOs +- Gentoo - RedHat -You might have some luck using these, but no guarantees: +## Other Unix Systems + +There is nothing that prevents GitLab from running on other Unix operating +systems. This means you may get it to work on systems running FreeBSD or OS X. +**If you want to try, please proceed with caution!** + +## Windows + +GitLab does **not** run on Windows and we have no plans of supporting it in the +near future. + + + +# Rubies -- FreeBSD will likely work, see https://github.com/gitlabhq/gitlabhq/issues/796 -- MacOS X will likely work, see https://groups.google.com/forum/#!topic/gitlabhq/5IXHbPkjKLA +GitLab requires Ruby (MRI) 1.9.3 and several Gems with native components. +While it is generally possible to use other Rubies (like +[JRuby](http://jruby.org/) or [Rubinius](http://rubini.us/)) it might require +some work on your part. -GitLab does **not** run on Windows and we have no plans of making GitLab compatible. -## Hardware: +# Installation troubles and reporting success or failure -We recommend to use server with at least 1GB RAM for gitlab instance. +If you have troubles installing GitLab following the official installation guide +or want to share your experience installing GitLab on a not officially supported +platform, please follow the the contribution guide (see CONTRIBUTING.md). -- cgit v1.2.1 From 4af26f66f87fb77487c9955e58826344af6d3f66 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 20:34:11 +0100 Subject: Update installation guide --- doc/install/installation.md | 228 +++++++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 108 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index f531baf9744..ac6615a987a 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -3,87 +3,75 @@ This installation guide was created for Debian/Ubuntu and tested on it. Please read doc/install/requirements.md for hardware andplatform requirements. - -### IMPORTANT - -Please make sure you have followed all the steps below before posting to the mailing list with installation and configuration questions. - -Only create a GitHub Issue if you want a specific part of this installation guide updated. - -Also read the [Read this before you submit an issue](https://github.com/gitlabhq/gitlabhq/wiki/Read-this-before-you-submit-an-issue) wiki page. +**Important Note** +The following steps have been known to work. +If you deviate from this guide, do it with caution and make sure you don't +violate any assumptions GitLab makes about its environment. +If you find a bug/error in this guide please an issue or pull request following +the contribution guide (see CONTRIBUTING.md). - - - -# Basic setup +# Overview -The basic installation will provide you a GitLab setup with options: +The GitLab installation consists of setting up th following components: -1. ruby 1.9.3 -2. mysql as main db -3. gitolite v3 fork by gitlab -4. nginx + unicorn - -The installation consists of next steps: - -1. Packages / dependencies +1. Packages / Dependencies 2. Ruby -3. Users +3. System Users 4. Gitolite -5. Mysql -6. GitLab. -7. Nginx +5. Database +6. GitLab +7. Nginx -# 1. Packages / dependencies +# 1. Packages / Dependencies *Keep in mind that `sudo` is not installed on Debian by default. You should install it as root:* apt-get update && apt-get upgrade && apt-get install sudo -Now install the required packages: +Make sure your system is up-to-date: sudo apt-get update sudo apt-get upgrade - sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core python2.7 libyaml-dev postfix +Install the required packages: - sudo pip install pygments + sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core python2.7 libyaml-dev postfix -# 2. Install Ruby +# 2. Ruby - wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz - tar xfvz ruby-1.9.3-p194.tar.gz - cd ruby-1.9.3-p194 + wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p327.tar.gz + tar xfvz ruby-1.9.3-p327.tar.gz + cd ruby-1.9.3-p327 ./configure make sudo make install -# 3. Users -Create user for git: +# 3. System Users + +Create a user for Git and Gitolite: sudo adduser \ --system \ --shell /bin/sh \ - --gecos 'git version control' \ + --gecos 'Git Version Control' \ --group \ --disabled-password \ --home /home/git \ git -Create user for GitLab: - - # ubuntu/debian - sudo adduser --disabled-login --gecos 'gitlab system' gitlab +Create a user for GitLab: -Add your users to groups: + sudo adduser --disabled-login --gecos 'GitLab' gitlab - sudo usermod -a -G git gitlab - sudo usermod -a -G gitlab git - -Generate key: + # Add it to the git group + sudo addmod -a -G git gitlab + # Generate the SSH key sudo -u gitlab -H ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa @@ -93,34 +81,43 @@ Clone GitLab's fork of the Gitolite source code: sudo -u git -H git clone -b gl-v304 https://github.com/gitlabhq/gitolite.git /home/git/gitolite -Setup: +Setup Gitolite with GitLab as its admin: + +**Important Note** +GitLab assumes *full and unshared* control over this Gitolite installation. + # Add Gitolite scripts to $PATH cd /home/git sudo -u git -H mkdir bin sudo -u git -H sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" >> /home/git/.profile' sudo -u git -H sh -c 'gitolite/install -ln /home/git/bin' + # Copy the gitlab user's (public) SSH key ... sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub sudo chmod 0444 /home/git/gitlab.pub + # ... and use it as the Gitolite admin key for setup sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub" - -Permissions: +Fix the directory permissions for the repository: + # Make sure the repositories dir is owned by git and it stays that way sudo chmod -R ug+rwXs /home/git/repositories/ sudo chown -R git:git /home/git/repositories/ - # clone admin repo to add localhost to known_hosts - # & be sure your user has access to gitolite +## Test if everything works so far + + # Clone the admin repo so SSH adds localhost to known_hosts ... + # ... and to be sure your users have access to Gitolite sudo -u gitlab -H git clone git@localhost:gitolite-admin.git /tmp/gitolite-admin - # if succeed you can remove it + # If it succeeded without errors you can remove the cloned repo sudo rm -rf /tmp/gitolite-admin -**IMPORTANT! If you can't clone `gitolite-admin` repository - DO NOT PROCEED WITH INSTALLATION** +**Impornant Note** +If you can't clone the `gitolite-admin` repository: **DO NOT PROCEED WITH INSTALLATION** Check the [Trouble Shooting Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) -and ensure you have followed all of the above steps carefully. +and make sure you have followed all of the above steps carefully. # 5. Database @@ -130,135 +127,150 @@ See doc/install/databases.md # 6. GitLab + We'll install GitLab into the gitlab user's home directory cd /home/gitlab +## Clone the Source -#### Get source code - - # Get gitlab code. Use this for stable setup + # Clone the latest stable release sudo -u gitlab -H git clone -b stable https://github.com/gitlabhq/gitlabhq.git gitlab - # Skip this for stable setup. - # Master branch (recent changes, less stable) - sudo -u gitlab -H git clone -b master https://github.com/gitlabhq/gitlabhq.git gitlab +**Note*** +You can change `stable` to `master` if you want the *bleeding edge* version, but +do so with caution! +## Configure it -#### Copy configs - - cd gitlab + cd /home/gitlab/gitlab - # Rename config files - # + # Copy the example GitLab config sudo -u gitlab -H cp config/gitlab.yml.example config/gitlab.yml - # Copy unicorn config - # + # Copy the example Unicorn config sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb -#### Install gems +Make sure to edit both files to match your setup. + +## Install Gems cd /home/gitlab/gitlab sudo gem install charlock_holmes --version '0.6.9' sudo gem install bundler - sudo -u gitlab -H bundle install --without development test postgres --deployment + sudo -u gitlab -H bundle install --deployment --without development test -#### Configure git client +## Configure Git -Gitlab needs to be able to commit and push changes to gitolite. -Git requires a username and email in order to be able to do that. +GitLab needs to be able to commit and push changes to Gitolite. In order to do +that Git requires a username and email. (Please use the `email.from` address +for the email) + sudo -u gitlab -H git config --global user.name "GitLab" sudo -u gitlab -H git config --global user.email "gitlab@localhost" - sudo -u gitlab -H git config --global user.name "Gitlab" -#### Setup application +## Setup GitLab hooks - sudo -u gitlab -H bundle exec rake gitlab:app:setup RAILS_ENV=production + sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive + sudo chown git:git /home/git/.gitolite/hooks/common/post-receive +## Initialise Database and Activate Advanced Features -#### Setup GitLab hooks + sudo -u gitlab -H bundle exec rake gitlab:app:setup RAILS_ENV=production - sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive - sudo chown git:git /home/git/.gitolite/hooks/common/post-receive -#### Check application status +## Check Application Status -Checking status: +Just to check we didn't miss anything. sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production +``` +# OUTPUT EXAMPLE +Starting diagnostic +config/database.yml............exists +config/gitlab.yml............exists +/home/git/repositories/............exists +/home/git/repositories/ is writable?............YES +remote: Counting objects: 603, done. +remote: Compressing objects: 100% (466/466), done. +remote: Total 603 (delta 174), reused 0 (delta 0) +Receiving objects: 100% (603/603), 53.29 KiB, done. +Resolving deltas: 100% (174/174), done. +Can clone gitolite-admin?............YES +UMASK for .gitolite.rc is 0007? ............YES +/home/git/share/gitolite/hooks/common/post-receive exists? ............YES +``` - # OUTPUT EXAMPLE - Starting diagnostic - config/database.yml............exists - config/gitlab.yml............exists - /home/git/repositories/............exists - /home/git/repositories/ is writable?............YES - remote: Counting objects: 603, done. - remote: Compressing objects: 100% (466/466), done. - remote: Total 603 (delta 174), reused 0 (delta 0) - Receiving objects: 100% (603/603), 53.29 KiB, done. - Resolving deltas: 100% (174/174), done. - Can clone gitolite-admin?............YES - UMASK for .gitolite.rc is 0007? ............YES - /home/git/share/gitolite/hooks/common/post-receive exists? ............YES +If you are all green - congratulations! You run a GitLab now. +But there are still a few steps to go. -If you got all YES - congratulations! You can run a GitLab app. -#### init script +## Install Init Script -Create init script in /etc/init.d/gitlab: +Download the init script (will be /etc/init.d/gitlab): sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab -P /etc/init.d/ sudo chmod +x /etc/init.d/gitlab -GitLab autostart: +Make GitLab start on boot: sudo update-rc.d gitlab defaults 21 -#### Now you should start GitLab application: + +Start your GitLab instance: sudo service gitlab start # 7. Nginx - # Install first +## Installation sudo apt-get install nginx - # Add GitLab to nginx sites & change with your host specific settings +## Site Configuration + +Download an example site config: + sudo wget https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab -P /etc/nginx/sites-available/ sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab +Make sure to edit the config file to match your setup: + # Change **YOUR_SERVER_IP** and **YOUR_SERVER_FQDN** # to the IP address and fully-qualified domain name - # of the host serving GitLab. + # of your host serving GitLab sudo vim /etc/nginx/sites-enabled/gitlab - # Restart nginx: +## Restart + sudo /etc/init.d/nginx restart -# Done! Visit YOUR_SERVER for gitlab instance +# Done! -You can login via web using admin generated with setup: +Visit YOUR_SERVER for your first GitLab login. +The setup has created an admin account for you. You can use it to log in: admin@local.host 5iveL!fe +**Important Note** +Please go over to your profile page and immediately chage the password, so +nobody can access your GitLab by using this login information later on. + +**Enjoy!** + - - - # Advanced setup tips: -## Customizing Resque's Redis connection +## Custom Redis connections If you'd like Resque to connect to a Redis server on a non-standard port or on -a different host, you can configure its connection string in the -**config/resque.yml** file: - - production: redis.example.com:6379 +a different host, you can configure its connection string via the +`config/resque.yml` file. -**Ok - we have a working application now. ** -**But keep going - there are some things that should be done ** + # example + production: redis.example.tld:6379 -- cgit v1.2.1 From 8022628f7055afb39af71e90ee5d65313d65ebb7 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 5 Dec 2012 21:50:20 +0100 Subject: Add more indexes (see #2159) --- db/migrate/20121205201726_add_more_indexes.rb | 44 +++++++++++++++++++++++++++ db/schema.rb | 32 ++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20121205201726_add_more_indexes.rb diff --git a/db/migrate/20121205201726_add_more_indexes.rb b/db/migrate/20121205201726_add_more_indexes.rb new file mode 100644 index 00000000000..a2b36f7fdf9 --- /dev/null +++ b/db/migrate/20121205201726_add_more_indexes.rb @@ -0,0 +1,44 @@ +class AddMoreIndexes < ActiveRecord::Migration + def change + add_index :events, :created_at + add_index :events, :target_id + + add_index :issues, :closed + add_index :issues, :created_at + add_index :issues, :title + + add_index :keys, :identifier + # FIXME: MySQL can't index text columns + #add_index :keys, :key + add_index :keys, :project_id + + add_index :merge_requests, :closed + add_index :merge_requests, :created_at + add_index :merge_requests, :source_branch + add_index :merge_requests, :target_branch + add_index :merge_requests, :title + + add_index :milestones, :due_date + add_index :milestones, :project_id + + add_index :namespaces, :name + add_index :namespaces, :path + add_index :namespaces, :type + + add_index :notes, :created_at + + add_index :snippets, :created_at + add_index :snippets, :expires_at + + add_index :users, :admin + add_index :users, :blocked + add_index :users, :name + add_index :users, :username + + add_index :users_projects, :project_access + add_index :users_projects, :user_id + + add_index :wikis, :project_id + add_index :wikis, :slug + end +end diff --git a/db/schema.rb b/db/schema.rb index 1abfcb46a26..923d2c5543e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20121203160507) do +ActiveRecord::Schema.define(:version => 20121205201726) do create_table "events", :force => true do |t| t.string "target_type" @@ -27,7 +27,9 @@ ActiveRecord::Schema.define(:version => 20121203160507) do add_index "events", ["action"], :name => "index_events_on_action" add_index "events", ["author_id"], :name => "index_events_on_author_id" + add_index "events", ["created_at"], :name => "index_events_on_created_at" add_index "events", ["project_id"], :name => "index_events_on_project_id" + add_index "events", ["target_id"], :name => "index_events_on_target_id" add_index "events", ["target_type"], :name => "index_events_on_target_type" create_table "issues", :force => true do |t| @@ -46,8 +48,11 @@ ActiveRecord::Schema.define(:version => 20121203160507) do add_index "issues", ["assignee_id"], :name => "index_issues_on_assignee_id" add_index "issues", ["author_id"], :name => "index_issues_on_author_id" + add_index "issues", ["closed"], :name => "index_issues_on_closed" + add_index "issues", ["created_at"], :name => "index_issues_on_created_at" add_index "issues", ["milestone_id"], :name => "index_issues_on_milestone_id" add_index "issues", ["project_id"], :name => "index_issues_on_project_id" + add_index "issues", ["title"], :name => "index_issues_on_title" create_table "keys", :force => true do |t| t.integer "user_id" @@ -59,6 +64,8 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.integer "project_id" end + add_index "keys", ["identifier"], :name => "index_keys_on_identifier" + add_index "keys", ["project_id"], :name => "index_keys_on_project_id" add_index "keys", ["user_id"], :name => "index_keys_on_user_id" create_table "merge_requests", :force => true do |t| @@ -80,8 +87,13 @@ ActiveRecord::Schema.define(:version => 20121203160507) do add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" add_index "merge_requests", ["author_id"], :name => "index_merge_requests_on_author_id" + add_index "merge_requests", ["closed"], :name => "index_merge_requests_on_closed" + add_index "merge_requests", ["created_at"], :name => "index_merge_requests_on_created_at" add_index "merge_requests", ["milestone_id"], :name => "index_merge_requests_on_milestone_id" add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id" + add_index "merge_requests", ["source_branch"], :name => "index_merge_requests_on_source_branch" + add_index "merge_requests", ["target_branch"], :name => "index_merge_requests_on_target_branch" + add_index "merge_requests", ["title"], :name => "index_merge_requests_on_title" create_table "milestones", :force => true do |t| t.string "title", :null => false @@ -93,6 +105,9 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.datetime "updated_at", :null => false end + add_index "milestones", ["due_date"], :name => "index_milestones_on_due_date" + add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id" + create_table "namespaces", :force => true do |t| t.string "name", :null => false t.string "path", :null => false @@ -102,7 +117,10 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.string "type" end + add_index "namespaces", ["name"], :name => "index_namespaces_on_name" add_index "namespaces", ["owner_id"], :name => "index_namespaces_on_owner_id" + add_index "namespaces", ["path"], :name => "index_namespaces_on_path" + add_index "namespaces", ["type"], :name => "index_namespaces_on_type" create_table "notes", :force => true do |t| t.text "note" @@ -116,6 +134,7 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.string "line_code" end + add_index "notes", ["created_at"], :name => "index_notes_on_created_at" add_index "notes", ["noteable_id"], :name => "index_notes_on_noteable_id" add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type" add_index "notes", ["project_id"], :name => "index_notes_on_project_id" @@ -170,6 +189,8 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.datetime "expires_at" end + add_index "snippets", ["created_at"], :name => "index_snippets_on_created_at" + add_index "snippets", ["expires_at"], :name => "index_snippets_on_expires_at" add_index "snippets", ["project_id"], :name => "index_snippets_on_project_id" create_table "taggings", :force => true do |t| @@ -220,9 +241,13 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.string "username" end + add_index "users", ["admin"], :name => "index_users_on_admin" + add_index "users", ["blocked"], :name => "index_users_on_blocked" add_index "users", ["email"], :name => "index_users_on_email", :unique => true add_index "users", ["extern_uid", "provider"], :name => "index_users_on_extern_uid_and_provider", :unique => true + add_index "users", ["name"], :name => "index_users_on_name" add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true + add_index "users", ["username"], :name => "index_users_on_username" create_table "users_projects", :force => true do |t| t.integer "user_id", :null => false @@ -232,7 +257,9 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.integer "project_access", :default => 0, :null => false end + add_index "users_projects", ["project_access"], :name => "index_users_projects_on_project_access" add_index "users_projects", ["project_id"], :name => "index_users_projects_on_project_id" + add_index "users_projects", ["user_id"], :name => "index_users_projects_on_user_id" create_table "web_hooks", :force => true do |t| t.string "url" @@ -253,4 +280,7 @@ ActiveRecord::Schema.define(:version => 20121203160507) do t.integer "user_id" end + add_index "wikis", ["project_id"], :name => "index_wikis_on_project_id" + add_index "wikis", ["slug"], :name => "index_wikis_on_slug" + end -- cgit v1.2.1 From b39aba73d51000d83914894857c9db38c277970f Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 5 Dec 2012 18:27:54 +0100 Subject: add rake task to gather system information --- doc/raketasks/maintenance.md | 30 +++++++++++++++++++++++++++ lib/tasks/gitlab/info.rake | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 lib/tasks/gitlab/info.rake diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md index 7bbb6571f12..431599dc976 100644 --- a/doc/raketasks/maintenance.md +++ b/doc/raketasks/maintenance.md @@ -11,6 +11,36 @@ bundle exec rake gitlab:app:setup ``` +### Gather Information about GitLab Installation + +This command gathers information about your GitLab installation. These can be used in issue reports. + +``` +bundle exec rake gitlab:app:info +``` + +Example output: + +``` +Gitlab information +Version: 4.0.0pre +Resivion: 8022628 + +System information +System: Debian6.0.6 +Home: /home/gitlab +User: gitlab +Ruby: ruby-1.9.3-p286 +Gems: 1.8.24 + +Gitolite information +Version: v3.04-4-g4524f01 +Admin URI: git@localhost:gitolite-admin +Base Path: /home/git/repositories/ +Hook Path: /home/git/.gitolite/hooks/ +Git: /usr/bin/git +``` + ### Check GitLab installation status [Trouble-Shooting-Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake new file mode 100644 index 00000000000..6086655637c --- /dev/null +++ b/lib/tasks/gitlab/info.rake @@ -0,0 +1,48 @@ +namespace :gitlab do + namespace :app do + desc "GITLAB | Get Information about this installation" + task :info => :environment do + + puts "" + puts "Gitlab information".yellow + puts "Version:\t#{Gitlab::Version}" + puts "Resivion:\t#{Gitlab::Revision}" + + # check which os is running + if Kernel.system('lsb_release > /dev/null 2>&1') + os_name = `lsb_release -irs` + elsif File.exists?('/etc/system-release') && File.readable?('/etc/system-release') + os_name = File.read('/etc/system-release') + elsif File.exists?('/etc/debian_version') && File.readable?('/etc/debian_version') + debian_version = File.read('/etc/debian_version') + os_name = "Debian #{debian_version}" + end + os_name = os_name.gsub(/\n/, '') + + # check gitolite version + gitolite_version_file = "#{Gitlab.config.git_base_path}/../gitolite/src/VERSION" + if File.exists?(gitolite_version_file) && File.readable?(gitolite_version_file) + gitolite_version = File.read(gitolite_version_file) + else + gitolite_version = 'unknown' + end + + puts "" + puts "System information".yellow + puts "System:\t\t#{os_name}" + puts "Home:\t\t#{ENV['HOME']}" + puts "User:\t\t#{ENV['LOGNAME']}" + puts "Ruby:\t\t#{ENV['RUBY_VERSION']}" + puts "Gems:\t\t#{`gem --version`}" + + puts "" + puts "Gitolite information".yellow + puts "Version:\t#{gitolite_version}" + puts "Admin URI:\t#{Gitlab.config.git_host.admin_uri}" + puts "Base Path:\t#{Gitlab.config.git_base_path}" + puts "Hook Path:\t#{Gitlab.config.git_hooks_path}" + puts "Git:\t\t#{Gitlab.config.git.path}" + + end + end +end -- cgit v1.2.1 From 9b9650989905b33e74aa7441a97e4242fae4b277 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 6 Dec 2012 11:08:51 +0100 Subject: Fix broken styling after #2176 Closes #2196 --- app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index 2969e8bb26d..f08e5dc7904 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -31,7 +31,8 @@ .middle_box_content, .bottom_box_content { padding: 15px; - overflow: auto; + word-wrap: break-word; + pre { background: none !important; margin: 0; -- cgit v1.2.1 From c338321695470eccf1b2f96348b9e57b894a5c2a Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 6 Dec 2012 15:42:08 +0100 Subject: Update jquery-atwho-rails gem Fixes #1860 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c899c510414..fcda1353907 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ group :assets do gem "therubyracer" gem 'chosen-rails', "0.9.8" - gem 'jquery-atwho-rails', "0.1.6" + gem 'jquery-atwho-rails', "0.1.7" gem "jquery-rails", "2.1.3" gem "jquery-ui-rails", "2.0.2" gem "modernizr", "2.6.2" diff --git a/Gemfile.lock b/Gemfile.lock index b4eced37182..7afacfce9cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,7 +227,7 @@ GEM httpauth (0.2.0) i18n (0.6.1) journey (1.0.4) - jquery-atwho-rails (0.1.6) + jquery-atwho-rails (0.1.7) jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) @@ -481,7 +481,7 @@ DEPENDENCIES guard-spinach haml-rails (~> 0.3.5) httparty - jquery-atwho-rails (= 0.1.6) + jquery-atwho-rails (= 0.1.7) jquery-rails (= 2.1.3) jquery-ui-rails (= 2.0.2) kaminari (~> 0.14.1) -- cgit v1.2.1 From 55f776f095cdab330d418db3b4590c62cc975658 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 6 Dec 2012 16:54:53 +0200 Subject: Tiny nav --- app/assets/stylesheets/sections/nav.scss | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss index 595568fc059..bc19bc75a67 100644 --- a/app/assets/stylesheets/sections/nav.scss +++ b/app/assets/stylesheets/sections/nav.scss @@ -3,15 +3,13 @@ * */ ul.main_menu { - @include border-radius(4px); margin: auto; margin: 30px 0; - border: 1px solid #BBB; + margin-top: 10px; + border-bottom: 1px solid #DDD; height: 37px; - @include bg-gray-gradient; position: relative; overflow: hidden; - @include shade; .count { position: relative; top: -1px; @@ -24,9 +22,6 @@ ul.main_menu { line-height: 14px; text-align: center; color: #777; - background: #f2f2f2; - border-top: 1px solid #CCC; - @include border-radius(8px); } .label { background: $hover; @@ -38,23 +33,10 @@ ul.main_menu { margin: 0; display: table-cell; width: 1%; - border-right: 1px solid #DDD; - border-left: 1px solid #EEE; - border-bottom: 2px solid #CFCFCF; - - &:first-child{ - @include border-radius(5px 0 0 5px); - border-left: 0; - } - &.active { - background-color: #D5D5D5; - border-right: 1px solid #BBB; - border-left: 1px solid #BBB; - @include border-radius(0 0 1px 1px); - &:first-child{ - border-bottom: none; - border-left: none; + border-bottom: 2px solid #474D57; + a { + color: $style_color; } } @@ -73,10 +55,10 @@ ul.main_menu { a { display: block; text-align: center; - font-weight: bold; + font-weight: normal; height: 35px; line-height: 36px; - color: $style_color; + color: #777; text-shadow: 0 1px 1px white; padding: 0 10px; } -- cgit v1.2.1 From 32d9c223a5fd247652c685fb62781c08987b006b Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Thu, 6 Dec 2012 14:10:42 -0500 Subject: Spelling fix to rake info task --- lib/tasks/gitlab/info.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 6086655637c..beaf496be23 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -6,7 +6,7 @@ namespace :gitlab do puts "" puts "Gitlab information".yellow puts "Version:\t#{Gitlab::Version}" - puts "Resivion:\t#{Gitlab::Revision}" + puts "Revision:\t#{Gitlab::Revision}" # check which os is running if Kernel.system('lsb_release > /dev/null 2>&1') -- cgit v1.2.1 From 07e4a12a095000ac9a062db566573ebb66efabb7 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 6 Dec 2012 23:38:38 +0400 Subject: fix failing spec --- spec/requests/projects_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb index 8c0f8e5fbc1..e097f0805fc 100644 --- a/spec/requests/projects_spec.rb +++ b/spec/requests/projects_spec.rb @@ -58,7 +58,7 @@ describe "Projects" do describe "DELETE /projects/:id" do before do - @project = create(:project) + @project = create(:project, owner: @user) @project.add_access(@user, :read, :admin) visit edit_project_path(@project) end -- cgit v1.2.1 From 2c37fa381e80135b7b2e87163a46ca2ecee15925 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 19 Nov 2012 02:36:50 +0400 Subject: fix some glitches in gravatar image url generation always use proper size value do not show alt text when avatar image not loaded --- app/decorators/commit_decorator.rb | 2 +- app/helpers/application_helper.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/decorators/commit_decorator.rb b/app/decorators/commit_decorator.rb index 69d5b178214..a066b2e4a26 100644 --- a/app/decorators/commit_decorator.rb +++ b/app/decorators/commit_decorator.rb @@ -76,7 +76,7 @@ class CommitDecorator < ApplicationDecorator source_name = send "#{options[:source]}_name".to_sym source_email = send "#{options[:source]}_email".to_sym text = if options[:avatar] - avatar = h.image_tag h.gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size] + avatar = h.image_tag h.gravatar_icon(source_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "" %Q{#{avatar} #{source_name}} else source_name diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a689213bcee..e130c09539f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,9 @@ module ApplicationHelper args.any? { |v| v.to_s.downcase == action_name } end - def gravatar_icon(user_email = '', size = 40) + def gravatar_icon(user_email = '', size = nil) + size = 40 if size.nil? || size <= 0 + if Gitlab.config.disable_gravatar? || user_email.blank? 'no_avatar.png' else -- cgit v1.2.1 From 23a8e59938477be9938ed96176e8f9220ca78471 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 6 Dec 2012 21:16:48 +0100 Subject: Improve gitlab:env:info task Renamed from gitlab:app:info Add several extra info points --- doc/raketasks/maintenance.md | 49 +++++++++++++++++++----------- lib/tasks/gitlab/info.rake | 71 +++++++++++++++++++++++++++++++------------- 2 files changed, 82 insertions(+), 38 deletions(-) diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md index 431599dc976..1247d4b6dd7 100644 --- a/doc/raketasks/maintenance.md +++ b/doc/raketasks/maintenance.md @@ -11,42 +11,55 @@ bundle exec rake gitlab:app:setup ``` -### Gather Information about GitLab Installation +### Gather information about GitLab and the system it runs on -This command gathers information about your GitLab installation. These can be used in issue reports. +This command gathers information about your GitLab installation and the System +it runs on. These may be useful when asking for help or reporting issues. ``` -bundle exec rake gitlab:app:info +bundle exec rake gitlab:env:info ``` Example output: ``` -Gitlab information -Version: 4.0.0pre -Resivion: 8022628 - System information -System: Debian6.0.6 -Home: /home/gitlab -User: gitlab -Ruby: ruby-1.9.3-p286 -Gems: 1.8.24 +System: Debian 6.0.6 +Current User: gitlab +Using RVM: yes +RVM Version: 1.17.2 +Ruby Version: ruby-1.9.3-p327 +Gem Version: 1.8.24 +Bundler Version:1.2.3 +Rake Version: 10.0.1 + +GitLab information +Version: 3.1.0 +Resivion: fd5141d +Directory: /home/gitlab/gitlab +DB Adapter: mysql2 +URL: http://localhost:3000 +HTTP Clone URL: http://localhost:3000/some-project.git +SSH Clone URL: git@localhost:some-project.git +Using LDAP: no +Using Omniauth: no Gitolite information -Version: v3.04-4-g4524f01 -Admin URI: git@localhost:gitolite-admin -Base Path: /home/git/repositories/ -Hook Path: /home/git/.gitolite/hooks/ -Git: /usr/bin/git +Version: v3.04-4-g4524f01 +Admin URI: git@localhost:gitolite-admin +Admin Key: gitlab +Repositories: /home/git/repositories/ +Hooks: /home/git/.gitolite/hooks/ +Git: /usr/bin/git ``` + ### Check GitLab installation status [Trouble-Shooting-Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) ``` -bundle exec rake gitlab:app:status +bundle exec rake gitlab:check ``` Example output: diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index beaf496be23..a13f40272c9 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -1,14 +1,9 @@ namespace :gitlab do - namespace :app do - desc "GITLAB | Get Information about this installation" + namespace :env do + desc "GITLAB | Show information about GitLab and its environment" task :info => :environment do - puts "" - puts "Gitlab information".yellow - puts "Version:\t#{Gitlab::Version}" - puts "Revision:\t#{Gitlab::Revision}" - - # check which os is running + # check which OS is running if Kernel.system('lsb_release > /dev/null 2>&1') os_name = `lsb_release -irs` elsif File.exists?('/etc/system-release') && File.readable?('/etc/system-release') @@ -19,7 +14,50 @@ namespace :gitlab do end os_name = os_name.gsub(/\n/, '') - # check gitolite version + # check if there is an RVM environment + m, rvm_version = `rvm --version`.match(/rvm ([\d\.]+) /).to_a + # check Bundler version + m, bunder_version = `bundle --version`.match(/Bundler version ([\d\.]+)/).to_a + # check Bundler version + m, rake_version = `rake --version`.match(/rake, version ([\d\.]+)/).to_a + + puts "" + puts "System information".yellow + puts "System:\t\t#{os_name}" + puts "Current User:\t#{`whoami`}" + puts "Using RVM:\t#{rvm_version.present? ? "yes".green : "no"}" + puts "RVM Version:\t#{rvm_version}" if rvm_version.present? + puts "Ruby Version:\t#{ENV['RUBY_VERSION']}" + puts "Gem Version:\t#{`gem --version`}" + puts "Bundler Version:#{bunder_version}" + puts "Rake Version:\t#{rake_version}" + + + # check database adapter + database_adapter = ActiveRecord::Base.connection.adapter_name.downcase + + project = Project.new(path: "some-project") + project.path = "some-project" + # construct clone URLs + http_clone_url = project.http_url_to_repo + ssh_clone_url = project.ssh_url_to_repo + + puts "" + puts "GitLab information".yellow + puts "Version:\t#{Gitlab::Version}" + puts "Revision:\t#{Gitlab::Revision}" + puts "Directory:\t#{Rails.root}" + puts "DB Adapter:\t#{database_adapter}" + puts "URL:\t\t#{Gitlab.config.url}" + puts "HTTP Clone URL:\t#{http_clone_url}" + puts "SSH Clone URL:\t#{ssh_clone_url}" + puts "Using LDAP:\t#{Gitlab.config.ldap_enabled? ? "yes".green : "no"}" + puts "Using Omniauth:\t#{Gitlab.config.omniauth_enabled? ? "yes".green : "no"}" + puts "Omniauth Providers:\t#{Gitlab.config.omniauth_providers}" if Gitlab.config.omniauth_enabled? + + + + # check Gitolite version gitolite_version_file = "#{Gitlab.config.git_base_path}/../gitolite/src/VERSION" if File.exists?(gitolite_version_file) && File.readable?(gitolite_version_file) gitolite_version = File.read(gitolite_version_file) @@ -27,20 +65,13 @@ namespace :gitlab do gitolite_version = 'unknown' end - puts "" - puts "System information".yellow - puts "System:\t\t#{os_name}" - puts "Home:\t\t#{ENV['HOME']}" - puts "User:\t\t#{ENV['LOGNAME']}" - puts "Ruby:\t\t#{ENV['RUBY_VERSION']}" - puts "Gems:\t\t#{`gem --version`}" - puts "" puts "Gitolite information".yellow puts "Version:\t#{gitolite_version}" - puts "Admin URI:\t#{Gitlab.config.git_host.admin_uri}" - puts "Base Path:\t#{Gitlab.config.git_base_path}" - puts "Hook Path:\t#{Gitlab.config.git_hooks_path}" + puts "Admin URI:\t#{Gitlab.config.gitolite_admin_uri}" + puts "Admin Key:\t#{Gitlab.config.gitolite_admin_key}" + puts "Repositories:\t#{Gitlab.config.git_base_path}" + puts "Hooks:\t\t#{Gitlab.config.git_hooks_path}" puts "Git:\t\t#{Gitlab.config.git.path}" end -- cgit v1.2.1 From 0aa7f79ca4255eadd7d2aad7c3378915ee54e107 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 7 Dec 2012 00:44:22 +0400 Subject: allow customize gravatar url --- app/helpers/application_helper.rb | 5 +++-- config/gitlab.yml.example | 2 ++ config/initializers/1_settings.rb | 9 +++++++++ spec/helpers/application_helper_spec.rb | 22 ++++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e130c09539f..81be62421c3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,4 +1,5 @@ require 'digest/md5' +require 'uri' module ApplicationHelper @@ -36,9 +37,9 @@ module ApplicationHelper if Gitlab.config.disable_gravatar? || user_email.blank? 'no_avatar.png' else - gravatar_prefix = request.ssl? ? "https://secure" : "http://www" + gravatar_url = request.ssl? ? Gitlab.config.gravatar_ssl_url : Gitlab.config.gravatar_url user_email.strip! - "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=mm" + sprintf(gravatar_url, {:hash => Digest::MD5.hexdigest(user_email.downcase), :email => URI.escape(user_email), :size => size}) end end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 3568348971b..7fcfc5b7cf3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -24,6 +24,8 @@ app: # backup_path: "/vol/backups" # default: Rails.root + backups/ # backup_keep_time: 604800 # default: 0 (forever) (in seconds) # disable_gravatar: true # default: false - Disable user avatars from Gravatar.com + # gravatar_url: "http://" # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm + # gravatar_ssl_url: "https://" # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm # diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 32af3d07778..e684f37857d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -145,5 +145,14 @@ class Settings < Settingslogic def disable_gravatar? app['disable_gravatar'] || false end + + def gravatar_url + app['gravatar_url'] || 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' + end + + def gravatar_ssl_url + app['gravatar_ssl_url'] || 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' + end + end end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index a94d5505a91..df66e3b48bd 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -51,14 +51,36 @@ describe ApplicationHelper do gravatar_icon('').should == 'no_avatar.png' end + it "should return default gravatar url" do + stub!(:request).and_return(double(:ssl? => false)) + gravatar_icon(user_email).should match('http://www.gravatar.com/avatar/b58c6f14d292556214bd64909bcdb118') + end + it "should use SSL when appropriate" do stub!(:request).and_return(double(:ssl? => true)) gravatar_icon(user_email).should match('https://secure.gravatar.com') end + it "should return custom gravatar path when gravatar_url is set" do + stub!(:request).and_return(double(:ssl? => false)) + Gitlab.config.stub(:gravatar_url).and_return('http://example.local/?s=%{size}&hash=%{hash}') + gravatar_icon(user_email, 20).should == 'http://example.local/?s=20&hash=b58c6f14d292556214bd64909bcdb118' + end + it "should accept a custom size" do stub!(:request).and_return(double(:ssl? => false)) gravatar_icon(user_email, 64).should match(/\?s=64/) end + + it "should use default size when size is wrong" do + stub!(:request).and_return(double(:ssl? => false)) + gravatar_icon(user_email, nil).should match(/\?s=40/) + end + + it "should be case insensitive" do + stub!(:request).and_return(double(:ssl? => false)) + gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ") + end + end end -- cgit v1.2.1 From 045b4c8fcd3898bf66ac74acdf13cc079a104105 Mon Sep 17 00:00:00 2001 From: Cyril Date: Fri, 7 Dec 2012 04:40:42 +0100 Subject: replace user.name by user.username in GFM --- lib/gitlab/markdown.rb | 43 ++++++++++++-------------- spec/helpers/gitlab_markdown_helper_spec.rb | 16 +++++----- spec/requests/gitlab_flavored_markdown_spec.rb | 12 +++---- 3 files changed, 34 insertions(+), 37 deletions(-) diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index ee0ee05c3be..859184b6c3a 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -26,15 +26,19 @@ module Gitlab # => "\":trollface:\" module Markdown REFERENCE_PATTERN = %r{ - (\W)? # Prefix (1) - ( # Reference (2) - @([\w\._]+) # User name (3) - |[#!$](\d+) # Issue/MR/Snippet ID (4) - |([\h]{6,40}) # Commit ID (5) + (?\W)? # Prefix + ( # Reference + @(?[a-zA-Z][a-zA-Z0-9_\-\.]*) # User name + |\#(?\d+) # Issue ID + |!(?\d+) # MR ID + |\$(?\d+) # Snippet ID + |(?[\h]{6,40}) # Commit ID ) - (\W)? # Suffix (6) + (?\W)? # Suffix }x.freeze + TYPES = [:user, :issue, :merge_request, :snippet, :commit].freeze + EMOJI_PATTERN = %r{(:(\S+):)}.freeze attr_reader :html_options @@ -95,16 +99,16 @@ module Gitlab def parse_references(text) # parse reference links text.gsub!(REFERENCE_PATTERN) do |match| - prefix = $1 || '' - reference = $2 - identifier = $3 || $4 || $5 - suffix = $6 || '' + prefix = $~[:prefix] + suffix = $~[:suffix] + type = TYPES.select{|t| !$~[t].nil?}.first + identifier = $~[type] # Avoid HTML entities - if prefix.ends_with?('&') || suffix.starts_with?(';') + if prefix && suffix && prefix[0] == '&' && suffix[-1] == ';' match - elsif ref_link = reference_link(reference, identifier) - prefix + ref_link + suffix + elsif ref_link = reference_link(type, identifier) + "#{prefix}#{ref_link}#{suffix}" else match end @@ -137,19 +141,12 @@ module Gitlab # identifier - Object identifier (Issue ID, SHA hash, etc.) # # Returns string rendered by the processing method - def reference_link(reference, identifier) - case reference - when /^@/ then reference_user(identifier) - when /^#/ then reference_issue(identifier) - when /^!/ then reference_merge_request(identifier) - when /^\$/ then reference_snippet(identifier) - when /^\h/ then reference_commit(identifier) - end + def reference_link(type, identifier) + send("reference_#{type}", identifier) end def reference_user(identifier) - if user = @project.users.where(name: identifier).first - member = @project.users_projects.where(user_id: user).first + if member = @project.users_projects.joins(:user).where(users: { username: identifier }).first link_to("@#{identifier}", project_team_member_path(@project, member), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if member end end diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index 05e4527b278..1eafc6663a2 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" describe GitlabMarkdownHelper do let!(:project) { create(:project) } - let(:user) { create(:user, name: 'gfm') } + let(:user) { create(:user, username: 'gfm') } let(:commit) { CommitDecorator.decorate(project.commit) } let(:issue) { create(:issue, project: project) } let(:merge_request) { create(:merge_request, project: project) } @@ -81,7 +81,7 @@ describe GitlabMarkdownHelper do end describe "referencing a team member" do - let(:actual) { "@#{user.name} you are right." } + let(:actual) { "@#{user.username} you are right." } let(:expected) { project_team_member_path(project, member) } before do @@ -103,18 +103,18 @@ describe GitlabMarkdownHelper do end it "should link with adjacent text" do - actual = "Mail the admin (@gfm)" + actual = "Mail the admin (@#{user.username})" gfm(actual).should match(expected) end it "should keep whitespace intact" do - actual = "Yes, @#{user.name} is right." - expected = /Yes, @#{user.name}<\/a> is right/ + actual = "Yes, @#{user.username} is right." + expected = /Yes, @#{user.username}<\/a> is right/ gfm(actual).should match(expected) end it "should not link with an invalid id" do - actual = expected = "@#{user.name.reverse} you are right." + actual = expected = "@#{user.username.reverse} you are right." gfm(actual).should == expected end @@ -316,10 +316,10 @@ describe GitlabMarkdownHelper do it "should handle references in lists" do project.users << user - actual = "\n* dark: ##{issue.id}\n* light by @#{member.user_name}" + actual = "\n* dark: ##{issue.id}\n* light by @#{member.user.username}" markdown(actual).should match(%r{
  • dark: ##{issue.id}
    • }) - markdown(actual).should match(%r{
  • light by @#{member.user_name}
    • }) + markdown(actual).should match(%r{
  • light by @#{member.user.username}
    • }) end it "should handle references in " do diff --git a/spec/requests/gitlab_flavored_markdown_spec.rb b/spec/requests/gitlab_flavored_markdown_spec.rb index ad5d7cd7607..98319f81657 100644 --- a/spec/requests/gitlab_flavored_markdown_spec.rb +++ b/spec/requests/gitlab_flavored_markdown_spec.rb @@ -19,7 +19,7 @@ describe "Gitlab Flavored Markdown" do @test_file = "gfm_test_file" i.add(@test_file, "foo\nbar\n") # add commit with gfm - i.commit("fix ##{issue.id}\n\nask @#{fred.name} for details", head: @branch_name) + i.commit("fix ##{issue.id}\n\nask @#{fred.username} for details", head: @branch_name) # add test tag @tag_name = "gfm-test-tag" @@ -56,7 +56,7 @@ describe "Gitlab Flavored Markdown" do it "should render description in commits#show" do visit project_commit_path(project, commit) - page.should have_link("@#{fred.name}") + page.should have_link("@#{fred.username}") end it "should render title in refs#tree", js: true do @@ -93,7 +93,7 @@ describe "Gitlab Flavored Markdown" do assignee: @user, project: project, title: "fix ##{@other_issue.id}", - description: "ask @#{fred.name} for details") + description: "ask @#{fred.username} for details") end it "should render subject in issues#index" do @@ -111,7 +111,7 @@ describe "Gitlab Flavored Markdown" do it "should render details in issues#show" do visit project_issue_path(project, @issue) - page.should have_link("@#{fred.name}") + page.should have_link("@#{fred.username}") end end @@ -142,7 +142,7 @@ describe "Gitlab Flavored Markdown" do @milestone = create(:milestone, project: project, title: "fix ##{issue.id}", - description: "ask @#{fred.name} for details") + description: "ask @#{fred.username} for details") end it "should render title in milestones#index" do @@ -160,7 +160,7 @@ describe "Gitlab Flavored Markdown" do it "should render description in milestones#show" do visit project_milestone_path(project, @milestone) - page.should have_link("@#{fred.name}") + page.should have_link("@#{fred.username}") end end -- cgit v1.2.1 From 84465576d72a0ca98d2b9f6f4101d8c8e80bb1ef Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 7 Dec 2012 15:53:04 +0200 Subject: Dont show remove project button if you have no permission --- app/views/projects/empty.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index f331ae7fadc..52dff687a3a 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -29,6 +29,6 @@ git remote add origin #{@project.url_to_repo} git push -u origin master - - if can? current_user, :admin_project, @project + - if can? current_user, :remove_project, @project .prepend-top-20 = link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn danger right" -- cgit v1.2.1 From 12b4bb5946e6f43962a2161711e672facce1c1f4 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 7 Dec 2012 16:42:09 +0100 Subject: Make gitlab:env:info task more robust Closes #2213 --- lib/tasks/gitlab/info.rake | 60 ++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index a13f40272c9..231c05b4c59 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -1,36 +1,38 @@ namespace :gitlab do namespace :env do desc "GITLAB | Show information about GitLab and its environment" - task :info => :environment do + task info: :environment do # check which OS is running - if Kernel.system('lsb_release > /dev/null 2>&1') - os_name = `lsb_release -irs` - elsif File.exists?('/etc/system-release') && File.readable?('/etc/system-release') - os_name = File.read('/etc/system-release') - elsif File.exists?('/etc/debian_version') && File.readable?('/etc/debian_version') - debian_version = File.read('/etc/debian_version') - os_name = "Debian #{debian_version}" - end - os_name = os_name.gsub(/\n/, '') + os_name = run("lsb_release -irs") + os_name ||= if File.readable?('/etc/system-release') + File.read('/etc/system-release') + end + os_name ||= if File.readable?('/etc/debian_version') + debian_version = File.read('/etc/debian_version') + "Debian #{debian_version}" + end + os_name.squish! # check if there is an RVM environment - m, rvm_version = `rvm --version`.match(/rvm ([\d\.]+) /).to_a + rvm_version = run_and_match("rvm --version", /[\d\.]+/).try(:to_s) + # check Gem version + gem_version = run("gem --version") # check Bundler version - m, bunder_version = `bundle --version`.match(/Bundler version ([\d\.]+)/).to_a + bunder_version = run_and_match("bundle --version", /[\d\.]+/).try(:to_s) # check Bundler version - m, rake_version = `rake --version`.match(/rake, version ([\d\.]+)/).to_a + rake_version = run_and_match("rake --version", /[\d\.]+/).try(:to_s) puts "" puts "System information".yellow - puts "System:\t\t#{os_name}" + puts "System:\t\t#{os_name || "unknown".red}" puts "Current User:\t#{`whoami`}" puts "Using RVM:\t#{rvm_version.present? ? "yes".green : "no"}" puts "RVM Version:\t#{rvm_version}" if rvm_version.present? - puts "Ruby Version:\t#{ENV['RUBY_VERSION']}" - puts "Gem Version:\t#{`gem --version`}" - puts "Bundler Version:#{bunder_version}" - puts "Rake Version:\t#{rake_version}" + puts "Ruby Version:\t#{ENV['RUBY_VERSION'] || "unknown".red}" + puts "Gem Version:\t#{gem_version || "unknown".red}" + puts "Bundler Version:#{bunder_version || "unknown".red}" + puts "Rake Version:\t#{rake_version || "unknown".red}" # check database adapter @@ -61,13 +63,11 @@ namespace :gitlab do gitolite_version_file = "#{Gitlab.config.git_base_path}/../gitolite/src/VERSION" if File.exists?(gitolite_version_file) && File.readable?(gitolite_version_file) gitolite_version = File.read(gitolite_version_file) - else - gitolite_version = 'unknown' end puts "" puts "Gitolite information".yellow - puts "Version:\t#{gitolite_version}" + puts "Version:\t#{gitolite_version || "unknown".red}" puts "Admin URI:\t#{Gitlab.config.gitolite_admin_uri}" puts "Admin Key:\t#{Gitlab.config.gitolite_admin_key}" puts "Repositories:\t#{Gitlab.config.git_base_path}" @@ -75,5 +75,23 @@ namespace :gitlab do puts "Git:\t\t#{Gitlab.config.git.path}" end + + + # Helper methods + + # Runs the given command and matches the output agains the given RegExp + def run_and_match(command, regexp) + run(command).try(:match, regexp) + end + + # Runs the given command + # + # Returns nil if the command was not found + # Returns the output of the command otherwise + def run(command) + unless `#{command} 2>/dev/null`.blank? + `#{command}` + end + end end end -- cgit v1.2.1 From 0c59de2e71c0cc69b89f206265892d4f5f3ee93d Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 7 Dec 2012 17:28:05 +0100 Subject: Make sure the user edits gitlab.yml --- doc/install/installation.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/install/installation.md b/doc/install/installation.md index ac6615a987a..ed0412034b2 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -146,9 +146,14 @@ do so with caution! # Copy the example GitLab config sudo -u gitlab -H cp config/gitlab.yml.example config/gitlab.yml + # Make sure to change "localhost" to the fully-qualified domain name of your + # host serving GitLab where necessary + sudo -u gitlab -H vim config/gitlab.yml + # Copy the example Unicorn config sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb +**Important Note** Make sure to edit both files to match your setup. ## Install Gems -- cgit v1.2.1 From f127382be3113b204c4cd26c0d325150054bcff4 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 7 Dec 2012 17:28:47 +0100 Subject: Add checking installtion with gitlab:env:info task --- doc/install/installation.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index ed0412034b2..795a053a064 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -185,7 +185,11 @@ for the email) ## Check Application Status -Just to check we didn't miss anything. +Check if GitLab and its environment is configured correctly: + + sudo -u gitlab -H bundle exec rake gitlab:env:info RAILS_ENV=production + +To make sure you didn't miss anything run a more thorough check with: sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production -- cgit v1.2.1 From d8a239e4b1418b7681d8a1abad20264573c85f11 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 7 Dec 2012 17:32:38 +0100 Subject: Add instructions for dealing with the Python 2 vs 3 mess --- doc/install/installation.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 795a053a064..697b82b40c1 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -38,7 +38,24 @@ Make sure your system is up-to-date: Install the required packages: - sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core python2.7 libyaml-dev postfix + sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core libyaml-dev postfix + +Make sure you have the right version of Python installed. + + # Install Python + sudo apt-get install python + + # Make sure that Python is 2.x (3.x is not supported at the moment) + python --version + + # If it's Python 3 you might need to install Python 2 separately + sudo apt-get install python2.7 + + # Make sure you can access Python via `python2` + python2 --version + + # If you get a "command not found" error create a link to the python binary + sudo ln -s /usr/bin/python /usr/bin/python2 # 2. Ruby -- cgit v1.2.1 From 40576b87092598b28a11ba796bab6857d009702b Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Wed, 5 Dec 2012 00:57:21 +0100 Subject: Fixed #1509 by converting the entities in js Converted BranchGraph to some sort of Class --- app/views/projects/graph.html.haml | 11 +- vendor/assets/javascripts/branch-graph.js | 280 ++++++++++++++++++------------ 2 files changed, 173 insertions(+), 118 deletions(-) diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml index 07f038d28a2..edc3c2de81e 100644 --- a/app/views/projects/graph.html.haml +++ b/app/views/projects/graph.html.haml @@ -2,13 +2,14 @@ %br .graph_holder %h4 - %small You can move around the graph by using arrow keys. + %small You can move around the graph by using the arrow keys. #holder.graph + :javascript - var chunk1={commits:#{@commits_json}}; - var days=#{@days_json}; - initGraph(); + var commits = #{@commits_json} + , days = #{@days_json}; + var branch_graph = new BranchGraph(days, commits); $(function(){ - branchGraph($("#holder")[0]); + branch_graph.buildGraph($("#holder")[0]); GraphNav.init(); }); diff --git a/vendor/assets/javascripts/branch-graph.js b/vendor/assets/javascripts/branch-graph.js index e8699bdfbf2..8bd8aa02480 100644 --- a/vendor/assets/javascripts/branch-graph.js +++ b/vendor/assets/javascripts/branch-graph.js @@ -1,139 +1,193 @@ -var commits = {}, - comms = {}, - pixelsX = [], - pixelsY = [], - mmax = Math.max, - mtime = 0, - mspace = 0, - parents = {}, - ii = 0, - colors = ["#000"]; +!function(){ -function initGraph(){ - commits = chunk1.commits; - ii = commits.length; - for (var i = 0; i < ii; i++) { - for (var j = 0, jj = commits[i].parents.length; j < jj; j++) { - parents[commits[i].parents[j][0]] = true; + var BranchGraph = function(days, commits){ + + this.days = days || {}; + this.commits = commits || {}; + this.comms = {}; + this.pixelsX = []; + this.pixelsY = []; + this.mtime = 0; + this.mspace = 0; + this.parents = {}; + this.ii = 0; + this.colors = ["#000"]; + + this.prepareData(); + }; + + BranchGraph.prototype.prepareData = function(){ + ii = this.commits.length; + for (var i = 0; i < ii; i++) { + for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { + this.parents[this.commits[i].parents[j][0]] = true; } - mtime = Math.max(mtime, commits[i].time); - mspace = Math.max(mspace, commits[i].space); - } - mtime = mtime + 4; - mspace = mspace + 10; - for (i = 0; i < ii; i++) { - if (commits[i].id in parents) { - commits[i].isParent = true; + this.mtime = Math.max(this.mtime, this.commits[i].time); + this.mspace = Math.max(this.mspace, this.commits[i].space); + } + this.mtime = this.mtime + 4; + this.mspace = this.mspace + 10; + for (i = 0; i < ii; i++) { + if (this.commits[i].id in this.parents) { + this.commits[i].isParent = true; } - comms[commits[i].id] = commits[i]; - } - for (var k = 0; k < mspace; k++) { - colors.push(Raphael.getColor()); - } -} - -function branchGraph(holder) { - var ch = mspace * 20 + 20, cw = mtime * 20 + 20, - r = Raphael("holder", cw, ch), - top = r.set(); - var cuday = 0, cumonth = ""; - r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#222"}); - r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#444"}); - - for (mm = 0; mm < days.length; mm++) { - if(days[mm] != null){ - if(cuday != days[mm][0]){ - r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#DDD"}); - cuday = days[mm][0] - } - if(cumonth != days[mm][1]){ - r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#EEE"}); - cumonth = days[mm][1] - } + this.comms[this.commits[i].id] = this.commits[i]; + } + for (var k = 0; k < this.mspace; k++) { + this.colors.push(Raphael.getColor()); + } + }; + BranchGraph.prototype.buildGraph = function(holder){ + var ch = this.mspace * 20 + 20 + , cw = this.mtime * 20 + 20 + , r = Raphael("holder", cw, ch) + , top = r.set() + , cuday = 0 + , cumonth = ""; + + r.rect(0, 0, this.days.length * 20 + 80, 30).attr({fill: "#222"}); + r.rect(0, 30, this.days.length * 20 + 80, 20).attr({fill: "#444"}); + + for (mm = 0; mm < this.days.length; mm++) { + if(this.days[mm] != null){ + if(cuday != this.days[mm][0]){ + r.text(10 + mm * 20, 40, this.days[mm][0]).attr({ + font: "14px Fontin-Sans, Arial", + fill: "#DDD" + }); + cuday = this.days[mm][0]; + } + if(cumonth != this.days[mm][1]){ + r.text(10 + mm * 20, 15, this.days[mm][1]).attr({ + font: "14px Fontin-Sans, Arial", + fill: "#EEE" + }); + cumonth = this.days[mm][1]; } + } } + for (i = 0; i < ii; i++) { - var x = 10 + 20 * commits[i].time, - y = 70 + 20 * commits[i].space; - r.circle(x, y, 3).attr({fill: colors[commits[i].space], stroke: "none"}); - if (commits[i].refs != null && commits[i].refs != "") { - var longrefs = commits[i].refs - var shortrefs = commits[i].refs; - if (shortrefs.length > 15){ - shortrefs = shortrefs.substr(0,13) + "..."; - } - var t = r.text(x+5, y+5, shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666", - title: longrefs, cursor: "pointer", rotation: "90"}); - - var textbox = t.getBBox(); - t.translate(textbox.height/-4,textbox.width/2); + var x = 10 + 20 * this.commits[i].time + , y = 70 + 20 * this.commits[i].space; + r.circle(x, y, 3).attr({ + fill: this.colors[this.commits[i].space], + stroke: "none" + }); + if (this.commits[i].refs != null && this.commits[i].refs != "") { + var longrefs = this.commits[i].refs + , shortrefs = this.commits[i].refs; + if (shortrefs.length > 15){ + shortrefs = shortrefs.substr(0,13) + "..."; } - for (var j = 0, jj = commits[i].parents.length; j < jj; j++) { - var c = comms[commits[i].parents[j][0]]; - if (c) { - var cx = 10 + 20 * c.time, - cy = 70 + 20 * c.space; - if (c.space == commits[i].space) { - r.path("M" + (x - 5) + "," + (y + .0001) + "L" + (15 + 20 * c.time) + "," + (y + .0001)) - .attr({stroke: colors[c.space], "stroke-width": 2}); + var t = r.text(x+5, y+5, shortrefs).attr({ + font: "12px Fontin-Sans, Arial", fill: "#666", + title: longrefs, cursor: "pointer", rotation: "90" + }); - } else if (c.space < commits[i].space) { - r.path(["M", x - 5, y + .0001, "l-5-2,0,4,5,-2C", x - 5, y, x - 17, y + 2, x - 20, y - 5, "L", cx, y - 5, cx, cy]) - .attr({stroke: colors[commits[i].space], "stroke-width": 2}); - } else { - r.path(["M", x - 3, y + 6, "l-4,3,4,2,0,-5L", x - 10, y + 20, "L", x - 10, cy, cx, cy]) - .attr({stroke: colors[c.space], "stroke-width": 2}); - } - } + var textbox = t.getBBox(); + t.translate(textbox.height/-4, textbox.width/2); + } + for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { + var c = this.comms[this.commits[i].parents[j][0]]; + if (c) { + var cx = 10 + 20 * c.time + , cy = 70 + 20 * c.space; + if (c.space == this.commits[i].space) { + r.path("M" + (x - 5) + "," + (y + .0001) + "L" + (15 + 20 * c.time) + "," + (y + .0001)) + .attr({ + stroke: this.colors[c.space], + "stroke-width": 2 + }); + + } else if (c.space < this.commits[i].space) { + r.path(["M", x - 5, y + .0001, "l-5-2,0,4,5,-2C", x - 5, y, x - 17, y + 2, x - 20, y - 5, "L", cx, y - 5, cx, cy]) + .attr({ + stroke: this.colors[this.commits[i].space], + "stroke-width": 2 + }); + } else { + r.path(["M", x - 3, y + 6, "l-4,3,4,2,0,-5L", x - 10, y + 20, "L", x - 10, cy, cx, cy]) + .attr({ + stroke: this.colors[c.space], + "stroke-width": 2 + }); + } } - (function (c, x, y) { - top.push(r.circle(x, y, 10).attr({fill: "#000", opacity: 0, cursor: "pointer"}) - .click(function(){ - location.href = location.href.replace("graph", "commits/" + c.id); - }) - .hover(function () { - var s = r.text(100, 100,c.author + "\n \n" +c.id + "\n \n" + c.message).attr({fill: "#fff"}); - this.popup = r.popupit(x, y + 5, s, 0); - top.push(this.popup.insertBefore(this)); - }, function () { - this.popup && this.popup.remove() && delete this.popup; - })); - }(commits[i], x, y)); - } - top.toFront(); - var hw = holder.offsetWidth, - hh = holder.offsetHeight, - v = r.rect(hw - 8, 0, 4, Math.pow(hh, 2) / ch, 2).attr({fill: "#000", opacity: 0}), - h = r.rect(0, hh - 8, Math.pow(hw, 2) / cw, 4, 2).attr({fill: "#000", opacity: 0}), - bars = r.set(v, h), - drag, - dragger = function (e) { + } + (function (c, x, y) { + top.push(r.circle(x, y, 10).attr({ + fill: "#000", + opacity: 0, + cursor: "pointer" + }) + .click(function(){ + location.href = location.href.replace("graph", "commits/" + c.id); + }) + .hover(function () { + // Create empty node to convert entities to character + var m = $('
    ').html(c.message).text() + , s = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + m).attr({ + fill: "#fff" + }); + this.popup = r.popupit(x, y + 5, s, 0); + top.push(this.popup.insertBefore(this)); + }, function () { + this.popup && this.popup.remove() && delete this.popup; + })); + }(this.commits[i], x, y)); + + top.toFront(); + var hw = holder.offsetWidth + , hh = holder.offsetHeight + , v = r.rect(hw - 8, 0, 4, Math.pow(hh, 2) / ch, 2).attr({ + fill: "#000", + opacity: 0 + }) + , h = r.rect(0, hh - 8, Math.pow(hw, 2) / cw, 4, 2).attr({ + fill: "#000", + opacity: 0 + }) + , bars = r.set(v, h) + , drag + , dragger = function (event) { if (drag) { - e = e || window.event; - holder.scrollLeft = drag.sl - (e.clientX - drag.x); - holder.scrollTop = drag.st - (e.clientY - drag.y); + event = event || window.event; + holder.scrollLeft = drag.sl - (event.clientX - drag.x); + holder.scrollTop = drag.st - (event.clientY - drag.y); } }; - holder.onmousedown = function (e) { - e = e || window.event; - drag = {x: e.clientX, y: e.clientY, st: holder.scrollTop, sl: holder.scrollLeft}; + holder.onmousedown = function (event) { + event = event || window.event; + drag = { + x: event.clientX, + y: event.clientY, + st: holder.scrollTop, + sl: holder.scrollLeft + }; document.onmousemove = dragger; bars.animate({opacity: .5}, 300); - }; - document.onmouseup = function () { + }; + document.onmouseup = function () { drag = false; document.onmousemove = null; bars.animate({opacity: 0}, 300); - }; - holder.scrollLeft = cw; -}; + }; + holder.scrollLeft = cw; + } + }; + + this.BranchGraph = BranchGraph; + +}(this); Raphael.fn.popupit = function (x, y, set, dir, size) { dir = dir == null ? 2 : dir; size = size || 5; x = Math.round(x); y = Math.round(y); - var bb = set.getBBox(), + var mmax = Math.max, + bb = set.getBBox(), w = Math.round(bb.width / 2), h = Math.round(bb.height / 2), dx = [0, w + size * 2, 0, -w - size * 2], -- cgit v1.2.1 From e1282d507f1a0321c4f25815470b0fa05265e6dd Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 7 Dec 2012 19:06:46 +0100 Subject: BranchGraph now loads async Centralized keyboard and drag events for BranchGraph --- app/assets/javascripts/projects.js.coffee | 7 -- app/controllers/projects_controller.rb | 14 ++- app/views/projects/graph.html.haml | 8 +- lib/gitlab/graph/commit.rb | 2 +- lib/gitlab/graph/json_builder.rb | 17 ++- vendor/assets/javascripts/branch-graph.js | 168 +++++++++++++++++------------- 6 files changed, 122 insertions(+), 94 deletions(-) diff --git a/app/assets/javascripts/projects.js.coffee b/app/assets/javascripts/projects.js.coffee index 1808f0578f6..d03a487c453 100644 --- a/app/assets/javascripts/projects.js.coffee +++ b/app/assets/javascripts/projects.js.coffee @@ -18,10 +18,3 @@ $ -> # Ref switcher $('.project-refs-select').on 'change', -> $(@).parents('form').submit() - -class @GraphNav - @init: -> - $('.graph svg').css 'position', 'relative' - $('body').bind 'keyup', (e) -> - $('.graph svg').animate(left: '+=400') if e.keyCode is 37 # left - $('.graph svg').animate(left: '-=400') if e.keyCode is 39 # right diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 272a6e95411..b6213001a0d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -83,9 +83,19 @@ class ProjectsController < ProjectResourceController end def graph - graph = Gitlab::Graph::JsonBuilder.new(project) + + respond_to do |format| + format.html + format.json do + graph = Gitlab::Graph::JsonBuilder.new(project) + #@days_json, @commits_json = graph.days_json, graph.commits_json + render :text => graph.to_json + end + end + + - @days_json, @commits_json = graph.days_json, graph.commits_json + end def destroy diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml index edc3c2de81e..eb70492116c 100644 --- a/app/views/projects/graph.html.haml +++ b/app/views/projects/graph.html.haml @@ -4,12 +4,10 @@ %h4 %small You can move around the graph by using the arrow keys. #holder.graph + .loading :javascript - var commits = #{@commits_json} - , days = #{@days_json}; - var branch_graph = new BranchGraph(days, commits); + var branch_graph; $(function(){ - branch_graph.buildGraph($("#holder")[0]); - GraphNav.init(); + branch_graph = new BranchGraph($("#holder"), '#{url_for :controller => 'projects', :action => 'graph'}'); }); diff --git a/lib/gitlab/graph/commit.rb b/lib/gitlab/graph/commit.rb index af8d7828ce9..3d82c34432f 100644 --- a/lib/gitlab/graph/commit.rb +++ b/lib/gitlab/graph/commit.rb @@ -28,7 +28,7 @@ module Gitlab h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil? h[:id] = sha h[:date] = date - h[:message] = escape_once(message) + h[:message] = message h[:login] = author.email h end diff --git a/lib/gitlab/graph/json_builder.rb b/lib/gitlab/graph/json_builder.rb index c2c3fa662a6..e6017644966 100644 --- a/lib/gitlab/graph/json_builder.rb +++ b/lib/gitlab/graph/json_builder.rb @@ -17,16 +17,15 @@ module Gitlab @commits = collect_commits @days = index_commits end - - def days_json - @days_json = @days.compact.map { |d| [d.day, d.strftime("%b")] }.to_json - end - - def commits_json - @commits_json = @commits.map(&:to_graph_hash).to_json + + def to_json + { + days: @days.compact.map { |d| [d.day, d.strftime("%b")] }, + commits: @commits.map(&:to_graph_hash) + }.to_json end - - protected + + protected # Get commits from repository # diff --git a/vendor/assets/javascripts/branch-graph.js b/vendor/assets/javascripts/branch-graph.js index 8bd8aa02480..c25bf938aa5 100644 --- a/vendor/assets/javascripts/branch-graph.js +++ b/vendor/assets/javascripts/branch-graph.js @@ -1,22 +1,34 @@ !function(){ - var BranchGraph = function(days, commits){ + var BranchGraph = function(element, url){ + this.element = element; + this.url = url; - this.days = days || {}; - this.commits = commits || {}; this.comms = {}; - this.pixelsX = []; - this.pixelsY = []; this.mtime = 0; this.mspace = 0; this.parents = {}; - this.ii = 0; this.colors = ["#000"]; - this.prepareData(); + this.load(); }; - BranchGraph.prototype.prepareData = function(){ + BranchGraph.prototype.load = function(){ + $.ajax({ + url: this.url, + method: 'get', + dataType: 'json', + success: $.proxy(function(data){ + $('.loading', this.element).hide(); + this.prepareData(data.days, data.commits); + this.buildGraph(this.element.get(0)); + }, this) + }); + }, + + BranchGraph.prototype.prepareData = function(days, commits){ + this.days = days; + this.commits = commits; ii = this.commits.length; for (var i = 0; i < ii; i++) { for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { @@ -25,8 +37,8 @@ this.mtime = Math.max(this.mtime, this.commits[i].time); this.mspace = Math.max(this.mspace, this.commits[i].space); } - this.mtime = this.mtime + 4; - this.mspace = this.mspace + 10; + this.mtime += 4; + this.mspace += 10; for (i = 0; i < ii; i++) { if (this.commits[i].id in this.parents) { this.commits[i].isParent = true; @@ -41,10 +53,13 @@ BranchGraph.prototype.buildGraph = function(holder){ var ch = this.mspace * 20 + 20 , cw = this.mtime * 20 + 20 - , r = Raphael("holder", cw, ch) + , r = Raphael(holder, cw, ch) , top = r.set() , cuday = 0 - , cumonth = ""; + , cumonth = "" + , r; + + this.raphael = r; r.rect(0, 0, this.days.length * 20 + 80, 30).attr({fill: "#222"}); r.rect(0, 30, this.days.length * 20 + 80, 20).attr({fill: "#444"}); @@ -116,66 +131,79 @@ } } } - (function (c, x, y) { - top.push(r.circle(x, y, 10).attr({ - fill: "#000", - opacity: 0, - cursor: "pointer" - }) - .click(function(){ - location.href = location.href.replace("graph", "commits/" + c.id); - }) - .hover(function () { - // Create empty node to convert entities to character - var m = $('
    ').html(c.message).text() - , s = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + m).attr({ - fill: "#fff" - }); - this.popup = r.popupit(x, y + 5, s, 0); - top.push(this.popup.insertBefore(this)); - }, function () { - this.popup && this.popup.remove() && delete this.popup; - })); - }(this.commits[i], x, y)); - - top.toFront(); - var hw = holder.offsetWidth - , hh = holder.offsetHeight - , v = r.rect(hw - 8, 0, 4, Math.pow(hh, 2) / ch, 2).attr({ - fill: "#000", - opacity: 0 - }) - , h = r.rect(0, hh - 8, Math.pow(hw, 2) / cw, 4, 2).attr({ - fill: "#000", - opacity: 0 - }) - , bars = r.set(v, h) - , drag - , dragger = function (event) { - if (drag) { - event = event || window.event; - holder.scrollLeft = drag.sl - (event.clientX - drag.x); - holder.scrollTop = drag.st - (event.clientY - drag.y); - } - }; - holder.onmousedown = function (event) { - event = event || window.event; - drag = { - x: event.clientX, - y: event.clientY, - st: holder.scrollTop, - sl: holder.scrollLeft - }; - document.onmousemove = dragger; - bars.animate({opacity: .5}, 300); + this.appendAnchor(top, this.commits[i], x, y); + } + top.toFront(); + var hw = holder.offsetWidth + , hh = holder.offsetHeight + , v = r.rect(hw - 8, 0, 4, Math.pow(hh, 2) / ch, 2).attr({ + fill: "#000", + opacity: 0 + }) + , h = r.rect(0, hh - 8, Math.pow(hw, 2) / cw, 4, 2).attr({ + fill: "#000", + opacity: 0 + }) + , bars = r.set(v, h) + , drag + , dragger = function (event) { + if (drag) { + event = event || window.event; + holder.scrollLeft = drag.sl - (event.clientX - drag.x); + holder.scrollTop = drag.st - (event.clientY - drag.y); + } }; - document.onmouseup = function () { - drag = false; - document.onmousemove = null; - bars.animate({opacity: 0}, 300); + holder.onmousedown = function (event) { + event = event || window.event; + drag = { + x: event.clientX, + y: event.clientY, + st: holder.scrollTop, + sl: holder.scrollLeft }; - holder.scrollLeft = cw; - } + document.onmousemove = dragger; + bars.animate({opacity: .5}, 300); + }; + document.onmouseup = function () { + drag = false; + document.onmousemove = null; + bars.animate({opacity: 0}, 300); + }; + + $(window).on('keydown', function(event){ + if(event.keyCode == 37){ + holder.scrollLeft -= 50; + } + if(event.keyCode == 39){ + // right + holder.scrollLeft += 50; + } + }); + + + holder.scrollLeft = cw; + }; + + BranchGraph.prototype.appendAnchor = function(top, c, x, y) { + var r = this.raphael; + top.push(r.circle(x, y, 10).attr({ + fill: "#000", + opacity: 0, + cursor: "pointer" + }) + .click(function(){ + location.href = location.href.replace("graph", "commits/" + c.id); + }) + .hover(function () { + // Create empty node to convert entities to character + var s = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + c.message).attr({ + fill: "#fff" + }); + this.popup = r.popupit(x, y + 5, s, 0); + top.push(this.popup.insertBefore(this)); + }, function () { + this.popup && this.popup.remove() && delete this.popup; + })); }; this.BranchGraph = BranchGraph; -- cgit v1.2.1 From eededdd4beeb995a270172bb1985228ee09dbd41 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 7 Dec 2012 14:55:56 +0100 Subject: fix notify_team on wall --- app/observers/note_observer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/observers/note_observer.rb b/app/observers/note_observer.rb index 083aa7058d5..fe01efcaac2 100644 --- a/app/observers/note_observer.rb +++ b/app/observers/note_observer.rb @@ -21,7 +21,7 @@ class NoteObserver < ActiveRecord::Observer # Notifies the whole team except the author of note def notify_team(note) # Note: wall posts are not "attached" to anything, so fall back to "Wall" - noteable_type = note.noteable_type || "Wall" + noteable_type = note.noteable_type.presence || "Wall" notify_method = "note_#{noteable_type.underscore}_email".to_sym if Notify.respond_to? notify_method -- cgit v1.2.1 From 4b2ecbc420ca10ad78e0e6f921d6740c84f2574a Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Fri, 7 Dec 2012 22:05:17 +0100 Subject: Updated branch-graph, abstracted some code in seperate functions Removed unused Raphael.fn.popup --- app/controllers/projects_controller.rb | 20 +-- app/views/projects/graph.html.haml | 5 +- lib/gitlab/graph/json_builder.rb | 4 +- vendor/assets/javascripts/branch-graph.js | 280 +++++++++++++++--------------- 4 files changed, 149 insertions(+), 160 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b6213001a0d..d6c6a1bdbd7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -54,12 +54,12 @@ class ProjectsController < ProjectResourceController respond_to do |format| format.html do - unless @project.empty_repo? - @last_push = current_user.recent_push(@project.id) - render :show - else - render "projects/empty" - end + unless @project.empty_repo? + @last_push = current_user.recent_push(@project.id) + render :show + else + render "projects/empty" + end end format.js end @@ -83,19 +83,13 @@ class ProjectsController < ProjectResourceController end def graph - respond_to do |format| format.html format.json do graph = Gitlab::Graph::JsonBuilder.new(project) - #@days_json, @commits_json = graph.days_json, graph.commits_json - render :text => graph.to_json + render :json => graph.to_json end end - - - - end def destroy diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml index eb70492116c..1ba280bb06c 100644 --- a/app/views/projects/graph.html.haml +++ b/app/views/projects/graph.html.haml @@ -9,5 +9,8 @@ :javascript var branch_graph; $(function(){ - branch_graph = new BranchGraph($("#holder"), '#{url_for :controller => 'projects', :action => 'graph'}'); + branch_graph = new BranchGraph($("#holder"), { + url: '#{url_for controller: 'projects', action: 'graph', format: :json}', + commit_url: '#{url_for controller: 'projects', action: 'show'}/commits/%s' + }); }); diff --git a/lib/gitlab/graph/json_builder.rb b/lib/gitlab/graph/json_builder.rb index e6017644966..a5914363393 100644 --- a/lib/gitlab/graph/json_builder.rb +++ b/lib/gitlab/graph/json_builder.rb @@ -18,11 +18,11 @@ module Gitlab @days = index_commits end - def to_json + def to_json(*args) { days: @days.compact.map { |d| [d.day, d.strftime("%b")] }, commits: @commits.map(&:to_graph_hash) - }.to_json + }.to_json(*args) end protected diff --git a/vendor/assets/javascripts/branch-graph.js b/vendor/assets/javascripts/branch-graph.js index c25bf938aa5..11c74554c45 100644 --- a/vendor/assets/javascripts/branch-graph.js +++ b/vendor/assets/javascripts/branch-graph.js @@ -1,10 +1,10 @@ !function(){ - var BranchGraph = function(element, url){ + var BranchGraph = function(element, options){ this.element = element; - this.url = url; + this.options = options; - this.comms = {}; + this.preparedCommits = {}; this.mtime = 0; this.mspace = 0; this.parents = {}; @@ -15,67 +15,83 @@ BranchGraph.prototype.load = function(){ $.ajax({ - url: this.url, + url: this.options.url, method: 'get', dataType: 'json', success: $.proxy(function(data){ $('.loading', this.element).hide(); this.prepareData(data.days, data.commits); - this.buildGraph(this.element.get(0)); + this.buildGraph(); }, this) }); - }, + }; BranchGraph.prototype.prepareData = function(days, commits){ this.days = days; + this.dayCount = days.length; this.commits = commits; - ii = this.commits.length; - for (var i = 0; i < ii; i++) { - for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { - this.parents[this.commits[i].parents[j][0]] = true; - } - this.mtime = Math.max(this.mtime, this.commits[i].time); - this.mspace = Math.max(this.mspace, this.commits[i].space); - } + this.commitCount = commits.length; + + this.collectParents(); + this.mtime += 4; this.mspace += 10; - for (i = 0; i < ii; i++) { + for (var i = 0; i < this.commitCount; i++) { if (this.commits[i].id in this.parents) { this.commits[i].isParent = true; } - this.comms[this.commits[i].id] = this.commits[i]; + this.preparedCommits[this.commits[i].id] = this.commits[i]; } + this.collectColors(); + }; + + BranchGraph.prototype.collectParents = function(){ + for (var i = 0; i < this.commitCount; i++) { + for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { + this.parents[this.commits[i].parents[j][0]] = true; + } + this.mtime = Math.max(this.mtime, this.commits[i].time); + this.mspace = Math.max(this.mspace, this.commits[i].space); + } + }; + + BranchGraph.prototype.collectColors = function(){ for (var k = 0; k < this.mspace; k++) { this.colors.push(Raphael.getColor()); } }; - BranchGraph.prototype.buildGraph = function(holder){ - var ch = this.mspace * 20 + 20 - , cw = this.mtime * 20 + 20 - , r = Raphael(holder, cw, ch) + BranchGraph.prototype.buildGraph = function(){ + var graphWidth = $(this.element).width() + , ch = this.mspace * 20 + 20 + , cw = Math.max(graphWidth, this.mtime * 20 + 20) + , r = Raphael(this.element.get(0), cw, ch) , top = r.set() , cuday = 0 , cumonth = "" - , r; + , offsetX = 20 + , offsetY = 60 + , barWidth = Math.max(graphWidth, this.dayCount * 20 + 80); this.raphael = r; - r.rect(0, 0, this.days.length * 20 + 80, 30).attr({fill: "#222"}); - r.rect(0, 30, this.days.length * 20 + 80, 20).attr({fill: "#444"}); + r.rect(0, 0, barWidth, 20).attr({fill: "#222"}); + r.rect(0, 20, barWidth, 20).attr({fill: "#444"}); - for (mm = 0; mm < this.days.length; mm++) { + for (mm = 0; mm < this.dayCount; mm++) { if(this.days[mm] != null){ if(cuday != this.days[mm][0]){ - r.text(10 + mm * 20, 40, this.days[mm][0]).attr({ - font: "14px Fontin-Sans, Arial", + // Dates + r.text(offsetX + mm * 20, 31, this.days[mm][0]).attr({ + font: "12px Monaco, Arial", fill: "#DDD" }); cuday = this.days[mm][0]; } if(cumonth != this.days[mm][1]){ - r.text(10 + mm * 20, 15, this.days[mm][1]).attr({ - font: "14px Fontin-Sans, Arial", + // Months + r.text(offsetX + mm * 20, 11, this.days[mm][1]).attr({ + font: "12px Monaco, Arial", fill: "#EEE" }); cumonth = this.days[mm][1]; @@ -83,9 +99,9 @@ } } - for (i = 0; i < ii; i++) { - var x = 10 + 20 * this.commits[i].time - , y = 70 + 20 * this.commits[i].space; + for (i = 0; i < this.commitCount; i++) { + var x = offsetX + 20 * this.commits[i].time + , y = offsetY + 20 * this.commits[i].space; r.circle(x, y, 3).attr({ fill: this.colors[this.commits[i].space], stroke: "none" @@ -96,22 +112,28 @@ if (shortrefs.length > 15){ shortrefs = shortrefs.substr(0,13) + "..."; } - var t = r.text(x+5, y+5, shortrefs).attr({ - font: "12px Fontin-Sans, Arial", fill: "#666", - title: longrefs, cursor: "pointer", rotation: "90" + var t = r.text(x+5, y+8, shortrefs).attr({ + font: "12px Monaco, Arial", + fill: "#666", + title: longrefs, + cursor: "pointer", + rotation: "90" }); var textbox = t.getBBox(); t.translate(textbox.height/-4, textbox.width/2); } + var c; for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { - var c = this.comms[this.commits[i].parents[j][0]]; + c = this.preparedCommits[this.commits[i].parents[j][0]]; if (c) { - var cx = 10 + 20 * c.time - , cy = 70 + 20 * c.space; + var cx = offsetX + 20 * c.time + , cy = offsetY + 20 * c.space; if (c.space == this.commits[i].space) { - r.path("M" + (x - 5) + "," + (y + .0001) + "L" + (15 + 20 * c.time) + "," + (y + .0001)) - .attr({ + r.path([ + "M", x, y, + "L", x - 20 * (c.time + 1), y + ]).attr({ stroke: this.colors[c.space], "stroke-width": 2 }); @@ -134,130 +156,100 @@ this.appendAnchor(top, this.commits[i], x, y); } top.toFront(); - var hw = holder.offsetWidth - , hh = holder.offsetHeight - , v = r.rect(hw - 8, 0, 4, Math.pow(hh, 2) / ch, 2).attr({ - fill: "#000", - opacity: 0 - }) - , h = r.rect(0, hh - 8, Math.pow(hw, 2) / cw, 4, 2).attr({ - fill: "#000", - opacity: 0 - }) - , bars = r.set(v, h) - , drag - , dragger = function (event) { - if (drag) { - event = event || window.event; - holder.scrollLeft = drag.sl - (event.clientX - drag.x); - holder.scrollTop = drag.st - (event.clientY - drag.y); - } - }; - holder.onmousedown = function (event) { - event = event || window.event; - drag = { - x: event.clientX, - y: event.clientY, - st: holder.scrollTop, - sl: holder.scrollLeft - }; - document.onmousemove = dragger; - bars.animate({opacity: .5}, 300); - }; - document.onmouseup = function () { - drag = false; - document.onmousemove = null; - bars.animate({opacity: 0}, 300); - }; + this.element.scrollLeft(cw); + this.bindEvents(); + }; + + BranchGraph.prototype.bindEvents = function(){ + var drag = {} + , element = this.element; - $(window).on('keydown', function(event){ - if(event.keyCode == 37){ - holder.scrollLeft -= 50; + var dragger = function(event){ + element.scrollLeft(drag.sl - (event.clientX - drag.x)); + element.scrollTop(drag.st - (event.clientY - drag.y)); + }; + + element.on({ + mousedown: function (event) { + drag = { + x: event.clientX, + y: event.clientY, + st: element.scrollTop(), + sl: element.scrollLeft() + }; + $(window).on('mousemove', dragger); } - if(event.keyCode == 39){ - // right - holder.scrollLeft += 50; + }); + $(window).on({ + mouseup: function(){ + //bars.animate({opacity: 0}, 300); + $(window).off('mousemove', dragger); + }, + keydown: function(event){ + if(event.keyCode == 37){ + // left + element.scrollLeft( element.scrollLeft() - 50); + } + if(event.keyCode == 38){ + // top + element.scrollTop( element.scrollTop() - 50); + } + if(event.keyCode == 39){ + // right + element.scrollLeft( element.scrollLeft() + 50); + } + if(event.keyCode == 40){ + // bottom + element.scrollTop( element.scrollTop() + 50); + } } }); - - - holder.scrollLeft = cw; }; BranchGraph.prototype.appendAnchor = function(top, c, x, y) { - var r = this.raphael; - top.push(r.circle(x, y, 10).attr({ + var r = this.raphael + , options = this.options + , anchor; + anchor = r.circle(x, y, 10).attr({ fill: "#000", opacity: 0, cursor: "pointer" }) .click(function(){ - location.href = location.href.replace("graph", "commits/" + c.id); + window.location = options.commit_url.replace('%s', c.id); }) - .hover(function () { - // Create empty node to convert entities to character - var s = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + c.message).attr({ + .hover(function(){ + var text = r.text(100, 100, c.author + "\n \n" + c.id + "\n \n" + c.message).attr({ fill: "#fff" }); - this.popup = r.popupit(x, y + 5, s, 0); + this.popup = r.tooltip(x, y + 5, text, 0); top.push(this.popup.insertBefore(this)); - }, function () { + }, function(){ this.popup && this.popup.remove() && delete this.popup; - })); + }); + top.push(anchor); }; this.BranchGraph = BranchGraph; }(this); -Raphael.fn.popupit = function (x, y, set, dir, size) { - dir = dir == null ? 2 : dir; - size = size || 5; - x = Math.round(x); - y = Math.round(y); - var mmax = Math.max, - bb = set.getBBox(), - w = Math.round(bb.width / 2), - h = Math.round(bb.height / 2), - dx = [0, w + size * 2, 0, -w - size * 2], - dy = [-h * 2 - size * 3, -h - size, 0, -h - size], - p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size, - "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size, - "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size, - "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size, - "l", -mmax(w - size, 0), 0, "z"].join(","), - xy = [{x: x, y: y + size * 2 + h}, {x: x - size * 2 - w, y: y}, {x: x, y: y - size * 2 - h}, {x: x + size * 2 + w, y: y}][dir]; - set.translate(xy.x - w - bb.x, xy.y - h - bb.y); - return this.set(this.path(p).attr({fill: "#234", stroke: "none"}).insertBefore(set.node ? set : set[0]), set); -}; -Raphael.fn.popup = function (x, y, text, dir, size) { - dir = dir == null ? 2 : dir > 3 ? 3 : dir; - size = size || 5; - text = text || "$9.99"; - var res = this.set(), - d = 3; - res.push(this.path().attr({fill: "#000", stroke: "#000"})); - res.push(this.text(x, y, text).attr(this.g.txtattr).attr({fill: "#fff", "font-family": "Helvetica, Arial"})); - res.update = function (X, Y, withAnimation) { - X = X || x; - Y = Y || y; - var bb = this[1].getBBox(), - w = bb.width / 2, - h = bb.height / 2, - dx = [0, w + size * 2, 0, -w - size * 2], - dy = [-h * 2 - size * 3, -h - size, 0, -h - size], - p = ["M", X - dx[dir], Y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size, - "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size, - "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size, - "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size, - "l", -mmax(w - size, 0), 0, "z"].join(","), - xy = [{x: X, y: Y + size * 2 + h}, {x: X - size * 2 - w, y: Y}, {x: X, y: Y - size * 2 - h}, {x: X + size * 2 + w, y: Y}][dir]; - xy.path = p; - if (withAnimation) { - this.animate(xy, 500, ">"); - } else { - this.attr(xy); - } - return this; - }; - return res.update(x, y); -}; +Raphael.fn.tooltip = function (x, y, set, dir, size) { + dir = dir == null ? 2 : dir; + size = size || 5; + x = Math.round(x); + y = Math.round(y); + var mmax = Math.max + , bb = set.getBBox() + , w = Math.round(bb.width / 2) + , h = Math.round(bb.height / 2) + , dx = [0, w + size * 2, 0, -w - size * 2] + , dy = [-h * 2 - size * 3, -h - size, 0, -h - size] + , p = ["M", x - dx[dir], y - dy[dir], "l", -size, (dir == 2) * -size, -mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, -size, -size, + "l", 0, -mmax(h - size, 0), (dir == 3) * -size, -size, (dir == 3) * size, -size, 0, -mmax(h - size, 0), "a", size, size, 0, 0, 1, size, -size, + "l", mmax(w - size, 0), 0, size, !dir * -size, size, !dir * size, mmax(w - size, 0), 0, "a", size, size, 0, 0, 1, size, size, + "l", 0, mmax(h - size, 0), (dir == 1) * size, size, (dir == 1) * -size, size, 0, mmax(h - size, 0), "a", size, size, 0, 0, 1, -size, size, + "l", -mmax(w - size, 0), 0, "z"].join(",") + , xy = [{x: x, y: y + size * 2 + h}, {x: x - size * 2 - w, y: y}, {x: x, y: y - size * 2 - h}, {x: x + size * 2 + w, y: y}][dir]; + set.translate(xy.x - w - bb.x, xy.y - h - bb.y); + return this.set(this.path(p).attr({fill: "#234", stroke: "none"}).insertBefore(set.node ? set : set[0]), set); +}; \ No newline at end of file -- cgit v1.2.1 From f8144bd37766fbd815ccc6d7de6b48f17d3fbf65 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sat, 8 Dec 2012 11:42:38 +0100 Subject: add help/raketasks to routing spec --- spec/routing/routing_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 988063db4b0..57fd70e7497 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -33,6 +33,7 @@ end # help_system_hooks GET /help/system_hooks(.:format) help#system_hooks # help_markdown GET /help/markdown(.:format) help#markdown # help_ssh GET /help/ssh(.:format) help#ssh +# help_raketasks GET /help/raketasks(.:format) help#raketasks describe HelpController, "routing" do it "to #index" do get("/help").should route_to('help#index') @@ -65,6 +66,10 @@ describe HelpController, "routing" do it "to #ssh" do get("/help/ssh").should route_to('help#ssh') end + + it "to #raketasks" do + get("/help/raketasks").should route_to('help#raketasks') + end end # errors_githost GET /errors/githost(.:format) errors#githost -- cgit v1.2.1 From 3a481777629e3280b48b55deb287dca02ee389e6 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sat, 8 Dec 2012 17:34:24 +0100 Subject: add help raketasks to search autocomplete --- app/helpers/application_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 81be62421c3..571c0cb71b6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -95,6 +95,7 @@ module ApplicationHelper { label: "API Help", url: help_api_path }, { label: "Markdown Help", url: help_markdown_path }, { label: "SSH Keys Help", url: help_ssh_path }, + { label: "Gitlab Rake Tasks Help", url: help_raketasks_path }, ] project_nav = [] -- cgit v1.2.1 From 80e984ee5e6d29431a4a87ed26105fb0e8987ffb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 8 Dec 2012 20:48:33 +0200 Subject: Fix project lookup in post receive --- app/workers/post_receive.rb | 9 ++++++--- lib/hooks/post-receive | 5 ++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index 4f4f69c4ece..bf14ab8d579 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -1,12 +1,15 @@ class PostReceive @queue = :post_receive - def self.perform(reponame, oldrev, newrev, ref, identifier) - project = Project.find_by_path(reponame) + def self.perform(repo_path, oldrev, newrev, ref, identifier) + repo_path = repo_path.gsub(Gitlab.config.git_base_path, "") + repo_path = repo_path.gsub(/.git$/, "") + + project = Project.find_with_namespace(repo_path) return false if project.nil? # Ignore push from non-gitlab users - user = if identifier.eql? Gitlab.config.gitolite_admin_key + user = if identifier.eql? Gitlab.config.gitolite_admin_key email = project.commit(newrev).author.email rescue nil User.find_by_email(email) if email elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier) diff --git a/lib/hooks/post-receive b/lib/hooks/post-receive index 4a3ce372eb8..ebd9e1a028a 100755 --- a/lib/hooks/post-receive +++ b/lib/hooks/post-receive @@ -6,7 +6,6 @@ while read oldrev newrev ref do # For every branch or tag that was pushed, create a Resque job in redis. - pwd=`pwd` - reponame=`basename "$pwd" | sed s/\.git$//` - env -i redis-cli rpush "resque:gitlab:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1 + repo_path=`pwd` + env -i redis-cli rpush "resque:gitlab:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$repo_path\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1 done -- cgit v1.2.1 From 8a08fdcd32ec58bc538ce5b6fc9df3fbe61d05e1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 9 Dec 2012 10:34:46 +0200 Subject: Fix worker specs to parse namespaces --- app/workers/post_receive.rb | 5 +++-- spec/workers/post_receive_spec.rb | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index bf14ab8d579..11281b8b656 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -2,8 +2,9 @@ class PostReceive @queue = :post_receive def self.perform(repo_path, oldrev, newrev, ref, identifier) - repo_path = repo_path.gsub(Gitlab.config.git_base_path, "") - repo_path = repo_path.gsub(/.git$/, "") + repo_path.gsub!(Gitlab.config.git_base_path.to_s, "") + repo_path.gsub!(/.git$/, "") + repo_path.gsub!(/^\//, "") project = Project.find_with_namespace(repo_path) return false if project.nil? diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index bbc91f4474a..443c8c1a3c4 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -14,8 +14,8 @@ describe PostReceive do let(:key_id) { key.identifier } it "fetches the correct project" do - Project.should_receive(:find_by_path).with(project.path).and_return(project) - PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id) + Project.should_receive(:find_by_path).with(project.path_with_namespace).and_return(project) + PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id) end it "does not run if the author is not in the project" do @@ -24,7 +24,7 @@ describe PostReceive do project.should_not_receive(:observe_push) project.should_not_receive(:execute_hooks) - PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false + PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false end it "asks the project to trigger all hooks" do @@ -34,7 +34,11 @@ describe PostReceive do project.should_receive(:update_merge_requests) project.should_receive(:observe_push) - PostReceive.perform(project.path, 'sha-old', 'sha-new', 'refs/heads/master', key_id) + PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id) end end + + def pwd(project) + File.join(Gitlab.config.git_base_path, project.path_with_namespace) + end end -- cgit v1.2.1 From f4d9059b7e2d1750abbe3ff9a41d3e854df68ffb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 9 Dec 2012 10:56:15 +0200 Subject: Show project with namespace in feeds --- app/assets/stylesheets/gitlab_bootstrap/common.scss | 1 + app/helpers/projects_helper.rb | 12 ++++++++++-- app/views/dashboard/_groups.html.haml | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index d6089cea6dc..dca558df000 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -30,6 +30,7 @@ .borders { border: 1px solid #ccc; @include shade; } .hint { font-style: italic; color: #999; } .light { color: #888 } +.tiny { font-weight: normal } /** PILLS & TABS**/ .nav-pills a:hover { background-color: #888; } diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 7c302ef4176..4690a452e25 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -8,11 +8,19 @@ module ProjectsHelper end def link_to_project project - link_to project.name, project + link_to project do + title = content_tag(:strong, project.name) + + if project.namespace + namespace = content_tag(:span, "#{project.namespace.human_name} / ", class: 'tiny') + title = namespace + title + end + + title + end end def tm_path team_member project_team_member_path(@project, team_member) end end - diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index 8f66742098a..0ef054155b6 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -12,7 +12,7 @@ - groups.each do |group| %li.wll = link_to group_path(id: group.path), class: dom_class(group) do - %strong.group_name= truncate(group.name, length: 25) + %strong.group_name= truncate(group.name, length: 35) %span.arrow → %span.last_activity -- cgit v1.2.1 From f1dfc27c5dad642d2d2c446f1a3fd865464b6fa6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 9 Dec 2012 16:03:24 +0200 Subject: Replace project with namespace for events --- app/views/events/_event_last_push.html.haml | 2 +- app/views/events/event/_push.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml index e15f1ac063c..b2376019c8e 100644 --- a/app/views/events/_event_last_push.html.haml +++ b/app/views/events/_event_last_push.html.haml @@ -6,7 +6,7 @@ = link_to project_commits_path(event.project, event.ref_name) do %strong= truncate(event.ref_name, length: 28) at - %strong= link_to event.project.name, event.project + %strong= link_to_project event.project %span = time_ago_in_words(event.created_at) ago. diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 869321ed699..8d0718ad650 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -7,7 +7,7 @@ = link_to project_commits_path(event.project, event.ref_name) do %strong= event.ref_name at - %strong= link_to event.project.name, event.project + %strong= link_to_project event.project - if event.push_with_commits? - project = event.project -- cgit v1.2.1 From a76a34dd1d0719521790eb8bd30cd368dc7a331c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 9 Dec 2012 16:05:24 +0200 Subject: Fix installatiion doc --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 697b82b40c1..e8b187b7e75 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -86,7 +86,7 @@ Create a user for GitLab: sudo adduser --disabled-login --gecos 'GitLab' gitlab # Add it to the git group - sudo addmod -a -G git gitlab + sudo usermod -a -G git gitlab # Generate the SSH key sudo -u gitlab -H ssh-keygen -q -N '' -t rsa -f /home/gitlab/.ssh/id_rsa -- cgit v1.2.1 From 2b79706d6d3c4f39f3eb11508ca59c5f6f1caa4f Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 10 Dec 2012 01:08:34 +0100 Subject: Fix spelling and wording in installation.md --- doc/install/installation.md | 72 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index e8b187b7e75..78337426ff0 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -1,14 +1,19 @@ This installation guide was created for Debian/Ubuntu and tested on it. -Please read doc/install/requirements.md for hardware andplatform requirements. +Please read `doc/install/requirements.md` for hardware and platform requirements. -**Important Note** +**Important Note:** The following steps have been known to work. If you deviate from this guide, do it with caution and make sure you don't violate any assumptions GitLab makes about its environment. -If you find a bug/error in this guide please an issue or pull request following -the contribution guide (see CONTRIBUTING.md). +For things like AWS installation scripts, init scripts or config files for +alternative web server have a look at the "Advanced Setup Tips" section. + + +**Important Note:** +If you find a bug/error in this guide please submit an issue or pull request +following the contribution guide (see `CONTRIBUTING.md`). - - - @@ -51,7 +56,7 @@ Make sure you have the right version of Python installed. # If it's Python 3 you might need to install Python 2 separately sudo apt-get install python2.7 - # Make sure you can access Python via `python2` + # Make sure you can access Python via python2 python2 --version # If you get a "command not found" error create a link to the python binary @@ -100,7 +105,7 @@ Clone GitLab's fork of the Gitolite source code: Setup Gitolite with GitLab as its admin: -**Important Note** +**Important Note:** GitLab assumes *full and unshared* control over this Gitolite installation. # Add Gitolite scripts to $PATH @@ -131,20 +136,20 @@ Fix the directory permissions for the repository: # If it succeeded without errors you can remove the cloned repo sudo rm -rf /tmp/gitolite-admin -**Impornant Note** -If you can't clone the `gitolite-admin` repository: **DO NOT PROCEED WITH INSTALLATION** +**Important Note:** +If you can't clone the `gitolite-admin` repository: **DO NOT PROCEED WITH INSTALLATION**! Check the [Trouble Shooting Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) and make sure you have followed all of the above steps carefully. # 5. Database -See doc/install/databases.md +See `doc/install/databases.md` # 6. GitLab - We'll install GitLab into the gitlab user's home directory + # We'll install GitLab into home directory of the user "gitlab" cd /home/gitlab ## Clone the Source @@ -152,7 +157,7 @@ See doc/install/databases.md # Clone the latest stable release sudo -u gitlab -H git clone -b stable https://github.com/gitlabhq/gitlabhq.git gitlab -**Note*** +**Note:** You can change `stable` to `master` if you want the *bleeding edge* version, but do so with caution! @@ -170,7 +175,7 @@ do so with caution! # Copy the example Unicorn config sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb -**Important Note** +**Important Note:** Make sure to edit both files to match your setup. ## Install Gems @@ -184,8 +189,8 @@ Make sure to edit both files to match your setup. ## Configure Git GitLab needs to be able to commit and push changes to Gitolite. In order to do -that Git requires a username and email. (Please use the `email.from` address -for the email) +that Git requires a username and email. (We recommend using the same address +used for the `email.from` setting in `config/gitlab.yml`) sudo -u gitlab -H git config --global user.name "GitLab" sudo -u gitlab -H git config --global user.email "gitlab@localhost" @@ -202,7 +207,7 @@ for the email) ## Check Application Status -Check if GitLab and its environment is configured correctly: +Check if GitLab and its environment is configured correctly: sudo -u gitlab -H bundle exec rake gitlab:env:info RAILS_ENV=production @@ -210,25 +215,8 @@ To make sure you didn't miss anything run a more thorough check with: sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production -``` -# OUTPUT EXAMPLE -Starting diagnostic -config/database.yml............exists -config/gitlab.yml............exists -/home/git/repositories/............exists -/home/git/repositories/ is writable?............YES -remote: Counting objects: 603, done. -remote: Compressing objects: 100% (466/466), done. -remote: Total 603 (delta 174), reused 0 (delta 0) -Receiving objects: 100% (603/603), 53.29 KiB, done. -Resolving deltas: 100% (174/174), done. -Can clone gitolite-admin?............YES -UMASK for .gitolite.rc is 0007? ............YES -/home/git/share/gitolite/hooks/common/post-receive exists? ............YES -``` - -If you are all green - congratulations! You run a GitLab now. -But there are still a few steps to go. +If you are all green: congratulations, you successfully installed GitLab! +Although this is the case, there are still a few steps to go. ## Install Init Script @@ -250,6 +238,10 @@ Start your GitLab instance: # 7. Nginx +**Note:** +If you can't or don't want to use Nginx as your web server, have a look at the +"Advanced Setup Tips" section. + ## Installation sudo apt-get install nginx @@ -280,7 +272,7 @@ The setup has created an admin account for you. You can use it to log in: admin@local.host 5iveL!fe -**Important Note** +**Important Note:** Please go over to your profile page and immediately chage the password, so nobody can access your GitLab by using this login information later on. @@ -290,9 +282,9 @@ nobody can access your GitLab by using this login information later on. - - - -# Advanced setup tips: +# Advanced Setup Tips -## Custom Redis connections +## Custom Redis Connection If you'd like Resque to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the @@ -300,3 +292,9 @@ a different host, you can configure its connection string via the # example production: redis.example.tld:6379 + + +## User-contributed Configurations + +You can find things like AWS installation scripts, init scripts or config files +for alternative web server in our [recipes collection](https://github.com/gitlabhq/gitlab-recipes/). -- cgit v1.2.1 From bf13579b929151aa80ca957486b1851b067aa4ac Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 10 Dec 2012 06:14:05 +0300 Subject: Make admin sorting more obvious --- app/controllers/admin/groups_controller.rb | 2 +- app/controllers/admin/users_controller.rb | 2 +- app/roles/repository.rb | 18 ++++++++++++++++-- app/views/admin/groups/index.html.haml | 10 ++++++++-- app/views/admin/projects/index.html.haml | 4 +++- app/views/admin/projects/show.html.haml | 30 ++++++++++++++++++++---------- app/views/admin/users/index.html.haml | 4 +++- app/views/admin/users/show.html.haml | 18 ++++++++++++++++-- 8 files changed, 68 insertions(+), 20 deletions(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 4fad8d2bdea..a492e66611f 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -2,7 +2,7 @@ class Admin::GroupsController < AdminController before_filter :group, only: [:edit, :show, :update, :destroy, :project_update] def index - @groups = Group.scoped + @groups = Group.order('name ASC') @groups = @groups.search(params[:name]) if params[:name].present? @groups = @groups.page(params[:page]).per(20) end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 744b1912a6c..5614aaa2a67 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -3,7 +3,7 @@ class Admin::UsersController < AdminController @admin_users = User.scoped @admin_users = @admin_users.filter(params[:filter]) @admin_users = @admin_users.search(params[:name]) if params[:name].present? - @admin_users = @admin_users.order("updated_at DESC").page(params[:page]) + @admin_users = @admin_users.order("name ASC").page(params[:page]) end def show diff --git a/app/roles/repository.rb b/app/roles/repository.rb index 74cae5c8d5d..4e80d50cc72 100644 --- a/app/roles/repository.rb +++ b/app/roles/repository.rb @@ -45,8 +45,22 @@ module Repository end def has_post_receive_file? - hook_file = File.join(path_to_repo, 'hooks', 'post-receive') - File.exists?(hook_file) + !!hook_file + end + + def valid_post_receive_file? + valid_hook_file == hook_file + end + + def valid_hook_file + @valid_hook_file ||= File.read(Rails.root.join('lib', 'hooks', 'post-receive')) + end + + def hook_file + @hook_file ||= begin + hook_path = File.join(path_to_repo, 'hooks', 'post-receive') + File.read(hook_path) if File.exists?(hook_path) + end end # Returns an Array of branch names diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 455730a06c4..6fbeed82a77 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -12,16 +12,22 @@ %table %thead - %th Name + %th + Name + %i.icon-sort-down %th Path %th Projects + %th Owner %th.cred Danger Zone! - @groups.each do |group| %tr - %td= link_to group.name, [:admin, group] + %td + %strong= link_to group.name, [:admin, group] %td= group.path %td= group.projects.count + %td + = link_to group.owner_name, admin_user_path(group.owner_id) %td.bgred = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small" = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger" diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 9bbcbc71111..605a733574c 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -9,7 +9,9 @@ %table %thead - %th Name + %th + Name + %i.icon-sort-down %th Path %th Team Members %th Last Commit diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 47185308f41..1ca3128523f 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -4,14 +4,24 @@ %i.icon-edit Edit -- if !@project.has_post_receive_file? && @project.has_commits? - %br - .alert.alert-error - %span - %strong Important! - Project has commits but missing post-receive file. - %br - If you exported project manually - copy post-receive hook to bare repository +- if @project.has_commits? + - if !@project.has_post_receive_file? + %br + .alert.alert-error + %span + %strong Project has commits but missing post-receive file. + %br + If you exported project manually - make a link of post-receive hook file from gitolite to project repository + - elsif !@project.valid_post_receive_file? + %br + .alert.alert-error + %span + %strong Project has invalid post-receive file. + %br + 1. Make sure your gitolite instace has latest post-receive file. + %br + 2. Make a link of post-receive hook file from gitolite to project repository + %br %table.zebra-striped @@ -53,7 +63,7 @@ %td = check_box_tag :post_receive_file, 1, @project.has_post_receive_file?, disabled: true %br -%h3 +%h5 Team %small (#{@project.users_projects.count}) @@ -75,7 +85,7 @@ %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small" %br -%h3 Add new team member +%h5 Add new team member %br = form_tag team_update_admin_project_path(@project), class: "bulk_import", method: :put do %table.zebra-striped diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 5d0f6fe1153..7544a732db2 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -22,7 +22,9 @@ %table %thead %th Admin - %th Name + %th + Name + %i.icon-sort-down %th Username %th Email %th Projects diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index f9410161453..1af7549c074 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -66,7 +66,7 @@ = @admin_user.twitter %br -%h3 Add User to Projects +%h5 Add User to Projects %br = form_tag team_update_admin_user_path(@admin_user), class: "bulk_import", method: :put do %table @@ -86,8 +86,22 @@ %strong= link_to "here", help_permissions_path, class: "vlink" %br +- if @admin_user.groups.present? + %h5 Owner of groups: + %br + + %table.zebra-striped + %thead + %tr + %th Name + + - @admin_user.groups.each do |group| + %tr + %td= link_to group.name, admin_group_path(group) + + - if @admin_user.projects.present? - %h3 Projects + %h5 Projects: %br %table.zebra-striped -- cgit v1.2.1 From f6fd2e309ffc6456d874c0a7a8440afa3438ed1c Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Mon, 10 Dec 2012 12:15:51 +0100 Subject: Added link to support forum --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5f8314462a2..822baa032aa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,9 @@ +## Usage & Configuration + +Do you have a question related to usage or configuration, please head over to the [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq). + + + ## Contribute to GitLab If you want to contribute to GitLab, follow this process: -- cgit v1.2.1 From b1437d4c8d6991be1b53477c50748b45de2ee09c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 10 Dec 2012 06:24:05 +0300 Subject: use link_to_project for Dashboard: Issues, MR --- app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 6 +++++- app/views/dashboard/issues.html.haml | 2 +- app/views/dashboard/merge_requests.html.haml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index f08e5dc7904..898d68bdf23 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -65,7 +65,7 @@ border: 1px solid #eaeaea; @include border-radius(4px); - + border-color: #CCC; @include solid-shade; @@ -84,6 +84,10 @@ border-top: 1px solid #eaeaea; border-bottom: 1px solid #bbb; + > a { + text-shadow: 0 1px 1px #fff; + } + &.small { line-height: 28px; font-size: 14px; diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index e3093bcfe2a..c2c124980f4 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -13,7 +13,7 @@ - @issues.group_by(&:project).each do |group| %div.ui-box - @project = group[0] - %h5= link_to(@project.name, project_path(@project)) + %h5= link_to_project @project %ul.unstyled.issues_table - group[1].each do |issue| = render(partial: 'issues/show', locals: {issue: issue}) diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 8454cfdc120..ce9438405c8 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -12,7 +12,7 @@ - @merge_requests.group_by(&:project).each do |group| %ul.unstyled.ui-box - @project = group[0] - %h5= @project.name + %h5= link_to_project @project - group[1].each do |merge_request| = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) %hr -- cgit v1.2.1 From a5243178edec1fde0365006b2aaaf44953181d84 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 10 Dec 2012 20:27:27 +0100 Subject: Fix commit url in PushObserver#post_receive_data Fixes #2246 --- app/roles/push_observer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/roles/push_observer.rb b/app/roles/push_observer.rb index c5c5203d7a6..8d414642f4b 100644 --- a/app/roles/push_observer.rb +++ b/app/roles/push_observer.rb @@ -114,7 +114,7 @@ module PushObserver id: commit.id, message: commit.safe_message, timestamp: commit.date.xmlschema, - url: "#{Gitlab.config.url}/#{path}/commits/#{commit.id}", + url: "#{Gitlab.config.url}/#{path}/commit/#{commit.id}", author: { name: commit.author_name, email: commit.author_email -- cgit v1.2.1 From 8918d11379cc29d679de72f230193cd35d722c3e Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 10 Dec 2012 21:00:10 +0100 Subject: Fix project hook spec --- spec/models/project_hooks_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/project_hooks_spec.rb b/spec/models/project_hooks_spec.rb index 7c8f05b17a3..39a628a9436 100644 --- a/spec/models/project_hooks_spec.rb +++ b/spec/models/project_hooks_spec.rb @@ -108,7 +108,7 @@ describe Project, "Hooks" do it { should include(id: @commit.id) } it { should include(message: @commit.safe_message) } it { should include(timestamp: @commit.date.xmlschema) } - it { should include(url: "#{Gitlab.config.url}/#{project.code}/commits/#{@commit.id}") } + it { should include(url: "#{Gitlab.config.url}/#{project.code}/commit/#{@commit.id}") } context "with a author" do subject { @data[:commits].first[:author] } -- cgit v1.2.1 From 9f940aeaf4fbfed2906900dda81b1f6b5a0656a6 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 10 Dec 2012 22:53:33 +0100 Subject: Fix detecting Ruby version and Omniauth providers in gitlab:env:info task Fixes #2245 --- lib/tasks/gitlab/info.rake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 231c05b4c59..9f423628332 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -16,6 +16,8 @@ namespace :gitlab do # check if there is an RVM environment rvm_version = run_and_match("rvm --version", /[\d\.]+/).try(:to_s) + # check Ruby version + ruby_version = run_and_match("ruby --version", /[\d\.p]+/).try(:to_s) # check Gem version gem_version = run("gem --version") # check Bundler version @@ -29,7 +31,7 @@ namespace :gitlab do puts "Current User:\t#{`whoami`}" puts "Using RVM:\t#{rvm_version.present? ? "yes".green : "no"}" puts "RVM Version:\t#{rvm_version}" if rvm_version.present? - puts "Ruby Version:\t#{ENV['RUBY_VERSION'] || "unknown".red}" + puts "Ruby Version:\t#{ruby_version || "unknown".red}" puts "Gem Version:\t#{gem_version || "unknown".red}" puts "Bundler Version:#{bunder_version || "unknown".red}" puts "Rake Version:\t#{rake_version || "unknown".red}" @@ -44,6 +46,9 @@ namespace :gitlab do http_clone_url = project.http_url_to_repo ssh_clone_url = project.ssh_url_to_repo + omniauth_providers = Gitlab.config.omniauth_providers + omniauth_providers.map! { |provider| provider['name'] } + puts "" puts "GitLab information".yellow puts "Version:\t#{Gitlab::Version}" @@ -55,7 +60,7 @@ namespace :gitlab do puts "SSH Clone URL:\t#{ssh_clone_url}" puts "Using LDAP:\t#{Gitlab.config.ldap_enabled? ? "yes".green : "no"}" puts "Using Omniauth:\t#{Gitlab.config.omniauth_enabled? ? "yes".green : "no"}" - puts "Omniauth Providers:\t#{Gitlab.config.omniauth_providers}" if Gitlab.config.omniauth_enabled? + puts "Omniauth Providers: #{omniauth_providers.map(&:magenta).join(', ')}" if Gitlab.config.omniauth_enabled? -- cgit v1.2.1 From c76764b7dc2b0b7ac04215b0bc9b644db1b30796 Mon Sep 17 00:00:00 2001 From: Cyril Date: Tue, 11 Dec 2012 02:39:05 +0100 Subject: add missing mandatory tr in thead --- app/views/admin/groups/index.html.haml | 15 ++++++++------- app/views/admin/projects/index.html.haml | 17 +++++++++-------- app/views/admin/users/index.html.haml | 19 ++++++++++--------- app/views/milestones/show.html.haml | 18 ++++++++++-------- app/views/tree/_tree.html.haml | 9 +++++---- 5 files changed, 42 insertions(+), 36 deletions(-) diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 6fbeed82a77..49acedc8c79 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -12,13 +12,14 @@ %table %thead - %th - Name - %i.icon-sort-down - %th Path - %th Projects - %th Owner - %th.cred Danger Zone! + %tr + %th + Name + %i.icon-sort-down + %th Path + %th Projects + %th Owner + %th.cred Danger Zone! - @groups.each do |group| %tr diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 605a733574c..4b46d5f47dd 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -9,14 +9,15 @@ %table %thead - %th - Name - %i.icon-sort-down - %th Path - %th Team Members - %th Last Commit - %th Edit - %th.cred Danger Zone! + %tr + %th + Name + %i.icon-sort-down + %th Path + %th Team Members + %th Last Commit + %th Edit + %th.cred Danger Zone! - @projects.each do |project| %tr diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 7544a732db2..31084423fa7 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -21,15 +21,16 @@ %table %thead - %th Admin - %th - Name - %i.icon-sort-down - %th Username - %th Email - %th Projects - %th Edit - %th.cred Danger Zone! + %tr + %th Admin + %th + Name + %i.icon-sort-down + %th Username + %th Email + %th Projects + %th Edit + %th.cred Danger Zone! - @admin_users.each do |user| %tr diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml index b8bc788c953..7a347102fb9 100644 --- a/app/views/milestones/show.html.haml +++ b/app/views/milestones/show.html.haml @@ -47,10 +47,11 @@ .span6 %table.milestone-issue-filter %thead - %th - %ul.nav.nav-pills - %li.active= link_to('Open Issues', '#') - %li=link_to('All Issues', '#') + %tr + %th + %ul.nav.nav-pills + %li.active= link_to('Open Issues', '#') + %li=link_to('All Issues', '#') - @issues.each do |issue| %tr{data: {closed: issue.closed}} %td @@ -62,10 +63,11 @@ .span6 %table.milestone-merge-requests-filter %thead - %th - %ul.nav.nav-pills - %li.active= link_to('Open Merge Requests', '#') - %li=link_to('All Merge Requests', '#') + %tr + %th + %ul.nav.nav-pills + %li.active= link_to('Open Merge Requests', '#') + %li=link_to('All Merge Requests', '#') - @merge_requests.each do |merge_request| %tr{data: {closed: merge_request.closed}} %td diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml index 02ae3d90c40..a632bb3b0d7 100644 --- a/app/views/tree/_tree.html.haml +++ b/app/views/tree/_tree.html.haml @@ -16,10 +16,11 @@ - else %table#tree-slider{class: "table_#{@hex_path} tree-table" } %thead - %th Name - %th Last Update - %th Last Commit - %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right" + %tr + %th Name + %th Last Update + %th Last Commit + %th= link_to "history", project_commits_path(@project, @id), class: "btn very_small right" - if tree.up_dir? %tr.tree-item -- cgit v1.2.1 From c92726e6c8a995e1555c31411977d6bcce25c1e3 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 13:44:36 +0200 Subject: Reordered developers seeds a bit. Now seeds faster and has valid post-receive files --- db/fixtures/development/002_project.rb | 13 +++++++++++-- db/fixtures/development/009_source_code.rb | 7 ++++--- db/fixtures/development/010_groups.rb | 11 ----------- 3 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 db/fixtures/development/010_groups.rb diff --git a/db/fixtures/development/002_project.rb b/db/fixtures/development/002_project.rb index 91d42a14201..4db11a878ec 100644 --- a/db/fixtures/development/002_project.rb +++ b/db/fixtures/development/002_project.rb @@ -1,5 +1,14 @@ +Group.seed(:id, [ + { id: 100, name: "Brightbox", path: 'brightbox', owner_id: 1 }, + { id: 101, name: "KDE", path: 'kde', owner_id: 1 }, +]) + Project.seed(:id, [ - { id: 1, name: "Underscore.js", path: "underscore", owner_id: 1, namespace_id: 1 }, + { id: 1, name: "Underscore.js", path: "underscore", owner_id: 1 }, { id: 2, name: "Diaspora", path: "diaspora", owner_id: 1 }, - { id: 3, name: "Ruby on Rails", path: "rails", owner_id: 1 } + { id: 3, namespace_id: 100, name: "Brightbox CLI", path: "brightbox-cli", owner_id: 1 }, + { id: 4, namespace_id: 100, name: "Puppet", path: "puppet", owner_id: 1 }, + { id: 5, namespace_id: 101, name: "kdebase", path: "kdebase", owner_id: 1}, + { id: 6, namespace_id: 101, name: "kdelibs", path: "kdelibs", owner_id: 1}, + { id: 7, namespace_id: 101, name: "amarok", path: "amarok", owner_id: 1}, ]) diff --git a/db/fixtures/development/009_source_code.rb b/db/fixtures/development/009_source_code.rb index 849d1aab8ae..6b9b6584a58 100644 --- a/db/fixtures/development/009_source_code.rb +++ b/db/fixtures/development/009_source_code.rb @@ -1,9 +1,10 @@ root = Gitlab.config.git_base_path projects = [ - { path: 'root/underscore.git', git: 'https://github.com/documentcloud/underscore.git' }, + { path: 'underscore.git', git: 'https://github.com/documentcloud/underscore.git' }, { path: 'diaspora.git', git: 'https://github.com/diaspora/diaspora.git' }, - { path: 'rails.git', git: 'https://github.com/rails/rails.git' }, + { path: 'brightbox/brightbox-cli.git', git: 'https://github.com/brightbox/brightbox-cli.git' }, + { path: 'brightbox/puppet.git', git: 'https://github.com/brightbox/puppet.git' }, ] projects.each do |project| @@ -14,7 +15,7 @@ projects.each do |project| cmds = [ "cd #{root} && sudo -u git -H git clone --bare #{project[:git]} ./#{project[:path]}", - "sudo cp ./lib/hooks/post-receive #{project_path}/hooks/post-receive", + "sudo ln -s ./lib/hooks/post-receive #{project_path}/hooks/post-receive", "sudo chown git:git -R #{project_path}", "sudo chmod 770 -R #{project_path}", ] diff --git a/db/fixtures/development/010_groups.rb b/db/fixtures/development/010_groups.rb deleted file mode 100644 index 09371b00751..00000000000 --- a/db/fixtures/development/010_groups.rb +++ /dev/null @@ -1,11 +0,0 @@ -Group.seed(:id, [ - { id: 100, name: "Gitlab", path: 'gitlab', owner_id: 1}, - { id: 101, name: "Rails", path: 'rails', owner_id: 1 }, - { id: 102, name: "KDE", path: 'kde', owner_id: 1 } -]) - -Project.seed(:id, [ - { id: 10, name: "kdebase", path: "kdebase", owner_id: 1, namespace_id: 102 }, - { id: 11, name: "kdelibs", path: "kdelibs", owner_id: 1, namespace_id: 102 }, - { id: 12, name: "amarok", path: "amarok", owner_id: 1, namespace_id: 102 } -]) -- cgit v1.2.1 From ca936d2784773652530e7b02af40b925ca45a4d6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 06:14:05 +0300 Subject: Improve CI integration for merge requests --- app/assets/javascripts/merge_requests.js | 11 +++++++ .../stylesheets/sections/merge_requests.scss | 6 ---- app/controllers/merge_requests_controller.rb | 9 +++++- app/helpers/merge_requests_helper.rb | 4 +-- app/models/gitlab_ci_service.rb | 18 +++++++++++ app/models/merge_request.rb | 4 +++ app/views/merge_requests/_show.html.haml | 4 +++ app/views/merge_requests/show/_mr_box.html.haml | 3 -- app/views/merge_requests/show/_mr_ci.html.haml | 35 ++++++++++++++++++++++ config/routes.rb | 1 + 10 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 app/views/merge_requests/show/_mr_ci.html.haml diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js index 170a0479de7..ee714f9cabb 100644 --- a/app/assets/javascripts/merge_requests.js +++ b/app/assets/javascripts/merge_requests.js @@ -26,6 +26,12 @@ var MergeRequest = { self.showState(data.state); }, "json"); } + + if(self.opts.ci_enable){ + $.get(self.opts.url_to_ci_check, function(data){ + self.showCiState(data.status); + }, "json"); + } }, initTabs: @@ -79,6 +85,11 @@ var MergeRequest = { $(".automerge_widget." + state).show(); }, + showCiState: + function(state){ + $(".ci_widget").hide(); + $(".ci_widget.ci-" + state).show(); + }, loadDiff: function() { diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index a5ec1756e5f..4808117d02a 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -136,9 +136,3 @@ li.merge_request { } } } - -.status-badge { - height: 32px; - width: 100%; - @include border-radius(5px); -} diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 362962707fd..72f6445a593 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -1,6 +1,6 @@ class MergeRequestsController < ProjectResourceController before_filter :module_enabled - before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check] + before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status] before_filter :validates_merge_request, only: [:show, :diffs] before_filter :define_show_vars, only: [:show, :diffs] @@ -103,6 +103,13 @@ class MergeRequestsController < ProjectResourceController @commit = CommitDecorator.decorate(@commit) end + def ci_status + status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha) + response = { status: status } + + render json: response + end + protected def merge_request diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index b23c4a8f0df..d03fbadff9c 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -39,7 +39,7 @@ module MergeRequestsHelper classes end - def ci_status_path - @project.gitlab_ci_service.commit_badge_path(@merge_request.last_commit.sha) + def ci_build_details_path merge_request + merge_request.project.gitlab_ci_service.build_page(merge_request.last_commit.sha) end end diff --git a/app/models/gitlab_ci_service.rb b/app/models/gitlab_ci_service.rb index 24b70323098..a2f5634a86f 100644 --- a/app/models/gitlab_ci_service.rb +++ b/app/models/gitlab_ci_service.rb @@ -36,4 +36,22 @@ class GitlabCiService < Service def commit_badge_path sha project_url + "/status?sha=#{sha}" end + + def commit_status_path sha + project_url + "/builds/#{sha}/status.json?token=#{token}" + end + + def commit_status sha + response = HTTParty.get(commit_status_path(sha)) + + if response.code == 200 and response["status"] + response["status"] + else + :error + end + end + + def build_page sha + project_url + "/builds/#{sha}" + end end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8039813ad1c..2409fb80acb 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -220,4 +220,8 @@ class MergeRequest < ActiveRecord::Base def to_patch project.repo.git.format_patch({timeout: 30, raise: true, stdout: true}, "#{target_branch}..#{source_branch}") end + + def last_commit_short_sha + @last_commit_short_sha ||= last_commit.sha[0..10] + end end diff --git a/app/views/merge_requests/_show.html.haml b/app/views/merge_requests/_show.html.haml index f1d0c8aaafb..20ba991e79a 100644 --- a/app/views/merge_requests/_show.html.haml +++ b/app/views/merge_requests/_show.html.haml @@ -2,6 +2,8 @@ = render "merge_requests/show/how_to_merge" = render "merge_requests/show/mr_box" = render "merge_requests/show/mr_accept" +- if @project.gitlab_ci? + = render "merge_requests/show/mr_ci" = render "merge_requests/show/commits" - if @commits.present? @@ -28,6 +30,8 @@ MergeRequest.init({ url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}", check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"}, + url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}", + ci_enable: #{@project.gitlab_ci? ? "true" : "false"}, current_state: "#{@merge_request.human_state}", action: "#{controller.action_name}" }); diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml index b4b4be2980a..26636435a06 100644 --- a/app/views/merge_requests/show/_mr_box.html.haml +++ b/app/views/merge_requests/show/_mr_box.html.haml @@ -6,9 +6,6 @@ - else .alert-message.success.status_info Open = gfm escape_once(@merge_request.title) - - if @project.gitlab_ci? - .right - = image_tag ci_status_path, class: 'status-badge' .middle_box_content %div diff --git a/app/views/merge_requests/show/_mr_ci.html.haml b/app/views/merge_requests/show/_mr_ci.html.haml new file mode 100644 index 00000000000..d46b606ef7f --- /dev/null +++ b/app/views/merge_requests/show/_mr_ci.html.haml @@ -0,0 +1,35 @@ +- if @merge_request.open? && @commits.any? + .ci_widget.ci-success{style: "display:none"} + .alert.alert-success + %i.icon-ok + %strong CI build passed + for #{@merge_request.last_commit_short_sha}. + = link_to "Build page", ci_build_details_path(@merge_request) + + + .ci_widget.ci-failed{style: "display:none"} + .alert.alert-error + %i.icon-remove + %strong CI build failed + for #{@merge_request.last_commit_short_sha}. + = link_to "Build page", ci_build_details_path(@merge_request) + + - [:running, :pending].each do |status| + .ci_widget{class: "ci-#{status}", style: "display:none"} + .alert + %i.icon-time + %strong CI build #{status} + for #{@merge_request.last_commit_short_sha}. + = link_to "Build page", ci_build_details_path(@merge_request) + + .ci_widget + .alert-message + %strong + %i.icon-refresh + Checking for CI status for #{@merge_request.last_commit_short_sha} + + .ci_widget.ci-error{style: "display:none"} + .alert.alert-error + %i.icon-remove + %strong Cannot connect to CI server. Please check your setting + diff --git a/config/routes.rb b/config/routes.rb index f1527977c09..6e20ae77398 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -169,6 +169,7 @@ Gitlab::Application.routes.draw do get :diffs get :automerge get :automerge_check + get :ci_status end collection do -- cgit v1.2.1 From 5d219bd5f04ea5a9745f37bc2bac87ddc9460d1f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 09:21:57 +0200 Subject: Fix gitolite error instructions --- app/views/errors/gitolite.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml index 2670f2d3fda..6eec95836d6 100644 --- a/app/views/errors/gitolite.html.haml +++ b/app/views/errors/gitolite.html.haml @@ -21,5 +21,5 @@ Permissions: %pre = preserve do - sudo chmod -R 770 #{Gitlab.config.git_base_path} sudo chown -R git:git #{Gitlab.config.git_base_path} + sudo chmod -R ug+rwXs #{Gitlab.config.git_base_path} -- cgit v1.2.1 From 8738eb23693b2cf4fdc2e5e77378478ba05eee24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Leutg=C3=B6b?= Date: Tue, 11 Dec 2012 11:25:55 +0100 Subject: Change html input type to "email" on sign-in view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one. --- app/views/devise/sessions/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 38192d7107d..54d088ca258 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -3,7 +3,7 @@ - else = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| = image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" - = f.text_field :email, :class => "text top", :placeholder => "Email" + = f.email_field :email, :class => "text top", :placeholder => "Email" = f.password_field :password, :class => "text bottom", :placeholder => "Password" - if devise_mapping.rememberable? .clearfix.inputs-list -- cgit v1.2.1 From f2bf05066d545259b1ca0a07561c2b8ee77918c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Leutgo=CC=88b?= Date: Tue, 11 Dec 2012 11:57:25 +0100 Subject: Add autofocus attribute to sign-in email field --- app/views/devise/sessions/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 54d088ca258..474e7ef746c 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -3,7 +3,7 @@ - else = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| = image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" - = f.email_field :email, :class => "text top", :placeholder => "Email" + = f.email_field :email, :class => "text top", :placeholder => "Email", :autofocus => "autofocus" = f.password_field :password, :class => "text bottom", :placeholder => "Password" - if devise_mapping.rememberable? .clearfix.inputs-list -- cgit v1.2.1 From 95af2baa3775144d9541ea3b6f2e4c87b65b309e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 18:14:18 +0200 Subject: Fix commit links in network graph --- vendor/assets/javascripts/branch-graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/assets/javascripts/branch-graph.js b/vendor/assets/javascripts/branch-graph.js index e8699bdfbf2..b68a72461a6 100644 --- a/vendor/assets/javascripts/branch-graph.js +++ b/vendor/assets/javascripts/branch-graph.js @@ -90,7 +90,7 @@ function branchGraph(holder) { (function (c, x, y) { top.push(r.circle(x, y, 10).attr({fill: "#000", opacity: 0, cursor: "pointer"}) .click(function(){ - location.href = location.href.replace("graph", "commits/" + c.id); + location.href = location.href.replace("graph", "commit/" + c.id); }) .hover(function () { var s = r.text(100, 100,c.author + "\n \n" +c.id + "\n \n" + c.message).attr({fill: "#fff"}); -- cgit v1.2.1 From 59a86e4229f187667a3f855aaf6250fd29655df2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 18:46:58 +0200 Subject: Fix resque exception --- lib/tasks/resque.rake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake index e6987e17639..0825324a424 100644 --- a/lib/tasks/resque.rake +++ b/lib/tasks/resque.rake @@ -1,12 +1,8 @@ require 'resque/tasks' -# Fix Exception -# ActiveRecord::StatementInvalid -# Error -# PGError: ERROR: prepared statement "a3" already exists task "resque:setup" => :environment do - Resque.after_fork do |job| - ActiveRecord::Base.establish_connection + Resque.after_fork do + Resque.redis.client.reconnect end end -- cgit v1.2.1 From 7f636b1306e821111555c9042b4cddc98b3dc666 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 19:16:56 +0200 Subject: Fix project namespaces for web hooks data --- app/models/project.rb | 2 +- app/roles/push_observer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 372b94d2066..b463a72b34e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -192,7 +192,7 @@ class Project < ActiveRecord::Base end def web_url - [Gitlab.config.url, path].join("/") + [Gitlab.config.url, path_with_namespace].join("/") end def common_notes diff --git a/app/roles/push_observer.rb b/app/roles/push_observer.rb index 8d414642f4b..0b3d57f48a7 100644 --- a/app/roles/push_observer.rb +++ b/app/roles/push_observer.rb @@ -114,7 +114,7 @@ module PushObserver id: commit.id, message: commit.safe_message, timestamp: commit.date.xmlschema, - url: "#{Gitlab.config.url}/#{path}/commit/#{commit.id}", + url: "#{Gitlab.config.url}/#{path_with_namespace}/commit/#{commit.id}", author: { name: commit.author_name, email: commit.author_email -- cgit v1.2.1 From 743073ce5fc4316d2867f30996f0dcfbc0183474 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Dec 2012 21:11:29 +0200 Subject: pretty gl icon for dark themes. Removed old gl icons --- app/assets/images/logo.png | Bin 3001 -> 0 bytes app/assets/images/logo_basic.png | Bin 3277 -> 0 bytes app/assets/images/logo_text.png | Bin 4602 -> 0 bytes app/assets/images/logo_text_tr.png | Bin 3290 -> 0 bytes app/assets/images/logo_white.png | Bin 1517 -> 1920 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/images/logo.png delete mode 100644 app/assets/images/logo_basic.png delete mode 100644 app/assets/images/logo_text.png delete mode 100644 app/assets/images/logo_text_tr.png diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png deleted file mode 100644 index 2d08c9f6825..00000000000 Binary files a/app/assets/images/logo.png and /dev/null differ diff --git a/app/assets/images/logo_basic.png b/app/assets/images/logo_basic.png deleted file mode 100644 index bc5ec128b90..00000000000 Binary files a/app/assets/images/logo_basic.png and /dev/null differ diff --git a/app/assets/images/logo_text.png b/app/assets/images/logo_text.png deleted file mode 100644 index c74663930e4..00000000000 Binary files a/app/assets/images/logo_text.png and /dev/null differ diff --git a/app/assets/images/logo_text_tr.png b/app/assets/images/logo_text_tr.png deleted file mode 100644 index fdb32ee29fe..00000000000 Binary files a/app/assets/images/logo_text_tr.png and /dev/null differ diff --git a/app/assets/images/logo_white.png b/app/assets/images/logo_white.png index 366e3f3f3b9..e3415816558 100644 Binary files a/app/assets/images/logo_white.png and b/app/assets/images/logo_white.png differ -- cgit v1.2.1 From 6cf5d7c96d8fcbf7b1c05481710afc79c2f7aa21 Mon Sep 17 00:00:00 2001 From: Jeremy Slater Date: Tue, 11 Dec 2012 15:28:40 -0500 Subject: Support read-only access for git over HTTP --- lib/gitlab/backend/grack_auth.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index 9fafc9617d1..7c31117f01d 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -38,12 +38,12 @@ module Grack end def validate_get_request - true + can?(user, :download_code, project) end def validate_post_request if @request.path_info.end_with?('git-upload-pack') - can?(user, :push_code, project) + can?(user, :download_code, project) elsif @request.path_info.end_with?('git-receive-pack') action = if project.protected_branch?(current_ref) :push_code_to_protected_branches -- cgit v1.2.1 From d7eb3145539222df4653fbe300d179a81b303517 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 12 Dec 2012 12:02:29 +0200 Subject: Project titles with namespaces --- app/helpers/projects_helper.rb | 8 ++++++++ app/views/layouts/project_resource.html.haml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4690a452e25..2fa9d21d125 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -23,4 +23,12 @@ module ProjectsHelper def tm_path team_member project_team_member_path(@project, team_member) end + + def project_title project + if project.group + project.name_with_namespace + else + project.name + end + end end diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml index ab8e88c07cd..709807456c8 100644 --- a/app/views/layouts/project_resource.html.haml +++ b/app/views/layouts/project_resource.html.haml @@ -1,9 +1,9 @@ !!! 5 %html{ lang: "en"} - = render "layouts/head", title: @project.name + = render "layouts/head", title: @project.name_with_namespace %body{class: "#{app_theme} project"} = render "layouts/flash" - = render "layouts/head_panel", title: @project.name + = render "layouts/head_panel", title: project_title(@project) - if can?(current_user, :download_code, @project) = render 'shared/no_ssh' .container -- cgit v1.2.1 From 105f5ba3c992cf9c69951a4f9ca877afe803a23d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 12 Dec 2012 12:30:19 +0200 Subject: Reduce header font a bit. Moved to mixin header font styles --- app/assets/stylesheets/mixins.scss | 11 ++++++++++- app/assets/stylesheets/sections/header.scss | 14 ++------------ app/assets/stylesheets/variables.scss | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 441a85f3410..81830368c4c 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -57,4 +57,13 @@ @mixin solid-shade { @include box-shadow(0 0 0 3px #f1f1f1); -} \ No newline at end of file +} + +@mixin header-font { + color: $style_color; + text-shadow: 0 1px 1px #FFF; + font-family: 'Korolev', sans-serif; + font-size: 28px; + line-height: 48px; + font-weight: normal; +} diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index 1efe23a127f..c1b210be1ab 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -44,14 +44,9 @@ header { background: url('logo_dark.png') no-repeat 0px 2px; float: left; margin-left: 2px; - font-size: 30px; - line-height: 48px; - font-weight: normal; - color: $style_color; - text-shadow: 0 1px 1px #FFF; padding-left: 45px; height: 40px; - font-family: 'Korolev', sans-serif; + @include header-font; } } } @@ -66,12 +61,7 @@ header { float: left; margin: 0; margin-right: 30px; - font-size: 30px; - line-height: 48px; - font-weight: normal; - color: $style_color; - text-shadow: 0 1px 1px #FFF; - font-family: 'Korolev', sans-serif; + @include header-font; } /** diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index ba78c8351f4..869eb168c0d 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -2,4 +2,4 @@ $primary_color: #2FA0BB; $link_color: #3A89A3; $style_color: #474D57; -$hover: #D9EDF7; \ No newline at end of file +$hover: #D9EDF7; -- cgit v1.2.1 From 439d03bbedd2dfcd5ddcb5dc16afe610208188b0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 12 Dec 2012 12:54:28 +0200 Subject: Fix namespace api autocomplete --- app/views/layouts/_init_auto_complete.html.haml | 2 +- lib/api/helpers.rb | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml index 7b2a291d05c..800dfbe8859 100644 --- a/app/views/layouts/_init_auto_complete.html.haml +++ b/app/views/layouts/_init_auto_complete.html.haml @@ -1,6 +1,6 @@ :javascript $(function() { - GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.path}/members" if @project }"; + GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.id}/members" if @project }"; GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}"; GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source}; diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index e9305b40836..6bd8111c2b2 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -5,13 +5,18 @@ module Gitlab end def user_project - if @project ||= current_user.projects.find_by_id(params[:id]) || - current_user.projects.find_by_path(params[:id]) + @project ||= find_project + @project || not_found! + end + + def find_project + project = Project.find_by_id(params[:id]) || Project.find_with_namespace(params[:id]) + + if project && can?(current_user, :read_project, project) + project else - not_found! + nil end - - @project end def paginate(object) @@ -32,6 +37,10 @@ module Gitlab end end + def can?(object, action, subject) + abilities.allowed?(object, action, subject) + end + def attributes_for_keys(keys) attrs = {} keys.each do |key| -- cgit v1.2.1 From 63d9373aa8722b69e7263f39af8e5194048b8b0d Mon Sep 17 00:00:00 2001 From: Cyril Date: Wed, 12 Dec 2012 17:53:43 +0100 Subject: Validates presence of User#name The 2 reasons are : - creation of user fail if name is empty : in after_save, it tries to create a namespace with namespace.name = user.name and namespece validates presence Namespace#name - in the web app links to team members are broken with empty User#name because they are of the form user.name --- app/models/user.rb | 1 + doc/api/users.md | 2 +- lib/api/users.rb | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3f2d7c92ea8..f99fdd27aed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -62,6 +62,7 @@ class User < ActiveRecord::Base has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy has_many :assigned_merge_requests, class_name: "MergeRequest", foreign_key: :assignee_id, dependent: :destroy + validates :name, presence: true validates :bio, length: { within: 0..255 } validates :extern_uid, allow_blank: true, uniqueness: {scope: :provider} validates :projects_limit, presence: true, numericality: {greater_than_or_equal_to: 0} diff --git a/doc/api/users.md b/doc/api/users.md index c116144d91e..e5674ab8463 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -75,7 +75,7 @@ POST /users Parameters: + `email` (required) - Email + `password` (required) - Password -+ `name` - Name ++ `name` (required) - Name + `skype` - Skype ID + `linkedin` - Linkedin + `twitter` - Twitter account diff --git a/lib/api/users.rb b/lib/api/users.rb index cad99fd9f7b..140c20f6bd2 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -101,8 +101,6 @@ module Gitlab key = current_user.keys.find params[:id] key.delete end - - end end end -- cgit v1.2.1 From bca7bddd3d0c6327e7ce0ce86874d72d1c76788f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 12 Dec 2012 19:42:08 +0200 Subject: Add ace editor to snippets --- app/assets/stylesheets/main.scss | 1 + app/assets/stylesheets/sections/snippets.scss | 9 ++++ app/views/snippets/_form.html.haml | 59 ++++++++++++++++----------- app/views/snippets/show.html.haml | 2 +- spec/requests/snippets_spec.rb | 5 +-- 5 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 app/assets/stylesheets/sections/snippets.scss diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index bc7a74406ef..dee7ce5a2ac 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -89,6 +89,7 @@ $baseLineHeight: 18px !default; @import "sections/commits.scss"; @import "sections/issues.scss"; @import "sections/projects.scss"; +@import "sections/snippets.scss"; @import "sections/merge_requests.scss"; @import "sections/graph.scss"; @import "sections/events.scss"; diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss new file mode 100644 index 00000000000..3944814fc3e --- /dev/null +++ b/app/assets/stylesheets/sections/snippets.scss @@ -0,0 +1,9 @@ +.snippet.file_holder { + .file_title { + .snippet-file-name { + position: relative; + top: -4px; + left: -4px; + } + } +} diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index 981c7cf0c12..baef737b565 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -1,28 +1,41 @@ %h3.page_title = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" %hr -= form_for [@project, @snippet] do |f| - -if @snippet.errors.any? - .alert-message.block-message.error - %ul - - @snippet.errors.full_messages.each do |msg| - %li= msg +.snippet-form-holder + = form_for [@project, @snippet] do |f| + -if @snippet.errors.any? + .alert-message.block-message.error + %ul + - @snippet.errors.full_messages.each do |msg| + %li= msg - .clearfix - = f.label :title - .input= f.text_field :title, placeholder: "Example Snippet" - .clearfix - = f.label :file_name - .input= f.text_field :file_name, placeholder: "example.rb" - .clearfix - = f.label "Lifetime" - .input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'} - .clearfix - = f.label :content, "Code" - .input= f.text_area :content, class: "span8" + .clearfix + = f.label :title + .input= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true + .clearfix + = f.label "Lifetime" + .input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'} + .clearfix + .file-editor + = f.label :file_name, "File" + .input + .file_holder.snippet + .file_title + = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true + .file_content.code + %pre#editor= @snippet.content + = f.hidden_field :content, class: 'snippet-file-content' + + .form-actions + = f.submit 'Save', class: "save-btn btn" + = link_to "Cancel", project_snippets_path(@project), class: " btn" + - unless @snippet.new_record? + .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}" + + +:javascript + var editor = ace.edit("editor"); + $(".snippet-form-holder form").submit(function(){ + $(".snippet-file-content").val(editor.getValue()); + }); - .form-actions - = f.submit 'Save', class: "primary btn" - = link_to "Cancel", project_snippets_path(@project), class: " btn" - - unless @snippet.new_record? - .right= link_to 'Destroy', [@project, @snippet], confirm: 'Are you sure?', method: :delete, class: "btn right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}" diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index f3e01928077..ad399533a3d 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -1,6 +1,6 @@ = render "projects/project_head" -%h3 +%h3.page_title = @snippet.title %small= @snippet.file_name - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user diff --git a/spec/requests/snippets_spec.rb b/spec/requests/snippets_spec.rb index 9ef217ba62c..b231b940a84 100644 --- a/spec/requests/snippets_spec.rb +++ b/spec/requests/snippets_spec.rb @@ -48,11 +48,11 @@ describe "Snippets" do page.current_path.should == new_project_snippet_path(project) end - describe "fill in" do + describe "fill in", js: true do before do fill_in "snippet_title", with: "login function" fill_in "snippet_file_name", with: "test.rb" - fill_in "snippet_content", with: "def login; end" + page.execute_script("editor.insert('def login; end');") end it { expect { click_button "Save" }.to change {Snippet.count}.by(1) } @@ -83,7 +83,6 @@ describe "Snippets" do before do fill_in "snippet_title", with: "login function" fill_in "snippet_file_name", with: "test.rb" - fill_in "snippet_content", with: "def login; end" end it { expect { click_button "Save" }.to_not change {Snippet.count} } -- cgit v1.2.1 From d3b8952f8fb067afe89f08eadbae7733c0cc6824 Mon Sep 17 00:00:00 2001 From: Cyril Date: Mon, 10 Dec 2012 23:46:31 +0100 Subject: Add username to User and UserBasic entities in API and in examples in doc. --- doc/api/issues.md | 5 +++++ doc/api/merge_requests.md | 9 +++++++++ doc/api/notes.md | 1 + doc/api/projects.md | 4 ++++ doc/api/session.md | 1 + doc/api/snippets.md | 1 + doc/api/users.md | 5 +++++ lib/api/entities.rb | 4 ++-- 8 files changed, 28 insertions(+), 2 deletions(-) diff --git a/doc/api/issues.md b/doc/api/issues.md index aaad3305489..4c0dde2f4e4 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -18,6 +18,7 @@ GET /issues "assignee": null, "author": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -46,6 +47,7 @@ GET /issues }, "assignee": { "id": 2, + "username": "jack_smith", "email": "jack@example.com", "name": "Jack Smith", "blocked": false, @@ -53,6 +55,7 @@ GET /issues }, "author": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -110,6 +113,7 @@ Parameters: }, "assignee": { "id": 2, + "username": "jack_smith", "email": "jack@example.com", "name": "Jack Smith", "blocked": false, @@ -117,6 +121,7 @@ Parameters: }, "author": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index e5b067a61d9..86bd79ff43a 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -22,6 +22,7 @@ Parameters: "merged":false, "author":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -29,6 +30,7 @@ Parameters: }, "assignee":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -62,6 +64,7 @@ Parameters: "merged":false, "author":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -69,6 +72,7 @@ Parameters: }, "assignee":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -105,6 +109,7 @@ Parameters: "merged":false, "author":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -112,6 +117,7 @@ Parameters: }, "assignee":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -150,6 +156,7 @@ Parameters: "merged":false, "author":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -157,6 +164,7 @@ Parameters: }, "assignee":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, @@ -184,6 +192,7 @@ Will return created note with status `201 Created` on success, or `404 Not found { "author":{ "id":1, + "username": "admin", "email":"admin@local.host", "name":"Administrator", "blocked":false, diff --git a/doc/api/notes.md b/doc/api/notes.md index 7b226dea44c..dddb55edb93 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -15,6 +15,7 @@ GET /projects/:id/notes "body": "The solution is rather tricky", "author": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, diff --git a/doc/api/projects.md b/doc/api/projects.md index fdedf904a3a..fac4107fd93 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -17,6 +17,7 @@ GET /projects "default_branch": "master", "owner": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -38,6 +39,7 @@ GET /projects "default_branch": "api", "owner": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -75,6 +77,7 @@ Parameters: "default_branch": "api", "owner": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -141,6 +144,7 @@ Parameters: { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, diff --git a/doc/api/session.md b/doc/api/session.md index 9fdbeb439a4..c7e57aaca7a 100644 --- a/doc/api/session.md +++ b/doc/api/session.md @@ -13,6 +13,7 @@ Parameters: ```json { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "private_token": "dd34asd13as", diff --git a/doc/api/snippets.md b/doc/api/snippets.md index 288fd5296f6..b9638ea8291 100644 --- a/doc/api/snippets.md +++ b/doc/api/snippets.md @@ -30,6 +30,7 @@ Parameters: "file_name": "add.rb", "author": { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, diff --git a/doc/api/users.md b/doc/api/users.md index e5674ab8463..200c0e06e04 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -10,6 +10,7 @@ GET /users [ { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -23,6 +24,7 @@ GET /users }, { "id": 2, + "username": "jack_smith", "email": "jack@example.com", "name": "Jack Smith", "blocked": false, @@ -52,6 +54,7 @@ Parameters: ```json { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, @@ -75,6 +78,7 @@ POST /users Parameters: + `email` (required) - Email + `password` (required) - Password ++ `username` (required) - Username + `name` (required) - Name + `skype` - Skype ID + `linkedin` - Linkedin @@ -95,6 +99,7 @@ GET /user ```json { "id": 1, + "username": "john_smith", "email": "john@example.com", "name": "John Smith", "blocked": false, diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 9e9d44594a2..070fbad27ed 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1,12 +1,12 @@ module Gitlab module Entities class User < Grape::Entity - expose :id, :email, :name, :bio, :skype, :linkedin, :twitter, + expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter, :dark_scheme, :theme_id, :blocked, :created_at end class UserBasic < Grape::Entity - expose :id, :email, :name, :blocked, :created_at + expose :id, :username, :email, :name, :blocked, :created_at end class UserLogin < UserBasic -- cgit v1.2.1 From fa203e8b67b3e8fd25ab1edd0ccbedc6072563b2 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 13 Dec 2012 00:45:48 +0100 Subject: Update installation docs to reduce the amount of possible errors Closes #2080 Fixes #2264 --- doc/install/installation.md | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 78337426ff0..7d07c29e913 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -32,15 +32,24 @@ The GitLab installation consists of setting up th following components: # 1. Packages / Dependencies -*Keep in mind that `sudo` is not installed on Debian by default. You should install it as root:* +`sudo` is not installed on Debian by default. If you don't have it you'll need +to install it first. - apt-get update && apt-get upgrade && apt-get install sudo + # run as root + apt-get update && apt-get upgrade && apt-get install sudo vim Make sure your system is up-to-date: sudo apt-get update sudo apt-get upgrade +**Note:** +Vim is an editor that is used here whenever there are files that need to be +edited by hand. But, you can use any editor you like instead. + + # Install vim + sudo apt-get install -y vim + Install the required packages: sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core libyaml-dev postfix @@ -65,6 +74,8 @@ Make sure you have the right version of Python installed. # 2. Ruby +Download and compile it: + wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p327.tar.gz tar xfvz ruby-1.9.3-p327.tar.gz cd ruby-1.9.3-p327 @@ -72,6 +83,10 @@ Make sure you have the right version of Python installed. make sudo make install +Install the Bundler Gem: + + sudo gem install bundler + # 3. System Users @@ -101,6 +116,7 @@ Create a user for GitLab: Clone GitLab's fork of the Gitolite source code: + cd /home/git sudo -u git -H git clone -b gl-v304 https://github.com/gitlabhq/gitolite.git /home/git/gitolite Setup Gitolite with GitLab as its admin: @@ -109,16 +125,15 @@ Setup Gitolite with GitLab as its admin: GitLab assumes *full and unshared* control over this Gitolite installation. # Add Gitolite scripts to $PATH - cd /home/git - sudo -u git -H mkdir bin - sudo -u git -H sh -c 'echo -e "PATH=\$PATH:/home/git/bin\nexport PATH" >> /home/git/.profile' + sudo -u git -H mkdir /home/git/bin + sudo -u git -H sh -c 'printf "%b\n%b\n" "PATH=\$PATH:/home/git/bin" "export PATH" >> /home/git/.profile' sudo -u git -H sh -c 'gitolite/install -ln /home/git/bin' # Copy the gitlab user's (public) SSH key ... sudo cp /home/gitlab/.ssh/id_rsa.pub /home/git/gitlab.pub sudo chmod 0444 /home/git/gitlab.pub - # ... and use it as the Gitolite admin key for setup + # ... and use it as the admin key for the Gitolite setup sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub" Fix the directory permissions for the repository: @@ -183,7 +198,6 @@ Make sure to edit both files to match your setup. cd /home/gitlab/gitlab sudo gem install charlock_holmes --version '0.6.9' - sudo gem install bundler sudo -u gitlab -H bundle install --deployment --without development test ## Configure Git -- cgit v1.2.1 From a5861b8ff34621be246ea0951a9e46b8859af4d4 Mon Sep 17 00:00:00 2001 From: Cyril Date: Tue, 11 Dec 2012 00:04:47 +0100 Subject: fix gfm autocomplete for usernames --- app/assets/javascripts/gfm_auto_complete.js.coffee | 98 ++++++++++++---------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index ffc4c409b54..a7038161668 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/app/assets/javascripts/gfm_auto_complete.js.coffee @@ -1,52 +1,58 @@ # Creates the variables for setting up GFM auto-completion window.GitLab ?= {} -GitLab.GfmAutoComplete ?= {} - -# Emoji -data = [] -template = "
  • ${name} ${name}
    • " -GitLab.GfmAutoComplete.Emoji = {data, template} - -# Team Members -data = [] -url = ''; -params = {private_token: '', page: 1} -GitLab.GfmAutoComplete.Members = {data, url, params} - -# Add GFM auto-completion to all input fields, that accept GFM input. -GitLab.GfmAutoComplete.setup = -> - input = $('.js-gfm-input') - +GitLab.GfmAutoComplete = # Emoji - input.atWho ':', - data: GitLab.GfmAutoComplete.Emoji.data, - tpl: GitLab.GfmAutoComplete.Emoji.template + Emoji: + data: [] + template: '
  • ${name} ${name}
    • ' # Team Members - input.atWho '@', (query, callback) -> - (getMoreMembers = -> - $.getJSON(GitLab.GfmAutoComplete.Members.url, GitLab.GfmAutoComplete.Members.params) - .success (members) -> - # pick the data we need - newMembersData = $.map(members, (m) -> m.name ) - - # add the new page of data to the rest - $.merge(GitLab.GfmAutoComplete.Members.data, newMembersData) - - # show the pop-up with a copy of the current data - callback(GitLab.GfmAutoComplete.Members.data[..]) - - # are we past the last page? - if newMembersData.length is 0 - # set static data and stop callbacks - input.atWho '@', - data: GitLab.GfmAutoComplete.Members.data - callback: null - else - # get next page - getMoreMembers() - - # so the next request gets the next page - GitLab.GfmAutoComplete.Members.params.page += 1 - ).call() + Members: + data: [] + url: '' + params: + private_token: '' + page: 1 + template: '
  • ${username} ${name}
    • ' + + # Add GFM auto-completion to all input fields, that accept GFM input. + setup: -> + input = $('.js-gfm-input') + + # Emoji + input.atWho ':', + data: @Emoji.data + tpl: @Emoji.template + + # Team Members + input.atWho '@', + tpl: @Members.template + callback: (query, callback) => + (getMoreMembers = => + $.getJSON(@Members.url, @Members.params).done (members) => + # pick the data we need + newMembersData = $.map(members, (m) -> + username: m.username + name: m.name + ) + + # add the new page of data to the rest + $.merge(@Members.data, newMembersData) + + # show the pop-up with a copy of the current data + callback(@Members.data[..]) + + # are we past the last page? + if newMembersData.length is 0 + # set static data and stop callbacks + input.atWho '@', + data: @Members.data + callback: null + else + # get next page + getMoreMembers() + + # so the next callback requests the next page + @Members.params.page += 1 + ).call() -- cgit v1.2.1 From 0236b3d17ead6a42e334e68b539fbc01cb348a6b Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 10 Dec 2012 14:41:21 +0100 Subject: Rename status rake task to check --- lib/tasks/gitlab/check.rake | 113 +++++++++++++++++++++++++++++++++++++++++++ lib/tasks/gitlab/status.rake | 113 ------------------------------------------- 2 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 lib/tasks/gitlab/check.rake delete mode 100644 lib/tasks/gitlab/status.rake diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake new file mode 100644 index 00000000000..cbc77abb97a --- /dev/null +++ b/lib/tasks/gitlab/check.rake @@ -0,0 +1,113 @@ +namespace :gitlab do + namespace :app do + desc "GITLAB | Check GitLab installation status" + task :status => :environment do + puts "\nStarting diagnostics".yellow + git_base_path = Gitlab.config.git_base_path + + print "config/database.yml............" + if File.exists?(Rails.root.join "config", "database.yml") + puts "exists".green + else + puts "missing".red + return + end + + print "config/gitlab.yml............" + if File.exists?(Rails.root.join "config", "gitlab.yml") + puts "exists".green + else + puts "missing".red + return + end + + print "#{git_base_path}............" + if File.exists?(git_base_path) + puts "exists".green + else + puts "missing".red + return + end + + print "#{git_base_path} is writable?............" + if File.stat(git_base_path).writable? + puts "YES".green + else + puts "NO".red + return + end + + FileUtils.rm_rf("/tmp/gitolite_gitlab_test") + begin + `git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite_gitlab_test` + raise unless $?.success? + print "Can clone gitolite-admin?............" + puts "YES".green + rescue + print "Can clone gitolite-admin?............" + puts "NO".red + return + end + + begin + Dir.chdir("/tmp/gitolite_gitlab_test") do + `touch blah && git add blah && git commit -qm blah -- blah` + raise unless $?.success? + end + print "Can git commit?............" + puts "YES".green + rescue + print "Can git commit?............" + puts "NO".red + return + ensure + FileUtils.rm_rf("/tmp/gitolite_gitlab_test") + end + + print "UMASK for .gitolite.rc is 0007? ............" + if open(File.absolute_path("#{git_base_path}/../.gitolite.rc")).grep(/UMASK([ \t]*)=([ \t>]*)0007/).any? + puts "YES".green + else + puts "NO".red + return + end + + gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitlab_hook_files = ['post-receive'] + gitlab_hook_files.each do |file_name| + dest = File.join(gitolite_hooks_path, file_name) + print "#{dest} exists? ............" + if File.exists?(dest) + puts "YES".green + else + puts "NO".red + return + end + end + + if Project.count > 0 + puts "\nValidating projects repositories:".yellow + Project.find_each(:batch_size => 100) do |project| + print "* #{project.name}....." + hook_file = File.join(project.path_to_repo, 'hooks', 'post-receive') + + unless File.exists?(hook_file) + puts "post-receive file missing".red + next + end + + original_content = File.read(Rails.root.join('lib', 'hooks', 'post-receive')) + new_content = File.read(hook_file) + + if original_content == new_content + puts "post-receive file ok".green + else + puts "post-receive file content does not match".red + end + end + end + + puts "\nFinished".blue + end + end +end diff --git a/lib/tasks/gitlab/status.rake b/lib/tasks/gitlab/status.rake deleted file mode 100644 index cbc77abb97a..00000000000 --- a/lib/tasks/gitlab/status.rake +++ /dev/null @@ -1,113 +0,0 @@ -namespace :gitlab do - namespace :app do - desc "GITLAB | Check GitLab installation status" - task :status => :environment do - puts "\nStarting diagnostics".yellow - git_base_path = Gitlab.config.git_base_path - - print "config/database.yml............" - if File.exists?(Rails.root.join "config", "database.yml") - puts "exists".green - else - puts "missing".red - return - end - - print "config/gitlab.yml............" - if File.exists?(Rails.root.join "config", "gitlab.yml") - puts "exists".green - else - puts "missing".red - return - end - - print "#{git_base_path}............" - if File.exists?(git_base_path) - puts "exists".green - else - puts "missing".red - return - end - - print "#{git_base_path} is writable?............" - if File.stat(git_base_path).writable? - puts "YES".green - else - puts "NO".red - return - end - - FileUtils.rm_rf("/tmp/gitolite_gitlab_test") - begin - `git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite_gitlab_test` - raise unless $?.success? - print "Can clone gitolite-admin?............" - puts "YES".green - rescue - print "Can clone gitolite-admin?............" - puts "NO".red - return - end - - begin - Dir.chdir("/tmp/gitolite_gitlab_test") do - `touch blah && git add blah && git commit -qm blah -- blah` - raise unless $?.success? - end - print "Can git commit?............" - puts "YES".green - rescue - print "Can git commit?............" - puts "NO".red - return - ensure - FileUtils.rm_rf("/tmp/gitolite_gitlab_test") - end - - print "UMASK for .gitolite.rc is 0007? ............" - if open(File.absolute_path("#{git_base_path}/../.gitolite.rc")).grep(/UMASK([ \t]*)=([ \t>]*)0007/).any? - puts "YES".green - else - puts "NO".red - return - end - - gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") - gitlab_hook_files = ['post-receive'] - gitlab_hook_files.each do |file_name| - dest = File.join(gitolite_hooks_path, file_name) - print "#{dest} exists? ............" - if File.exists?(dest) - puts "YES".green - else - puts "NO".red - return - end - end - - if Project.count > 0 - puts "\nValidating projects repositories:".yellow - Project.find_each(:batch_size => 100) do |project| - print "* #{project.name}....." - hook_file = File.join(project.path_to_repo, 'hooks', 'post-receive') - - unless File.exists?(hook_file) - puts "post-receive file missing".red - next - end - - original_content = File.read(Rails.root.join('lib', 'hooks', 'post-receive')) - new_content = File.read(hook_file) - - if original_content == new_content - puts "post-receive file ok".green - else - puts "post-receive file content does not match".red - end - end - end - - puts "\nFinished".blue - end - end -end -- cgit v1.2.1 From 71266ad28f2ec4e9c771659f781885164d9b0412 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Mon, 10 Dec 2012 14:50:55 +0100 Subject: Split and renamed check tasks --- lib/tasks/gitlab/check.rake | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index cbc77abb97a..8ff8408e9c2 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -1,9 +1,13 @@ namespace :gitlab do + desc "GITLAB | Check the configuration of GitLab and its environment" + task check: %w{gitlab:env:check + gitlab:app:check + gitlab:gitolite:check + gitlab:resque:check} + namespace :app do - desc "GITLAB | Check GitLab installation status" - task :status => :environment do - puts "\nStarting diagnostics".yellow - git_base_path = Gitlab.config.git_base_path + desc "GITLAB | Check the configuration of the GitLab Rails app" + task check: :environment do print "config/database.yml............" if File.exists?(Rails.root.join "config", "database.yml") @@ -20,6 +24,19 @@ namespace :gitlab do puts "missing".red return end + end + end + + namespace :env do + desc "GITLAB | Check the configuration of the environment" + task check: :environment do + end + end + + namespace :gitolite do + desc "GITLAB | Check the configuration of Gitolite" + task check: :environment do + git_base_path = Gitlab.config.git_base_path print "#{git_base_path}............" if File.exists?(git_base_path) @@ -106,8 +123,12 @@ namespace :gitlab do end end end + end + end - puts "\nFinished".blue + namespace :resque do + desc "GITLAB | Check the configuration of Resque" + task check: :environment do end end end -- cgit v1.2.1 From c3b9774f4bd0499d1f3d629c4b9bd110e4106b66 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 13 Dec 2012 12:11:41 +0100 Subject: Update and add checks --- lib/tasks/gitlab/check.rake | 963 ++++++++++++++++++++++++++++++++++++++++---- lib/tasks/gitlab/info.rake | 10 +- 2 files changed, 903 insertions(+), 70 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 8ff8408e9c2..6d69e13f6af 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -1,134 +1,959 @@ namespace :gitlab do desc "GITLAB | Check the configuration of GitLab and its environment" task check: %w{gitlab:env:check - gitlab:app:check gitlab:gitolite:check - gitlab:resque:check} + gitlab:resque:check + gitlab:app:check} + + namespace :app do desc "GITLAB | Check the configuration of the GitLab Rails app" task check: :environment do + warn_user_is_not_gitlab + start_checking "GitLab" + + check_database_config_exists + check_database_is_not_sqlite + check_migrations_are_up + check_gitlab_config_exists + check_gitlab_config_not_outdated + check_log_writable + check_tmp_writable + check_init_script_exists + check_init_script_up_to_date + check_satellites_exist + + finished_checking "GitLab" + end + + + # Checks + ######################## + + def check_database_config_exists + print "Database config exists? ... " + + database_config_file = Rails.root.join("config", "database.yml") + + if File.exists?(database_config_file) + puts "yes".green + else + puts "no".red + try_fixing_it( + "Copy config/database.yml. to config/database.yml", + "Check that the information in config/database.yml is correct" + ) + for_more_information( + see_database_guide, + "http://guides.rubyonrails.org/getting_started.html#configuring-a-database" + ) + check_failed + end + end + + def check_database_is_not_sqlite + print "Database is not SQLite ... " + + database_config_file = Rails.root.join("config", "database.yml") + + unless File.read(database_config_file) =~ /sqlite/ + puts "yes".green + else + puts "no".red + for_more_information( + "https://github.com/gitlabhq/gitlabhq/wiki/Migrate-from-SQLite-to-MySQL", + see_database_guide + ) + check_failed + end + end + + def check_gitlab_config_exists + print "GitLab config exists? ... " + + gitlab_config_file = Rails.root.join("config", "gitlab.yml") + + if File.exists?(gitlab_config_file) + puts "yes".green + else + puts "no".red + try_fixing_it( + "Copy config/gitlab.yml.example to config/gitlab.yml", + "Update config/gitlab.yml to match your setup" + ) + for_more_information( + see_installation_guide_section "GitLab" + ) + check_failed + end + end + + def check_gitlab_config_not_outdated + print "GitLab config not outdated? ... " + + gitlab_config_file = Rails.root.join("config", "gitlab.yml") + unless File.exists?(gitlab_config_file) + puts "can't check because of previous errors".magenta + end + + # omniauth or ldap could have been deleted from the file + if File.read(gitlab_config_file) =~ /^web:/ + puts "yes".green + else + puts "no".red + try_fixing_it( + "Copy config/gitlab.yml.example to config/gitlab.yml", + "Update config/gitlab.yml to match your setup" + ) + for_more_information( + see_installation_guide_section "GitLab" + ) + check_failed + end + end - print "config/database.yml............" - if File.exists?(Rails.root.join "config", "database.yml") - puts "exists".green + def check_init_script_exists + print "Init script exists? ... " + + script_path = "/etc/init.d/gitlab" + + if File.exists?(script_path) + puts "yes".green else - puts "missing".red + puts "no".red + try_fixing_it( + "Install the init script" + ) + for_more_information( + see_installation_guide_section "Install Init Script" + ) + check_failed + end + end + + def check_init_script_up_to_date + print "Init script up-to-date? ... " + + script_path = "/etc/init.d/gitlab" + unless File.exists?(script_path) + puts "can't check because of previous errors".magenta return end - print "config/gitlab.yml............" - if File.exists?(Rails.root.join "config", "gitlab.yml") - puts "exists".green + recipe_content = `curl https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab 2>/dev/null` + script_content = File.read(script_path) + + if recipe_content == script_content + puts "yes".green + else + puts "no".red + try_fixing_it( + "Redownload the init script" + ) + for_more_information( + see_installation_guide_section "Install Init Script" + ) + check_failed + end + end + + def check_migrations_are_up + print "All migrations up? ... " + + migration_status = `bundle exec rake db:migrate:status` + + unless migration_status =~ /down\s+\d{14}/ + puts "yes".green else - puts "missing".red + puts "no".red + try_fixing_it( + "sudo -u gitlab -H bundle exec rake db:migrate" + ) + check_failed + end + end + + def check_satellites_exist + print "Projects have satellites? ... " + + unless Project.count > 0 + puts "can't check, you have no projects".magenta return end + puts "" + + Project.find_each(batch_size: 100) do |project| + print "#{project.name.yellow} ... " + + if project.satellite.exists? + puts "yes".green + else + puts "no".red + try_fixing_it( + "sudo -u gitlab -H bundle exec rake gitlab:app:enable_automerge" + ) + for_more_information( + "doc/raketasks/maintenance.md " + ) + check_failed + end + end + end + + def check_log_writable + print "Log directory writable? ... " + + log_path = Rails.root.join("log") + + if File.writable?(log_path) + puts "yes".green + else + puts "no".red + try_fixing_it( + "sudo chown -R gitlab #{log_path}", + "sudo chmod -R rwX #{log_path}" + ) + for_more_information( + see_installation_guide_section "GitLab" + ) + check_failed + end + end + + def check_tmp_writable + print "Tmp directory writable? ... " + + tmp_path = Rails.root.join("tmp") + + if File.writable?(tmp_path) + puts "yes".green + else + puts "no".red + try_fixing_it( + "sudo chown -R gitlab #{tmp_path}", + "sudo chmod -R rwX #{tmp_path}" + ) + for_more_information( + see_installation_guide_section "GitLab" + ) + check_failed + end end end + + namespace :env do desc "GITLAB | Check the configuration of the environment" task check: :environment do + warn_user_is_not_gitlab + start_checking "Environment" + + check_gitlab_in_git_group + check_issue_1056_shell_profile_error + check_gitlab_git_config + check_python2_exists + check_python2_version + + finished_checking "Environment" + end + + + # Checks + ######################## + + def check_gitlab_git_config + print "Git configured for gitlab user? ... " + + options = { + "user.name" => "GitLab", + "user.email" => Gitlab.config.email_from + } + correct_options = options.map do |name, value| + run("git config --global --get #{name}").try(:squish) == value + end + + if correct_options.all? + puts "yes".green + else + puts "no".red + try_fixing_it( + "sudo -u gitlab -H git config --global user.name \"#{options["user.name"]}\"", + "sudo -u gitlab -H git config --global user.email \"#{options["user.email"]}\"" + ) + for_more_information( + see_installation_guide_section "GitLab" + ) + check_failed + end + end + + def check_gitlab_in_git_group + print "gitlab user is in git group? ... " + + if run_and_match("id -rnG", /\Wgit\W/) + puts "yes".green + else + puts "no".red + try_fixing_it( + "sudo usermod -a -G git gitlab" + ) + for_more_information( + see_installation_guide_section "System Users" + ) + check_failed + end + end + + # see https://github.com/gitlabhq/gitlabhq/issues/1059 + def check_issue_1056_shell_profile_error + print "Has no \"-e\" in ~git/.profile ... " + + profile_file = File.expand_path("~#{Gitlab.config.ssh_user}/.profile") + + unless File.read(profile_file) =~ /^-e PATH/ + puts "yes".green + else + puts "no".red + try_fixing_it( + "Open #{profile_file}", + "Find the line starting with \"-e PATH\"", + "Remove \"-e \" so the line starts with PATH" + ) + for_more_information( + see_installation_guide_section("Gitolite"), + "https://github.com/gitlabhq/gitlabhq/issues/1059" + ) + check_failed + end + end + + def check_python2_exists + print "Has python2? ... " + + # Python prints its version to STDERR + # so we can't just use run("python2 --version") + if run_and_match("which python2", /python2$/) + puts "yes".green + else + puts "no".red + try_fixing_it( + "Make sure you have Python 2.5+ installed", + "Link it to python2" + ) + for_more_information( + see_installation_guide_section "Packages / Dependencies" + ) + check_failed + end + end + + def check_python2_version + print "python2 is supported version? ... " + + # Python prints its version to STDERR + # so we can't just use run("python2 --version") + + unless run_and_match("which python2", /python2$/) + puts "can't check because of previous errors".magenta + return + end + + if `python2 --version 2>&1` =~ /2\.[567]\.\d/ + puts "yes".green + else + puts "no".red + try_fixing_it( + "Make sure you have Python 2.5+ installed", + "Link it to python2" + ) + for_more_information( + see_installation_guide_section "Packages / Dependencies" + ) + check_failed + end end end + + namespace :gitolite do desc "GITLAB | Check the configuration of Gitolite" task check: :environment do - git_base_path = Gitlab.config.git_base_path + warn_user_is_not_gitlab + start_checking "Gitolite" + + check_gitolite_is_up_to_date + check_gitoliterc_repo_umask + check_gitoliterc_git_config_keys + check_dot_gitolite_exists + check_dot_gitolite_user_and_group + check_dot_gitolite_permissions + check_repo_base_exists + check_repo_base_user_and_group + check_repo_base_permissions + check_can_clone_gitolite_admin + check_can_commit_to_gitolite_admin + check_post_receive_hook_exists + check_post_receive_hook_is_up_to_date + check_repos_post_receive_hooks_is_link + check_repos_git_config + + finished_checking "Gitolite" + end + + + # Checks + ######################## + + def check_can_clone_gitolite_admin + print "Can clone gitolite-admin? ... " + + test_path = "/tmp/gitlab_gitolite_admin_test" + FileUtils.rm_rf(test_path) + `git clone -q #{Gitlab.config.gitolite_admin_uri} #{test_path}` + raise unless $?.success? + + puts "yes".green + rescue + puts "no".red + try_fixing_it( + "Make sure the \"admin_uri\" is set correctly in config/gitlab.yml", + "Try cloning it yourself with:", + " git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite-admin", + "Make sure Gitolite is installed correctly." + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + + # assumes #check_can_clone_gitolite_admin has been run before + def check_can_commit_to_gitolite_admin + print "Can commit to gitolite-admin? ... " + + test_path = "/tmp/gitlab_gitolite_admin_test" + unless File.exists?(test_path) + puts "can't check because of previous errors".magenta + return + end + + Dir.chdir(test_path) do + `touch foo && git add foo && git commit -qm foo` + raise unless $?.success? + end + + puts "yes".green + rescue + puts "no".red + try_fixing_it( + "Try committing to it yourself with:", + " git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite-admin", + " touch foo", + " git add foo", + " git commit -m \"foo\"", + "Make sure Gitolite is installed correctly." + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + ensure + FileUtils.rm_rf("/tmp/gitolite_gitlab_test") + end + + def check_dot_gitolite_exists + print "Config directory exists? ... " + + gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite") + + if File.directory?(gitolite_config_path) + puts "yes".green + else + puts "no".red + puts "#{gitolite_config_path} is missing".red + try_fixing_it( + "This should have been created when setting up Gitolite.", + "Make sure Gitolite is installed correctly." + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_dot_gitolite_permissions + print "Config directory access is drwxr-x---? ... " - print "#{git_base_path}............" - if File.exists?(git_base_path) - puts "exists".green + gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite") + unless File.exists?(gitolite_config_path) + puts "can't check because of previous errors".magenta + return + end + + if `stat --printf %a #{gitolite_config_path}` == "750" + puts "yes".green else - puts "missing".red + puts "no".red + puts "#{gitolite_config_path} is not writable".red + try_fixing_it( + "sudo chmod 750 #{gitolite_config_path}" + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_dot_gitolite_user_and_group + print "Config directory owned by git:git? ... " + + gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite") + unless File.exists?(gitolite_config_path) + puts "can't check because of previous errors".magenta return end - print "#{git_base_path} is writable?............" - if File.stat(git_base_path).writable? - puts "YES".green + if `stat --printf %U #{gitolite_config_path}` == "git" && # user + `stat --printf %G #{gitolite_config_path}` == "git" #group + puts "yes".green + else + puts "no".red + puts "#{gitolite_config_path} is not owned by git".red + try_fixing_it( + "sudo chown -R git:git #{gitolite_config_path}" + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_gitolite_is_up_to_date + print "Using recommended version ... " + if gitolite_version.try(:start_with?, "v3.04") + puts "yes".green + else + puts "no".red + try_fixing_it( + "We strongly recommend using the version pointed out in the installation guide." + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + # this is not a "hard" failure + end + end + + def check_gitoliterc_git_config_keys + gitoliterc_path = File.join(gitolite_home, ".gitolite.rc") + + print "Allow all Git config keys in .gitolite.rc ... " + option_name = if has_gitolite3? + # see https://github.com/sitaramc/gitolite/blob/v3.04/src/lib/Gitolite/Rc.pm#L329 + "GIT_CONFIG_KEYS" + else + # assume older version + # see https://github.com/sitaramc/gitolite/blob/v2.3/conf/example.gitolite.rc#L49 + "$GL_GITCONFIG_KEYS" + end + option_value = ".*" + if open(gitoliterc_path).grep(/#{option_name}\s*=[>]?\s*["']#{option_value}["']/).any? + puts "yes".green + else + puts "no".red + try_fixing_it( + "Open #{gitoliterc_path}", + "Find the \"#{option_name}\" option", + "Change its value to \".*\"" + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_gitoliterc_repo_umask + gitoliterc_path = File.join(gitolite_home, ".gitolite.rc") + + print "Repo umask is 0007 in .gitolite.rc? ... " + option_name = if has_gitolite3? + # see https://github.com/sitaramc/gitolite/blob/v3.04/src/lib/Gitolite/Rc.pm#L328 + "UMASK" + else + # assume older version + # see https://github.com/sitaramc/gitolite/blob/v2.3/conf/example.gitolite.rc#L32 + "$REPO_UMASK" + end + option_value = "0007" + if open(gitoliterc_path).grep(/#{option_name}\s*=[>]?\s*#{option_value}/).any? + puts "yes".green + else + puts "no".red + try_fixing_it( + "Open #{gitoliterc_path}", + "Find the \"#{option_name}\" option", + "Change its value to \"0007\"" + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_post_receive_hook_exists + print "post-receive hook exists? ... " + + hook_file = "post-receive" + gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) + + gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file) + + if File.exists?(gitolite_hook_file) + puts "yes".green else - puts "NO".red + puts "no".red + try_fixing_it( + "sudo -u git cp #{gitlab_hook_file} #{gitolite_hook_file}" + ) + for_more_information( + see_installation_guide_section "Setup GitLab Hooks" + ) + check_failed + end + end + + def check_post_receive_hook_is_up_to_date + print "post-receive hook up-to-date? ... " + + hook_file = "post-receive" + gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) + gitolite_hook_content = File.read(gitolite_hook_file) + + unless File.exists?(gitolite_hook_file) + puts "can't check because of previous errors".magenta return end - FileUtils.rm_rf("/tmp/gitolite_gitlab_test") - begin - `git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite_gitlab_test` - raise unless $?.success? - print "Can clone gitolite-admin?............" - puts "YES".green - rescue - print "Can clone gitolite-admin?............" - puts "NO".red + gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file) + gitlab_hook_content = File.read(gitlab_hook_file) + + if gitolite_hook_content == gitlab_hook_content + puts "yes".green + else + puts "no".red + try_fixing_it( + "sudo -u git cp #{gitlab_hook_file} #{gitolite_hook_file}" + ) + for_more_information( + see_installation_guide_section "Setup GitLab Hooks" + ) + check_failed + end + end + + def check_repo_base_exists + print "Repo base directory exists? ... " + + repo_base_path = Gitlab.config.git_base_path + + if File.exists?(repo_base_path) + puts "yes".green + else + puts "no".red + puts "#{repo_base_path} is missing".red + try_fixing_it( + "This should have been created when setting up Gitolite.", + "Make sure it's set correctly in config/gitlab.yml", + "Make sure Gitolite is installed correctly." + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_repo_base_permissions + print "Repo base access is drwsrws---? ... " + + repo_base_path = Gitlab.config.git_base_path + unless File.exists?(repo_base_path) + puts "can't check because of previous errors".magenta return end - begin - Dir.chdir("/tmp/gitolite_gitlab_test") do - `touch blah && git add blah && git commit -qm blah -- blah` - raise unless $?.success? - end - print "Can git commit?............" - puts "YES".green - rescue - print "Can git commit?............" - puts "NO".red + if `stat --printf %a #{repo_base_path}` == "6770" + puts "yes".green + else + puts "no".red + puts "#{repo_base_path} is not writable".red + try_fixing_it( + "sudo chmod -R ug+rwXs,o-rwx #{repo_base_path}" + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_repo_base_user_and_group + print "Repo base owned by git:git? ... " + + repo_base_path = Gitlab.config.git_base_path + unless File.exists?(repo_base_path) + puts "can't check because of previous errors".magenta return - ensure - FileUtils.rm_rf("/tmp/gitolite_gitlab_test") end - print "UMASK for .gitolite.rc is 0007? ............" - if open(File.absolute_path("#{git_base_path}/../.gitolite.rc")).grep(/UMASK([ \t]*)=([ \t>]*)0007/).any? - puts "YES".green + if `stat --printf %U #{repo_base_path}` == "git" && # user + `stat --printf %G #{repo_base_path}` == "git" #group + puts "yes".green else - puts "NO".red + puts "no".red + puts "#{repo_base_path} is not owned by git".red + try_fixing_it( + "sudo chown -R git:git #{repo_base_path}" + ) + for_more_information( + see_installation_guide_section "Gitolite" + ) + check_failed + end + end + + def check_repos_git_config + print "Git config in repos: ... " + + unless Project.count > 0 + puts "can't check, you have no projects".magenta return end + puts "" - gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") - gitlab_hook_files = ['post-receive'] - gitlab_hook_files.each do |file_name| - dest = File.join(gitolite_hooks_path, file_name) - print "#{dest} exists? ............" - if File.exists?(dest) - puts "YES".green + options = { + "core.sharedRepository" => "0660", + } + + Project.find_each(batch_size: 100) do |project| + print "#{project.name.yellow} ... " + + correct_options = options.map do |name, value| + run("git --git-dir=\"#{project.path_to_repo}\" config --get #{name}").try(:chomp) == value + end + + if correct_options.all? + puts "ok".green else - puts "NO".red - return + puts "wrong or missing".red + try_fixing_it( + "sudo -u gitlab -H bundle exec rake gitlab:gitolite:update_repos" + ) + for_more_information( + "doc/raketasks/maintenance.md" + ) + check_failed end end + end + + def check_repos_post_receive_hooks_is_link + print "post-receive hooks in repos are links: ... " + + hook_file = "post-receive" + gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) + + unless File.exists?(gitolite_hook_file) + puts "can't check because of previous errors".magenta + return + end - if Project.count > 0 - puts "\nValidating projects repositories:".yellow - Project.find_each(:batch_size => 100) do |project| - print "* #{project.name}....." - hook_file = File.join(project.path_to_repo, 'hooks', 'post-receive') + unless Project.count > 0 + puts "can't check, you have no projects".magenta + return + end + puts "" - unless File.exists?(hook_file) - puts "post-receive file missing".red - next - end + Project.find_each(batch_size: 100) do |project| + print "#{project.name.yellow} ... " + project_hook_file = File.join(project.path_to_repo, "hooks", hook_file) - original_content = File.read(Rails.root.join('lib', 'hooks', 'post-receive')) - new_content = File.read(hook_file) + unless File.exists?(project_hook_file) + puts "missing".red + try_fixing_it( + "sudo -u git ln -sf #{gitolite_hook_file} #{project_hook_file}" + ) + for_more_information( + "lib/support/rewrite-hooks.sh" + ) + check_failed + next + end - if original_content == new_content - puts "post-receive file ok".green - else - puts "post-receive file content does not match".red - end + if run_and_match("stat --format %N #{project_hook_file}", /#{hook_file}.+->.+#{gitolite_hook_file}/) + puts "ok".green + else + puts "not a link to Gitolite's hook".red + try_fixing_it( + "sudo -u git ln -sf #{gitolite_hook_file} #{project_hook_file}" + ) + for_more_information( + "lib/support/rewrite-hooks.sh" + ) + check_failed end end end + + + # Helper methods + ######################## + + def gitolite_home + File.expand_path("~#{Gitlab.config.ssh_user}") + end + + def gitolite_version + gitolite_version_file = "#{gitolite_home}/gitolite/src/VERSION" + if File.readable?(gitolite_version_file) + File.read(gitolite_version_file) + end + end + + def has_gitolite3? + gitolite_version.try(:start_with?, "v3.") + end end + + namespace :resque do desc "GITLAB | Check the configuration of Resque" task check: :environment do + warn_user_is_not_gitlab + start_checking "Resque" + + check_resque_running + + finished_checking "Resque" + end + + + # Checks + ######################## + + def check_resque_running + print "Running? ... " + + if run_and_match("ps aux | grep -i resque", /resque-[\d\.]+:.+$/) + puts "yes".green + else + puts "no".red + puts "#{repo_base_path} is not owned by git".red + try_fixing_it( + "sudo service gitlab restart", + "or", + "sudo /etc/init.d/gitlab restart" + ) + for_more_information( + see_installation_guide_section("Install Init Script"), + "see log/resque.log for possible errors" + ) + check_failed + end + end + end + + + # Helper methods + ########################## + + def check_failed + puts " Please #{"fix the error above"} and rerun the checks.".red + end + + def for_more_information(*sources) + sources = sources.shift if sources.first.is_a?(Array) + + puts " For more information see:".blue + sources.each do |source| + puts " #{source}" + end + end + + def finished_checking(component) + puts "" + puts "Checking #{component.yellow} ... #{"Finished".green}" + puts "" + end + + # Runs the given command + # + # Returns nil if the command was not found + # Returns the output of the command otherwise + # + # see also #run_and_match + def run(command) + unless `#{command} 2>/dev/null`.blank? + `#{command}` + end + end + + # Runs the given command and matches the output agains the given pattern + # + # Returns nil if nothing matched + # Retunrs the MatchData if the pattern matched + # + # see also #run + # see also String#match + def run_and_match(command, pattern) + run(command).try(:match, pattern) + end + + def see_database_guide + "doc/install/databases.md" + end + + def see_installation_guide_section(section) + "doc/install/installation.md in section \"#{section}\"" + end + + def start_checking(component) + puts "Checking #{component.yellow} ..." + puts "" + end + + def try_fixing_it(*steps) + steps = steps.shift if steps.first.is_a?(Array) + + puts " Try fixing it:".blue + steps.each do |step| + puts " #{step}" + end + end + + def warn_user_is_not_gitlab + unless @warned_user_not_gitlab + current_user = run("whoami").chomp + unless current_user == "gitlab" + puts "#{Colored.color(:black)+Colored.color(:on_yellow)} Warning #{Colored.extra(:clear)}" + puts " You are running as user #{current_user.magenta}, we hope you know what you are doing." + puts " Some tests may pass\/fail for the wrong reason." + puts " For meaningful results you should run this as user #{"gitlab".magenta}." + puts "" + end + @warned_user_not_gitlab = true end end end diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 9f423628332..2f633974c83 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -84,7 +84,13 @@ namespace :gitlab do # Helper methods - # Runs the given command and matches the output agains the given RegExp + # Runs the given command and matches the output agains the given pattern + # + # Returns nil if nothing matched + # Retunrs the MatchData if the pattern matched + # + # see also #run + # see also String#match def run_and_match(command, regexp) run(command).try(:match, regexp) end @@ -93,6 +99,8 @@ namespace :gitlab do # # Returns nil if the command was not found # Returns the output of the command otherwise + # + # see also #run_and_match def run(command) unless `#{command} 2>/dev/null`.blank? `#{command}` -- cgit v1.2.1 From 1309a40b5e037ed3da8290d0d58534d75924bd42 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 12 Dec 2012 22:36:20 +0100 Subject: Update installation guide --- doc/install/installation.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 7d07c29e913..d1d3b6912c3 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -52,14 +52,14 @@ edited by hand. But, you can use any editor you like instead. Install the required packages: - sudo apt-get install -y wget curl build-essential checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev zlib1g-dev libicu-dev redis-server openssh-server git-core libyaml-dev postfix + sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev wget curl git-core openssh-server redis-server postfix checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev Make sure you have the right version of Python installed. # Install Python sudo apt-get install python - # Make sure that Python is 2.x (3.x is not supported at the moment) + # Make sure that Python is 2.5+ (3.x is not supported at the moment) python --version # If it's Python 3 you might need to install Python 2 separately @@ -136,10 +136,10 @@ GitLab assumes *full and unshared* control over this Gitolite installation. # ... and use it as the admin key for the Gitolite setup sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub" -Fix the directory permissions for the repository: +Fix the directory permissions for the repositories: # Make sure the repositories dir is owned by git and it stays that way - sudo chmod -R ug+rwXs /home/git/repositories/ + sudo chmod -R ug+rwXs,o-rwx /home/git/repositories/ sudo chown -R git:git /home/git/repositories/ ## Test if everything works so far @@ -187,6 +187,12 @@ do so with caution! # host serving GitLab where necessary sudo -u gitlab -H vim config/gitlab.yml + # Make sure GitLab can write to the log/ and tmp/ directories + sudo chown -R gitlab log/ + sudo chown -R gitlab tmp/ + sudo chmod -R u+rwX log/ + sudo chmod -R u+rwX tmp/ + # Copy the example Unicorn config sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb @@ -209,7 +215,7 @@ used for the `email.from` setting in `config/gitlab.yml`) sudo -u gitlab -H git config --global user.name "GitLab" sudo -u gitlab -H git config --global user.email "gitlab@localhost" -## Setup GitLab hooks +## Setup GitLab Hooks sudo cp ./lib/hooks/post-receive /home/git/.gitolite/hooks/common/post-receive sudo chown git:git /home/git/.gitolite/hooks/common/post-receive @@ -227,7 +233,7 @@ Check if GitLab and its environment is configured correctly: To make sure you didn't miss anything run a more thorough check with: - sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production + sudo -u gitlab -H bundle exec rake gitlab:check RAILS_ENV=production If you are all green: congratulations, you successfully installed GitLab! Although this is the case, there are still a few steps to go. @@ -248,6 +254,8 @@ Make GitLab start on boot: Start your GitLab instance: sudo service gitlab start + # or + sudo /etc/init.d/gitlab restart # 7. Nginx -- cgit v1.2.1 From fe608f303924cb5fdb00c1eb01aa32e6c612b610 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Wed, 12 Dec 2012 23:55:09 +0100 Subject: Update gitlab:check task docs --- doc/raketasks/maintenance.md | 90 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 17 deletions(-) diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md index 1247d4b6dd7..7be631a773d 100644 --- a/doc/raketasks/maintenance.md +++ b/doc/raketasks/maintenance.md @@ -54,9 +54,18 @@ Git: /usr/bin/git ``` -### Check GitLab installation status +### Check GitLab configuration -[Trouble-Shooting-Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) +Runs the following rake tasks: + +* gitlab:env:check +* gitlab:gitolite:check +* gitlab:resque:check +* gitlab:app:check + +It will check that each component was setup according to the installation guide and suggest fixes for issues found. + +You may also have a look at our [Trouble Shooting Guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide). ``` bundle exec rake gitlab:check @@ -65,21 +74,68 @@ bundle exec rake gitlab:check Example output: ``` -config/database.yml............exists -config/gitlab.yml............exists -/home/git/repositories/............exists -/home/git/repositories/ is writable?............YES -Can clone gitolite-admin?............YES -Can git commit?............YES -UMASK for .gitolite.rc is 0007? ............YES -/home/git/.gitolite/hooks/common/post-receive exists? ............YES - -Validating projects repositories: -* abcd.....post-receive file ok -* abcdtest.....post-receive file missing - -Finished - +Checking Environment ... + +gitlab user is in git group? ... yes +Has no "-e" in ~git/.profile ... yes +Git configured for gitlab user? ... yes +Has python2? ... yes +python2 is supported version? ... yes + +Checking Environment ... Finished + +Checking Gitolite ... + +Using recommended version ... yes +Repo umask is 0007 in .gitolite.rc? ... yes +Allow all Git config keys in .gitolite.rc ... yes +Config directory exists? ... yes +Config directory owned by git:git? ... yes +Config directory access is drwxr-x---? ... yes +Repo base directory exists? ... yes +Repo base owned by git:git? ... yes +Repo base access is drwsrws---? ... yes +Can clone gitolite-admin? ... yes +Can commit to gitolite-admin? ... yes +post-receive hook exists? ... yes +post-receive hook up-to-date? ... yes +post-receive hooks in repos are links: ... +GitLab ... ok +Non-Ascii Files Test ... ok +Touch Commit Test ... ok +Without Master Test ... ok +Git config in repos: ... +GitLab ... ok +Non-Ascii Files Test ... ok +Touch Commit Test ... ok +Without Master Test ... ok + +Checking Gitolite ... Finished + +Checking Resque ... + +Running? ... yes + +Checking Resque ... Finished + +Checking GitLab ... + +Database config exists? ... yes +Database is not SQLite ... yes +All migrations up? ... yes +GitLab config exists? ... yes +GitLab config not outdated? ... yes +Log directory writable? ... yes +Tmp directory writable? ... yes +Init script exists? ... yes +Init script up-to-date? ... yes +Projects have satellites? ... +GitLab ... yes +Non-Ascii Files Test ... yes +Touch Commit Test ... yes +Without Master Test ... yes + +Checking GitLab ... Finished ``` -- cgit v1.2.1 From 03369a9165e2f333a3feb501004acf369e339d67 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 13 Dec 2012 06:14:05 +0300 Subject: Use one helper for linking to team member. More clear title for Issue and MR --- app/assets/stylesheets/common.scss | 22 +++++++++------------- .../stylesheets/gitlab_bootstrap/blocks.scss | 9 +++++++++ app/helpers/issues_helper.rb | 22 ---------------------- app/helpers/merge_requests_helper.rb | 22 ---------------------- app/helpers/projects_helper.rb | 22 ++++++++++++++++++++++ app/views/issues/show.html.haml | 18 ++++++------------ app/views/merge_requests/show/_mr_box.html.haml | 22 ++++++++-------------- app/views/merge_requests/show/_mr_title.html.haml | 2 +- 8 files changed, 55 insertions(+), 84 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 738ec2bf1dc..3b0f2960f2b 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -426,25 +426,21 @@ p.time { } .status_info { - font-size: 14px; + font-size: 18px; padding: 5px 15px; - line-height: 24px; - width: 60px; + line-height: 48px; text-align: center; - float: left; - margin-right: 20px; + float: right; + position: relative; + top: -15px; + left: 15px; + background: #F5F5F5; &.success { - background: #5BB75B; - color: white; - text-shadow: 0 1px #111; - border-color: #9A9; } &.error { - background: #DA4E49; - border-color: #BD362F; - color: white; - text-shadow: 0 1px #111; + color: #C32; + border-bottom: 5px solid #C32; } } diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index 898d68bdf23..f1d2b85f137 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -41,6 +41,15 @@ } } + .top_box_content { + .box-title { + color: $style_color; + font-size: 18px; + font-weight: normal; + line-height: 28px; + } + } + .middle_box_content { @include border-radius(0); border: none; diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 99ea9ef2975..6b21f463c4c 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -4,28 +4,6 @@ module IssuesHelper project_issues_path project, params end - def link_to_issue_assignee(issue) - project = issue.project - - tm = project.team_member_by_id(issue.assignee_id) - if tm - link_to issue.assignee_name, project_team_member_path(project, tm), class: "author_link" - else - issue.assignee_name - end - end - - def link_to_issue_author(issue) - project = issue.project - - tm = project.team_member_by_id(issue.author_id) - if tm - link_to issue.author_name, project_team_member_path(project, tm), class: "author_link" - else - issue.author_name - end - end - def issue_css_classes issue classes = "issue" classes << " closed" if issue.closed diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index d03fbadff9c..f48425bd6de 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -1,26 +1,4 @@ module MergeRequestsHelper - def link_to_merge_request_assignee(merge_request) - project = merge_request.project - - tm = project.team_member_by_id(merge_request.assignee_id) - if tm - link_to merge_request.assignee_name, project_team_member_path(project, tm), class: "author_link" - else - merge_request.assignee_name - end - end - - def link_to_merge_request_author(merge_request) - project = merge_request.project - - tm = project.team_member_by_id(merge_request.author_id) - if tm - link_to merge_request.author_name, project_team_member_path(project, tm), class: "author_link" - else - merge_request.author_name - end - end - def new_mr_path_from_push_event(event) new_project_merge_request_path( event.project, diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2fa9d21d125..425dd471b36 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -20,6 +20,28 @@ module ProjectsHelper end end + def link_to_member(project, author) + return "(deleted)" unless author + + # Build avatar image tag + avatar = image_tag(gravatar_icon(author.try(:email)), width: 16, class: "lil_av") + + # Build name strong tag + name = content_tag :strong, author.name, class: 'author' + + author_html = avatar + name + + tm = project.team_member_by_id(author) + + content_tag :span, class: 'member-link' do + if tm + link_to author_html, project_team_member_path(project, tm), class: "author_link" + else + author_html + end + end + end + def tm_path team_member project_team_member_path(@project, team_member) end diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 9114febdd02..1d4d6a13c2b 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -26,22 +26,16 @@ .main_box .top_box_content - %h4 + %h4.box-title - if @issue.closed - .alert-message.error.status_info Closed - - else - .alert-message.success.status_info Open + .error.status_info Closed = gfm escape_once(@issue.title) .middle_box_content - %cite.cgray Created by - = image_tag gravatar_icon(@issue.author_email), width: 16, class: "lil_av" - %strong.author= link_to_issue_author(@issue) - - - if @issue.assignee - %cite.cgray and currently assigned to - = image_tag gravatar_icon(@issue.assignee_email), width: 16, class: "lil_av" - %strong.author= link_to_issue_assignee(@issue) + %cite.cgray + Created by #{link_to_member(@project, @issue.author)} + - if @issue.assignee + \ and currently assigned to #{link_to_member(@project, @issue.assignee)} - if @issue.milestone - milestone = @issue.milestone diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml index 26636435a06..f64182c6e68 100644 --- a/app/views/merge_requests/show/_mr_box.html.haml +++ b/app/views/merge_requests/show/_mr_box.html.haml @@ -1,22 +1,16 @@ .main_box .top_box_content - %h4 + %h4.box-title - if @merge_request.closed - .alert-message.error.status_info Closed - - else - .alert-message.success.status_info Open + .error.status_info Closed = gfm escape_once(@merge_request.title) .middle_box_content %div - %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by - = image_tag gravatar_icon(@merge_request.author_email), width: 16, class: "lil_av" - %strong.author= link_to_merge_request_author(@merge_request) - - - if @merge_request.assignee - %cite.cgray , currently assigned to - = image_tag gravatar_icon(@merge_request.assignee_email), width: 16, class: "lil_av" - %strong.author= link_to_merge_request_assignee(@merge_request) + %cite.cgray + Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)} + - if @merge_request.assignee + \, currently assigned to #{link_to_member(@project, @merge_request.assignee)} - if @merge_request.milestone - milestone = @merge_request.milestone %cite.cgray and attached to milestone @@ -27,10 +21,10 @@ .bottom_box_content - if @merge_request.merged? %span - Merged by #{@merge_request.merge_event.author_name} + Merged by #{link_to_member(@project, @merge_request.merge_event.author)} %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. - elsif @merge_request.closed_event %span - Closed by #{@merge_request.closed_event.author_name} + Closed by #{link_to_member(@project, @merge_request.closed_event.author)} %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml index a5275650d86..745dc93fbfb 100644 --- a/app/views/merge_requests/show/_mr_title.html.haml +++ b/app/views/merge_requests/show/_mr_title.html.haml @@ -7,7 +7,7 @@ %span.right - if @merge_request.merged? - %span.btn.small.disabled.grouped + %span.btn.small.disabled.grouped.success %strong %i.icon-ok = "MERGED" -- cgit v1.2.1 From d41175cf21596b72872e362ae2c107e75c970faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Lafoucri=C3=A8re?= Date: Thu, 13 Dec 2012 16:55:38 +0100 Subject: Update README.md Add dependencies status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a8de834ceb6..629fcefcb32 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://travis-ci.org/gitlabhq/grit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq) +# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://travis-ci.org/gitlabhq/grit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq) [![Dependency Status](https://gemnasium.com/gitlabhq/gitlabhq.png)](https://gemnasium.com/gitlabhq/gitlabhq) GitLab is a free project and repository management application -- cgit v1.2.1 From 1d156c9c8ee0d81370844d58c2863cb4b780489e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 13 Dec 2012 18:42:15 +0200 Subject: Fix project lookup. Show error if project transfer fails --- app/assets/javascripts/main.js.coffee | 6 ++++++ app/controllers/projects_controller.rb | 4 ++++ app/models/project.rb | 10 +++++++++- app/views/projects/_form.html.haml | 2 +- app/views/projects/update_failed.js.haml | 2 ++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 app/views/projects/update_failed.js.haml diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index bdb83f49474..3334439ca87 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -7,6 +7,12 @@ window.slugify = (text) -> window.ajaxGet = (url) -> $.ajax({type: "GET", url: url, dataType: "script"}) +window.errorMessage = (message) -> + ehtml = $("

    ") + ehtml.addClass("error_message") + ehtml.html(message) + ehtml + # Disable button if text field is empty window.disableButtonIfEmptyField = (field_selector, button_selector) -> field = $(field_selector) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 272a6e95411..985dcfe8ea9 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -46,6 +46,10 @@ class ProjectsController < ProjectResourceController format.js end end + + rescue Project::TransferError => ex + @error = ex + render :update_failed end def show diff --git a/app/models/project.rb b/app/models/project.rb index b463a72b34e..468708758dc 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -26,6 +26,8 @@ class Project < ActiveRecord::Base include Authority include Team + class TransferError < StandardError; end + attr_accessible :name, :path, :description, :default_branch, :issues_enabled, :wall_enabled, :merge_requests_enabled, :wiki_enabled, as: [:default, :admin] @@ -101,7 +103,7 @@ class Project < ActiveRecord::Base namespace_id = Namespace.find_by_path(id.first).id where(namespace_id: namespace_id).find_by_path(id.last) else - find_by_path(id) + where(path: id, namespace_id: nil).last end end @@ -270,12 +272,18 @@ class Project < ActiveRecord::Base self.path end + if Project.where(path: self.path, namespace_id: new_namespace.try(:id)).present? + raise TransferError.new("Project with same path in target namespace already exists") + end + Gitlab::ProjectMover.new(self, old_dir, new_dir).execute git_host.move_repository(old_repo, self) save! end + rescue Gitlab::ProjectMover::ProjectMoveError => ex + raise TransferError.new(ex.message) end def name_with_namespace diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 448293ca080..d0da21451a3 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -22,7 +22,7 @@ %span Namespace .controls - if can? current_user, :change_namespace, @project - = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} + = f.select :namespace_id, namespaces_options(@project.namespace_id || Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}   %span.cred Be careful. Changing project namespace can have unintended side effects - else diff --git a/app/views/projects/update_failed.js.haml b/app/views/projects/update_failed.js.haml new file mode 100644 index 00000000000..a3ac5f4088f --- /dev/null +++ b/app/views/projects/update_failed.js.haml @@ -0,0 +1,2 @@ +:plain + $(".save-project-loader").replaceWith(errorMessage('#{escape_javascript(@error.message)}')); -- cgit v1.2.1 From e228dae8769d67e7539fd0bf1475d85c0244aa8d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 13 Dec 2012 19:20:10 +0200 Subject: Fix spec/workers/post_receive_spec.rb --- spec/workers/post_receive_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index 443c8c1a3c4..b0f554c52ab 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -14,7 +14,7 @@ describe PostReceive do let(:key_id) { key.identifier } it "fetches the correct project" do - Project.should_receive(:find_by_path).with(project.path_with_namespace).and_return(project) + Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project) PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id) end @@ -28,7 +28,7 @@ describe PostReceive do end it "asks the project to trigger all hooks" do - Project.stub(find_by_path: project) + Project.stub(find_with_namespace: project) project.should_receive(:execute_hooks) project.should_receive(:execute_services) project.should_receive(:update_merge_requests) -- cgit v1.2.1 From a8fbda945eec91c597a26100eff000bb3eb9b6af Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 13 Dec 2012 21:44:55 +0200 Subject: bit reordering and cleanup unused styles --- app/assets/stylesheets/common.scss | 134 ++------------------- .../stylesheets/gitlab_bootstrap/common.scss | 11 ++ app/assets/stylesheets/gitlab_bootstrap/lists.scss | 14 +++ app/assets/stylesheets/main.scss | 1 + app/assets/stylesheets/sections/votes.scss | 43 +++++++ app/views/team_members/show.html.haml | 2 +- 6 files changed, 81 insertions(+), 124 deletions(-) create mode 100644 app/assets/stylesheets/sections/votes.scss diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 3b0f2960f2b..a9777f56ee2 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -13,20 +13,12 @@ body { margin: 0 0; } -.container .sidebar { - width: 200px; - height: 100%; - min-height: 450px; - float: right; -} - - .visible_link, .author_link { color: $link_color; } -.help li { color:#111 } +.help li { color:$style_color; } .back_link { text-decoration: underline; @@ -96,28 +88,17 @@ table a code { margin-right:50px } -.handle:hover { - cursor: move; -} - span.update-author { display: block; -} -span.update-author { color: #999; font-weight: normal; font-style: italic; -} -span.update-author strong { - font-weight: bold; - font-style: normal; + strong { + font-weight: bold; + font-style: normal; + } } -/** UPDATE ITEM **/ -span.update-author { - display: block; -} -/** END UPDATE ITEM **/ .dashboard-loader { float: left; margin: 10px; @@ -264,21 +245,6 @@ input.git_clone_url { } -/** bordered list **/ -ul.bordered-list { - margin: 5px 0px; - padding: 0px; - li { - padding: 5px 0; - border-bottom: 1px solid #EEE; - overflow: hidden; - display: block; - margin: 0px; - } -} - -ul.bordered-list li:last-child { border:none } - .line_holder { &:hover { td { @@ -315,28 +281,6 @@ p.time { border: 2px solid #ddd; } - -.ico { - background: url("images.png") no-repeat -85px -77px; - width: 19px; - height: 16px; - float: left; - position: relative; - margin-right: 10px; - top: 8px; - - &.project { - background-position: -37px -77px; - } - - &.activities { - background-position:-162px -22px; - } - &.projects { - background-position:-209px -21px; - } -} - .leftbar { h5, .title { padding: 5px 10px; @@ -365,49 +309,6 @@ p.time { } } -.votes { - font-size: 13px; - line-height: 15px; - .progress { - height: 4px; - margin: 0; - .bar { - float: left; - height: 100%; - } - .bar-success { - @include linear-gradient(#62C462, #51A351); - background-color: #468847; - } - .bar-danger { - @include linear-gradient(#EE5F5B, #BD362F); - background-color: #B94A48; - } - } - .upvotes { - display: inline-block; - color: #468847; - } - .downvotes { - display: inline-block; - color: #B94A48; - } -} -.votes-block { - margin: 14px 6px 6px 0; - .downvotes { - float: right; - } -} -.votes-inline { - display: inline-block; - margin: 0 8px; - .progress { - display: inline-block; - padding: 0 0 2px; - width: 45px; - } -} /* Fix for readme code (stopped it from being yellow) */ .readme { @@ -426,21 +327,18 @@ p.time { } .status_info { - font-size: 18px; + font-size: 14px; padding: 5px 15px; - line-height: 48px; + line-height: 26px; text-align: center; float: right; position: relative; - top: -15px; - left: 15px; - background: #F5F5F5; + top: -5px; + @include border-radius(4px); - &.success { - } &.error { - color: #C32; - border-bottom: 5px solid #C32; + background: #DA4E49; + color: #FFF; } } @@ -459,16 +357,6 @@ p.time { height: 150px; } -.gitlab_pagination { - span a { color: $link_color; } - .prev, .next, .current, .page a { - padding: 10px; - } - .current { - border-bottom: 2px solid $style_color; - } -} - // Fixes alignment on notes. .new_note { label { diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index dca558df000..a663326ee0e 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -101,3 +101,14 @@ input[type='search'].search-text-input { } fieldset legend { font-size: 17px; } + +/** PAGINATION **/ +.gitlab_pagination { + span a { color: $link_color; } + .prev, .next, .current, .page a { + padding: 10px; + } + .current { + border-bottom: 2px solid $style_color; + } +} diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index 5bd087b080e..fc97af43339 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -39,3 +39,17 @@ ol, ul { } } } + +/** light list with border-bottom between li **/ +ul.bordered-list { + margin: 5px 0px; + padding: 0px; + li { + padding: 5px 0; + border-bottom: 1px solid #EEE; + overflow: hidden; + display: block; + margin: 0px; + &:last-child { border:none } + } +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index dee7ce5a2ac..ccae351eb8f 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -90,6 +90,7 @@ $baseLineHeight: 18px !default; @import "sections/issues.scss"; @import "sections/projects.scss"; @import "sections/snippets.scss"; +@import "sections/votes.scss"; @import "sections/merge_requests.scss"; @import "sections/graph.scss"; @import "sections/events.scss"; diff --git a/app/assets/stylesheets/sections/votes.scss b/app/assets/stylesheets/sections/votes.scss new file mode 100644 index 00000000000..4686f5422dc --- /dev/null +++ b/app/assets/stylesheets/sections/votes.scss @@ -0,0 +1,43 @@ +.votes { + font-size: 13px; + line-height: 15px; + .progress { + height: 4px; + margin: 0; + .bar { + float: left; + height: 100%; + } + .bar-success { + @include linear-gradient(#62C462, #51A351); + background-color: #468847; + } + .bar-danger { + @include linear-gradient(#EE5F5B, #BD362F); + background-color: #B94A48; + } + } + .upvotes { + display: inline-block; + color: #468847; + } + .downvotes { + display: inline-block; + color: #B94A48; + } +} +.votes-block { + margin: 14px 6px 6px 0; + .downvotes { + float: right; + } +} +.votes-inline { + display: inline-block; + margin: 0 8px; + .progress { + display: inline-block; + padding: 0 0 2px; + width: 45px; + } +} diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml index 9d03cd2cb1f..af9a6e6b92d 100644 --- a/app/views/team_members/show.html.haml +++ b/app/views/team_members/show.html.haml @@ -6,7 +6,7 @@ = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn danger" .profile_avatar_holder = image_tag gravatar_icon(user.email, 60), class: "borders" - %h3 + %h3.page_title = user.name %small = user.email -- cgit v1.2.1 From 44209861e8a3ed4e5d0e0e59823d4bf61c338f1f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 06:14:05 +0300 Subject: Allow group path renaming. Dont show project transfer if no permissions. More danger messages :) --- .../stylesheets/gitlab_bootstrap/common.scss | 6 +++++ app/views/admin/groups/edit.html.haml | 19 ++++++++++---- app/views/admin/groups/show.html.haml | 15 +++++++---- app/views/projects/_form.html.haml | 29 ++++++++++++---------- 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index a663326ee0e..b8e89e7c78a 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -100,6 +100,12 @@ input[type='search'].search-text-input { border: 1px solid #ccc; } +input[type='text'].danger { + background: #F2DEDE!important; + border-color: #D66; + text-shadow: 0 1px 1px #fff +} + fieldset legend { font-size: 17px; } /** PAGINATION **/ diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index 4026817496a..901d07e74f3 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -1,9 +1,5 @@ %h3.page_title Rename Group %hr -.alert - Renaming group can have unintended side effects. - %br - Renaming group will rename directory for all related projects = form_for [:admin, @group] do |f| - if @group.errors.any? .alert-message.block-message.error @@ -14,6 +10,19 @@ .input = f.text_field :name, placeholder: "Example Group", class: "xxlarge" + + + .clearfix.group_name_holder + = f.label :path do + %span.cred Group path is + .input + = f.text_field :path, placeholder: "example-group", class: "xxlarge danger" + %ul.cred + %li Changing group path can have unintended side effects. + %li Renaming group path will rename directory for all related projects + %li It will change web url for access group and group projects. + %li It will change the git path to repositories under this group. + .form-actions - = f.submit 'Rename group', class: "btn save-btn" + = f.submit 'Rename group', class: "btn danger" = link_to 'Cancel', admin_groups_path, class: "btn cancel-btn" diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 4b6fedfd360..1b02475fa80 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -33,12 +33,17 @@ = link_to "#", class: "btn btn-small change-owner-link" do %i.icon-edit Change owner - .change-owner-holder.hide - = form_for [:admin, @group] do |f| - = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'} - = f.submit 'Save', class: "btn btn-small save-btn" - = link_to "Cancel", "#", class: "btn btn-small change-owner-cancel-link" + %tr.change-owner-holder.hide + %td.bgred + %b.cred + New Owner: + %td.bgred + = form_for [:admin, @group] do |f| + = f.select :owner_id, User.all.map { |user| [user.name, user.id] }, {}, {class: 'chosen'} + %div + = f.submit 'Change Owner', class: "btn danger" + = link_to "Cancel", "#", class: "btn change-owner-cancel-link" %fieldset %legend Projects (#{@group.projects.count}) %table diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index d0da21451a3..7044d1f20be 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -17,19 +17,6 @@ .controls = text_field_tag :ppath, @project.path_to_repo, class: "xxlarge", readonly: true - .control-group - = f.label :namespace_id do - %span Namespace - .controls - - if can? current_user, :change_namespace, @project - = f.select :namespace_id, namespaces_options(@project.namespace_id || Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} -   - %span.cred Be careful. Changing project namespace can have unintended side effects - - else - %a.btn.disabled= @project.namespace.try(:human_name) || "/" -   - %span.cred Only owner can change project namespace. - - unless @project.heads.empty? .clearfix @@ -63,6 +50,22 @@ = f.check_box :wiki_enabled %span.descr Pages for project documentation + + - if can? current_user, :change_namespace, @project + %fieldset.features + %legend Transfer: + .control-group + = f.label :namespace_id do + %span Namespace + .controls + = f.select :namespace_id, namespaces_options(@project.namespace_id || Namespace::global_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} + %br + %ul.prepend-top-10.cred + %li Be careful. Changing project namespace can have unintended side effects + %li You can transfer project only to namespaces you can manage + %li You will need to update your local repositories to point to the new location. + + %br .actions -- cgit v1.2.1 From b01f8b63c2c13f8d6b9111771fb4f1422214d91c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 08:14:05 +0300 Subject: added NamespacedProject role. Extended project info displayed for admin. Fixed project limit --- app/controllers/groups_controller.rb | 1 + app/controllers/snippets_controller.rb | 4 +-- app/models/project.rb | 61 ++----------------------------- app/models/user.rb | 13 ------- app/roles/account.rb | 16 +++++++++ app/roles/namespaced_project.rb | 59 ++++++++++++++++++++++++++++++ app/views/admin/projects/_form.html.haml | 62 +++++++++++++++++--------------- app/views/admin/projects/index.html.haml | 2 +- app/views/admin/projects/show.html.haml | 44 +++++++++++++++++++++-- app/views/admin/users/index.html.haml | 13 ++++--- app/views/admin/users/show.html.haml | 6 ++++ app/views/hooks/index.html.haml | 13 ++++--- app/views/projects/create.js.haml | 1 + app/views/projects/files.html.haml | 3 +- app/views/snippets/_snippet.html.haml | 3 +- app/views/snippets/index.html.haml | 16 ++++----- app/views/team_members/_team.html.haml | 2 +- spec/models/user_spec.rb | 13 ++++++- 18 files changed, 201 insertions(+), 131 deletions(-) create mode 100644 app/roles/namespaced_project.rb diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 93c495363d9..0aecd9c6a11 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -49,6 +49,7 @@ class GroupsController < ApplicationController def people @project = group.projects.find(params[:project_id]) if params[:project_id] @users = @project ? @project.users : group.users + @users.sort_by!(&:name) if @project @team_member = @project.users_projects.new diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 7324a4594eb..d037ad11ef1 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -16,7 +16,7 @@ class SnippetsController < ProjectResourceController respond_to :html def index - @snippets = @project.snippets + @snippets = @project.snippets.fresh end def new @@ -60,7 +60,7 @@ class SnippetsController < ProjectResourceController redirect_to project_snippets_path(@project) end - def raw + def raw send_data( @snippet.content, type: "text/plain", diff --git a/app/models/project.rb b/app/models/project.rb index 468708758dc..85b04c5d359 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -25,6 +25,7 @@ class Project < ActiveRecord::Base include PushObserver include Authority include Team + include NamespacedProject class TransferError < StandardError; end @@ -178,7 +179,7 @@ class Project < ActiveRecord::Base end def repo_name - denied_paths = %w(gitolite-admin groups projects dashboard) + denied_paths = %w(gitolite-admin groups projects dashboard help ) if denied_paths.include?(path) errors.add(:path, "like #{path} is not allowed") @@ -245,57 +246,11 @@ class Project < ActiveRecord::Base gitlab_ci_service && gitlab_ci_service.active end - def path_with_namespace - if namespace - namespace.path + '/' + path - else - path - end - end - # For compatibility with old code def code path end - def transfer(new_namespace) - Project.transaction do - old_namespace = namespace - self.namespace = new_namespace - - old_dir = old_namespace.try(:path) || '' - new_dir = new_namespace.try(:path) || '' - - old_repo = if old_dir.present? - File.join(old_dir, self.path) - else - self.path - end - - if Project.where(path: self.path, namespace_id: new_namespace.try(:id)).present? - raise TransferError.new("Project with same path in target namespace already exists") - end - - Gitlab::ProjectMover.new(self, old_dir, new_dir).execute - - git_host.move_repository(old_repo, self) - - save! - end - rescue Gitlab::ProjectMover::ProjectMoveError => ex - raise TransferError.new(ex.message) - end - - def name_with_namespace - @name_with_namespace ||= begin - if namespace - namespace.human_name + " / " + name - else - name - end - end - end - def items_for entity case entity when 'issue' then @@ -304,16 +259,4 @@ class Project < ActiveRecord::Base merge_requests end end - - def namespace_owner - namespace.try(:owner) - end - - def chief - if namespace - namespace_owner - else - owner - end - end end diff --git a/app/models/user.rb b/app/models/user.rb index f99fdd27aed..1bc070f040d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,7 +56,6 @@ class User < ActiveRecord::Base has_many :issues, foreign_key: :author_id, dependent: :destroy has_many :notes, foreign_key: :author_id, dependent: :destroy has_many :merge_requests, foreign_key: :author_id, dependent: :destroy - has_many :my_own_projects, class_name: "Project", foreign_key: :owner_id has_many :events, class_name: "Event", foreign_key: :author_id, dependent: :destroy has_many :recent_events, class_name: "Event", foreign_key: :author_id, order: "id DESC" has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy @@ -124,16 +123,4 @@ class User < ActiveRecord::Base self.password = self.password_confirmation = Devise.friendly_token.first(8) end end - - def authorized_groups - @authorized_groups ||= begin - groups = Group.where(id: self.projects.pluck(:namespace_id)).all - groups = groups + self.groups - groups.uniq - end - end - - def authorized_projects - Project.authorized_for(self) - end end diff --git a/app/roles/account.rb b/app/roles/account.rb index 8157898fef1..72fa9ebf9d9 100644 --- a/app/roles/account.rb +++ b/app/roles/account.rb @@ -105,4 +105,20 @@ module Account def namespace_id namespace.try :id end + + def authorized_groups + @authorized_groups ||= begin + groups = Group.where(id: self.projects.pluck(:namespace_id)).all + groups = groups + self.groups + groups.uniq + end + end + + def authorized_projects + Project.authorized_for(self) + end + + def my_own_projects + Project.personal(self) + end end diff --git a/app/roles/namespaced_project.rb b/app/roles/namespaced_project.rb new file mode 100644 index 00000000000..8656890a456 --- /dev/null +++ b/app/roles/namespaced_project.rb @@ -0,0 +1,59 @@ +module NamespacedProject + def transfer(new_namespace) + Project.transaction do + old_namespace = namespace + self.namespace = new_namespace + + old_dir = old_namespace.try(:path) || '' + new_dir = new_namespace.try(:path) || '' + + old_repo = if old_dir.present? + File.join(old_dir, self.path) + else + self.path + end + + if Project.where(path: self.path, namespace_id: new_namespace.try(:id)).present? + raise TransferError.new("Project with same path in target namespace already exists") + end + + Gitlab::ProjectMover.new(self, old_dir, new_dir).execute + + git_host.move_repository(old_repo, self) + + save! + end + rescue Gitlab::ProjectMover::ProjectMoveError => ex + raise TransferError.new(ex.message) + end + + def name_with_namespace + @name_with_namespace ||= begin + if namespace + namespace.human_name + " / " + name + else + name + end + end + end + + def namespace_owner + namespace.try(:owner) + end + + def chief + if namespace + namespace_owner + else + owner + end + end + + def path_with_namespace + if namespace + namespace.path + '/' + path + else + path + end + end +end diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index d90d4a03d67..27c22872d50 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -19,43 +19,47 @@ .input = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true - - unless project.new_record? + - if project.repo_exists? .clearfix - = f.label :namespace_id - .input - = f.select :namespace_id, namespaces_options(@project.namespace_id, :all), {}, {class: 'chosen'} -   - %span.cred Be careful. Changing project namespace can have unintended side effects + = f.label :default_branch, "Default Branch" + .input= f.select(:default_branch, project.heads.map(&:name), {}, style: "width:210px;") - - if project.repo_exists? - .clearfix - = f.label :default_branch, "Default Branch" - .input= f.select(:default_branch, project.heads.map(&:name), {}, style: "width:210px;") + %fieldset.adv_settings + %legend Features: - - unless project.new_record? - %fieldset.adv_settings - %legend Features: + .clearfix + = f.label :issues_enabled, "Issues" + .input= f.check_box :issues_enabled - .clearfix - = f.label :issues_enabled, "Issues" - .input= f.check_box :issues_enabled + .clearfix + = f.label :merge_requests_enabled, "Merge Requests" + .input= f.check_box :merge_requests_enabled - .clearfix - = f.label :merge_requests_enabled, "Merge Requests" - .input= f.check_box :merge_requests_enabled + .clearfix + = f.label :wall_enabled, "Wall" + .input= f.check_box :wall_enabled - .clearfix - = f.label :wall_enabled, "Wall" - .input= f.check_box :wall_enabled + .clearfix + = f.label :wiki_enabled, "Wiki" + .input= f.check_box :wiki_enabled + + %fieldset.features + %legend Transfer: + .control-group + = f.label :namespace_id do + %span Namespace + .controls + = f.select :namespace_id, namespaces_options(@project.namespace_id, :all), {}, {class: 'chosen'} + %br + %ul.prepend-top-10.cred + %li Be careful. Changing project namespace can have unintended side effects + %li You can transfer project only to namespaces you can manage + %li You will need to update your local repositories to point to the new location. - .clearfix - = f.label :wiki_enabled, "Wiki" - .input= f.check_box :wiki_enabled - - unless project.new_record? - .actions - = f.submit 'Save Project', class: "btn save-btn" - = link_to 'Cancel', admin_projects_path, class: "btn cancel-btn" + .actions + = f.submit 'Save Project', class: "btn save-btn" + = link_to 'Cancel', admin_projects_path, class: "btn cancel-btn" diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 605a733574c..832bc352b56 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -1,5 +1,5 @@ %h3.page_title - Projects + Projects (#{@projects.count}) = link_to 'New Project', new_project_path, class: "btn small right" %br = form_tag admin_projects_path, method: :get, class: 'form-inline' do diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 1ca3128523f..634b1836754 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -47,21 +47,61 @@ %tr %td %b - Path: + Owned by: %td - %code= @project.path_to_repo + - if @project.chief + = link_to @project.chief.name, admin_user_path(@project.chief) + - else + (deleted) %tr %td %b Created by: %td = @project.owner_name || '(deleted)' + %tr + %td + %b + Created at: + %td + = @project.created_at.stamp("March 1, 1999") + +%table.zebra-striped + %thead + %tr + %th Repository + %th + %tr + %td + %b + FS Path: + %td + %code= @project.path_to_repo + %tr + %td + %b + Smart HTTP: + %td + = link_to @project.http_url_to_repo + %tr + %td + %b + SSH: + %td + = link_to @project.ssh_url_to_repo + %tr + %td + %b + Last commit at: + %td + = last_commit(@project) %tr %td %b Post Receive File: %td = check_box_tag :post_receive_file, 1, @project.has_post_receive_file?, disabled: true + %br %h5 Team diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 7544a732db2..63de1d3af56 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -1,5 +1,5 @@ %h3.page_title - Users + Users (#{@admin_users.count}) = link_to 'New User', new_admin_user_path, class: "btn small right" %br @@ -40,10 +40,13 @@ %td= user.users_projects.count %td= link_to 'Edit', edit_admin_user_path(user), id: "edit_#{dom_id(user)}", class: "btn small" %td.bgred - - if user.blocked - = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success" + - if user == current_user + %span.cred It's you! - else - = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger" - = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small danger" + - if user.blocked + = link_to 'Unblock', unblock_admin_user_path(user), method: :put, class: "btn small success" + - else + = link_to 'Block', block_admin_user_path(user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn small danger" + = link_to 'Destroy', [:admin, user], confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn small danger" = paginate @admin_users, theme: "admin" diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 1af7549c074..852aead79e2 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -37,6 +37,12 @@ %b Blocked: %td= check_box_tag "blocked", 1, @admin_user.blocked, disabled: :disabled + %tr + %td + %b + Created at: + %td + = @admin_user.created_at.stamp("March 1, 1999") %tr %td %b diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml index 1b59c8e81ab..6a36c749123 100644 --- a/app/views/hooks/index.html.haml +++ b/app/views/hooks/index.html.haml @@ -22,22 +22,21 @@ %hr -if @hooks.any? - %h3 - Hooks - %small (#{@hooks.count}) + %h3.page_title + Hooks (#{@hooks.count}) %br %table %thead %tr %th URL - %th Method %th - @hooks.each do |hook| %tr %td + %span.badge.badge-info POST = link_to project_hook_path(@project, hook) do %strong= hook.url - = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn small right" - %td POST %td - = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small right" + .right + = link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn small grouped" + = link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "danger btn small grouped" diff --git a/app/views/projects/create.js.haml b/app/views/projects/create.js.haml index ce73fe0cf01..d388988676d 100644 --- a/app/views/projects/create.js.haml +++ b/app/views/projects/create.js.haml @@ -9,3 +9,4 @@ $('.project_new_holder').show(); $("#new_project").replaceWith("#{escape_javascript(render('new_form'))}"); $('.save-project-loader').hide(); + new Projects(); diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml index 9f7efcdc515..d108308318e 100644 --- a/app/views/projects/files.html.haml +++ b/app/views/projects/files.html.haml @@ -17,7 +17,6 @@ = time_ago_in_words(note.created_at) ago - else - .alert-message.block-message - %span All files attached to project wall, issues etc will be displayed here + %p.slead All files attached to project wall, issues etc will be displayed here diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml index a2d3a65e6cb..a576500c15d 100644 --- a/app/views/snippets/_snippet.html.haml +++ b/app/views/snippets/_snippet.html.haml @@ -1,12 +1,13 @@ %tr %td + = image_tag gravatar_icon(snippet.author_email), class: "avatar s24" %a{href: project_snippet_path(snippet.project, snippet)} %strong= truncate(snippet.title, length: 60) %td = snippet.file_name %td %span.cgray - - if snippet.expires_at + - if snippet.expires_at = snippet.expires_at.to_date.to_s(:short) - else Never diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index 515daec6207..7b8f94de7dd 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -1,21 +1,21 @@ = render "projects/project_head" -- if can? current_user, :write_snippet, @project - .alert-message.block-message +%h3.page_title + Snippets + %small share code pastes with others out of git repository + + - if can? current_user, :write_snippet, @project = link_to new_project_snippet_path(@project), class: "btn small add_new right", title: "New Snippet" do Add new snippet - Share code pastes with others if it can't be in a git repository - %br - To add new snippet - click on button. - +%br %table %thead %tr %th Title %th File Name %th Expires At - = render @snippets.fresh - - if @snippets.fresh.empty? + = render @snippets + - if @snippets.empty? %tr %td{colspan: 3} %h3.nothing_here_message Nothing here. diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml index 65f17864814..e5fc4316279 100644 --- a/app/views/team_members/_team.html.haml +++ b/app/views/team_members/_team.html.haml @@ -4,7 +4,7 @@ = Project.access_options.key(access).pluralize %small= members.size %ul.unstyled - - members.each do |up| + - members.sort_by(&:user_name).each do |up| = render(partial: 'team_members/show', locals: {member: up}) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 279e315b693..79ffc05bca9 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -41,7 +41,6 @@ describe User do it { should have_many(:users_projects).dependent(:destroy) } it { should have_many(:projects) } it { should have_many(:groups) } - it { should have_many(:my_own_projects).class_name('Project') } it { should have_many(:keys).dependent(:destroy) } it { should have_many(:events).class_name('Event').dependent(:destroy) } it { should have_many(:recent_events).class_name('Event') } @@ -116,4 +115,16 @@ describe User do user.authentication_token.should_not be_blank end end + + describe 'projects and namespaces' do + before do + ActiveRecord::Base.observers.enable(:user_observer) + @user = create :user + @project = create :project, namespace: @user.namespace + end + + it { @user.authorized_projects.should include(@project) } + it { @user.my_own_projects.should include(@project) } + it { @user.several_namespaces?.should be_false } + end end -- cgit v1.2.1 From 190e483fb4b5edb6d8dfa71b67dc52da402ddab9 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 08:34:05 +0300 Subject: Rework of milestones --- app/assets/stylesheets/common.scss | 11 +++++-- app/controllers/milestones_controller.rb | 7 ++-- app/models/milestone.rb | 19 +++++++++-- app/models/snippet.rb | 2 +- app/views/issues/_show.html.haml | 2 +- app/views/milestones/_milestone.html.haml | 6 ++-- app/views/milestones/index.html.haml | 5 ++- app/views/milestones/show.html.haml | 54 +++++++++++++++++++------------ 8 files changed, 72 insertions(+), 34 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a9777f56ee2..d38aa1738a3 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -531,9 +531,14 @@ pre { } } -.milestone .progress { - margin-bottom: 0; - margin-top: 4px; +.milestone { + &.milestone-closed { + background: #eee; + } + .progress { + margin-bottom: 0; + margin-top: 4px; + } } .float-link { diff --git a/app/controllers/milestones_controller.rb b/app/controllers/milestones_controller.rb index fadfee2dc06..276317d1c2d 100644 --- a/app/controllers/milestones_controller.rb +++ b/app/controllers/milestones_controller.rb @@ -12,11 +12,12 @@ class MilestonesController < ProjectResourceController def index @milestones = case params[:f] - when 'all'; @project.milestones - else @project.milestones.active + when 'all'; @project.milestones.order("closed, due_date DESC") + when 'closed'; @project.milestones.closed.order("due_date DESC") + else @project.milestones.active.order("due_date ASC") end - @milestones = @milestones.includes(:project).order("due_date") + @milestones = @milestones.includes(:project) @milestones = @milestones.page(params[:page]).per(20) end diff --git a/app/models/milestone.rb b/app/models/milestone.rb index a50831a2241..e700cc2f2f7 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -19,12 +19,19 @@ class Milestone < ActiveRecord::Base has_many :issues has_many :merge_requests + scope :active, where(closed: false) + scope :closed, where(closed: true) + validates :title, presence: true validates :project, presence: true validates :closed, inclusion: { in: [true, false] } - def self.active - where("due_date > ? OR due_date IS NULL", Date.today) + def expired? + if due_date + due_date < Date.today + else + false + end end def participants @@ -52,4 +59,12 @@ class Milestone < ActiveRecord::Base def expires_at "expires at #{due_date.stamp("Aug 21, 2011")}" if due_date end + + def can_be_closed? + issues.count > 0 && open? && issues.opened.count.zero? + end + + def open? + !closed + end end diff --git a/app/models/snippet.rb b/app/models/snippet.rb index 997c19bdb6b..8d7eb788abb 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -22,7 +22,7 @@ class Snippet < ActiveRecord::Base belongs_to :author, class_name: "User" has_many :notes, as: :noteable, dependent: :destroy - delegate :name, :email, to: :author, prefix: true + delegate :name, :email, to: :author, prefix: true, allow_nil: true validates :author, presence: true validates :project, presence: true diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 8aa92ebfd6a..ca8cdf704a9 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -28,7 +28,7 @@ %p= link_to_gfm truncate(issue.title, length: 100), project_issue_path(issue.project, issue), class: "row_title" %span.update-author - %small.cdark= "##{issue.id}" + %span.cdark= "##{issue.id}" - if issue.assignee assigned to #{issue.assignee_name} - else diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml index 7c4c0e67d7c..462b9e395a1 100644 --- a/app/views/milestones/_milestone.html.haml +++ b/app/views/milestones/_milestone.html.haml @@ -1,11 +1,13 @@ -%li{class: "milestone", id: dom_id(milestone) } +%li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) } .right - - if can? current_user, :admin_milestone, milestone.project + - if can?(current_user, :admin_milestone, milestone.project) and milestone.open? = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn small edit-milestone-link grouped" do %i.icon-edit Edit %h4 = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone) + - if milestone.expired? and not milestone.closed + %span.cred (Expired) %small = milestone.expires_at .row diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml index c5333b08fdc..813fb362e25 100644 --- a/app/views/milestones/index.html.haml +++ b/app/views/milestones/index.html.haml @@ -11,6 +11,9 @@ %li{class: ("active" if (params[:f] == "active" || !params[:f]))} = link_to project_milestones_path(@project, f: "active") do Active + %li{class: ("active" if params[:f] == "closed")} + = link_to project_milestones_path(@project, f: "closed") do + Closed %li{class: ("active" if params[:f] == "all")} = link_to project_milestones_path(@project, f: "all") do All @@ -19,7 +22,7 @@ = render @milestones - if @milestones.present? - %li.bottom= paginate @milestones, remote: true, theme: "gitlab" + %li.bottom= paginate @milestones, theme: "gitlab" - else %li %h3.nothing_here_message Nothing to show here diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml index b8bc788c953..1f191f5ad3c 100644 --- a/app/views/milestones/show.html.haml +++ b/app/views/milestones/show.html.haml @@ -1,31 +1,41 @@ -%h3.page_title - Milestone ##{@milestone.id} - %small - = @milestone.expires_at +.row + .span6 + %h3.page_title + Milestone ##{@milestone.id} + %small + = @milestone.expires_at + .back_link + = link_to project_milestones_path(@project) do + ← To milestones list + .span6 + .right + - unless @milestone.closed + = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn small grouped", title: "New Issue" do + %i.icon-plus + New Issue + = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped" + - if can?(current_user, :admin_milestone, @project) + = link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do + %i.icon-edit + Edit - %span.right - = link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn small grouped", title: "New Issue" do - %i.icon-plus - New Issue - = link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped" - - if can?(current_user, :admin_milestone, @project) - = link_to edit_project_milestone_path(@project, @milestone), class: "btn small grouped" do - %i.icon-edit - Edit -.back_link - = link_to project_milestones_path(@project) do - ← To milestones list + +- if @milestone.can_be_closed? + %hr + %p + %span All issues for this milestone are closed. You may close milestone now. + = link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn small danger" .main_box .top_box_content - %h5 + %h4.box-title - if @milestone.closed - .alert-message.error.status_info Closed - - else - .alert-message.success.status_info Open + .error.status_info Closed + - elsif @milestone.expired? + .error.status_info Expired + = gfm escape_once(@milestone.title) - %small.right= @milestone.expires_at .middle_box_content %h5 @@ -34,6 +44,7 @@ #{@milestone.closed_items_count} closed – #{@milestone.open_items_count} open + %span.right= @milestone.expires_at .progress.progress-info .bar{style: "width: #{@milestone.percent_complete}%;"} @@ -43,6 +54,7 @@ = preserve do = markdown @milestone.description + .row .span6 %table.milestone-issue-filter -- cgit v1.2.1 From 678e5355a3e43aa2a13d109fe5d75de231eef413 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 19:33:33 +0200 Subject: Create events on comments and milestone --- app/controllers/milestones_controller.rb | 2 ++ app/models/event.rb | 10 +++++++++- app/models/milestone.rb | 1 + app/models/note.rb | 8 ++++++++ app/observers/activity_observer.rb | 4 ++-- app/views/events/_event.html.haml | 2 ++ app/views/events/event/_note.html.haml | 16 ++++++++++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 app/views/events/event/_note.html.haml diff --git a/app/controllers/milestones_controller.rb b/app/controllers/milestones_controller.rb index 276317d1c2d..fb3bdf4a3dd 100644 --- a/app/controllers/milestones_controller.rb +++ b/app/controllers/milestones_controller.rb @@ -43,6 +43,7 @@ class MilestonesController < ProjectResourceController def create @milestone = @project.milestones.new(params[:milestone]) + @milestone.author_id = current_user.id if @milestone.save redirect_to project_milestone_path(@project, @milestone) @@ -52,6 +53,7 @@ class MilestonesController < ProjectResourceController end def update + @milestone.author_id = current_user.id @milestone.update_attributes(params[:milestone]) respond_to do |format| diff --git a/app/models/event.rb b/app/models/event.rb index 2b92783ceac..ee1998e5d4f 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -63,7 +63,7 @@ class Event < ActiveRecord::Base # - new issue # - merge request def allowed? - push? || issue? || merge_request? || membership_changed? + push? || issue? || merge_request? || membership_changed? || note? || milestone? end def project_name @@ -94,6 +94,14 @@ class Event < ActiveRecord::Base action == self.class::Reopened end + def milestone? + target_type == "Milestone" + end + + def note? + target_type == "Note" + end + def issue? target_type == "Issue" end diff --git a/app/models/milestone.rb b/app/models/milestone.rb index e700cc2f2f7..9e3c2bb5df6 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -14,6 +14,7 @@ class Milestone < ActiveRecord::Base attr_accessible :title, :description, :due_date, :closed + attr_accessor :author_id belongs_to :project has_many :issues diff --git a/app/models/note.rb b/app/models/note.rb index da15a173566..219ed9b9332 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -121,4 +121,12 @@ class Note < ActiveRecord::Base def downvote? note.start_with?('-1') || note.start_with?(':-1:') end + + def noteable_type_name + if noteable_type.present? + noteable_type.downcase + else + "wall" + end + end end diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index 48351bac667..fa39bbfbd34 100644 --- a/app/observers/activity_observer.rb +++ b/app/observers/activity_observer.rb @@ -1,5 +1,5 @@ class ActivityObserver < ActiveRecord::Observer - observe :issue, :merge_request + observe :issue, :merge_request, :note, :milestone def after_create(record) Event.create( @@ -12,7 +12,7 @@ class ActivityObserver < ActiveRecord::Observer end def after_save(record) - if record.changed.include?("closed") + if record.changed.include?("closed") Event.create( project: record.project, target_id: record.id, diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 2446b764e4d..9625e1e20de 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -5,6 +5,8 @@ - if event.push? = render "events/event/push", event: event + - if event.note? + = render "events/event/note", event: event - else = render "events/event/common", event: event diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml new file mode 100644 index 00000000000..5dddef1f1ac --- /dev/null +++ b/app/views/events/event/_note.html.haml @@ -0,0 +1,16 @@ +.event-title + %span.author_name= link_to_author event + %span.event_label commented on #{event.target.noteable_type_name} + - if event.target and event.target.noteable_id + = link_to [event.project, event.target.noteable] do + %strong= truncate event.target.noteable_id + - else + %strong (deleted) + at + - if event.project + = link_to_project event.project + - else + = event.project_name + +.event-body + %p.hint= truncate event.target.note, length: 70 -- cgit v1.2.1 From 69c18903e710ceec9aa577312835f5b70029f208 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 14 Dec 2012 20:20:26 +0100 Subject: Update gitlab:check task to use the Gitlab.config.ssh_user setting --- lib/tasks/gitlab/check.rake | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 6d69e13f6af..a695c62e696 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -290,14 +290,15 @@ namespace :gitlab do end def check_gitlab_in_git_group - print "gitlab user is in git group? ... " + gitolite_ssh_user = Gitlab.config.ssh_user + print "gitlab user is in #{gitolite_ssh_user} group? ... " if run_and_match("id -rnG", /\Wgit\W/) puts "yes".green else puts "no".red try_fixing_it( - "sudo usermod -a -G git gitlab" + "sudo usermod -a -G #{gitolite_ssh_user} gitlab" ) for_more_information( see_installation_guide_section "System Users" @@ -308,7 +309,8 @@ namespace :gitlab do # see https://github.com/gitlabhq/gitlabhq/issues/1059 def check_issue_1056_shell_profile_error - print "Has no \"-e\" in ~git/.profile ... " + gitolite_ssh_user = Gitlab.config.ssh_user + print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... " profile_file = File.expand_path("~#{Gitlab.config.ssh_user}/.profile") @@ -510,22 +512,23 @@ namespace :gitlab do end def check_dot_gitolite_user_and_group - print "Config directory owned by git:git? ... " + gitolite_ssh_user = Gitlab.config.ssh_user + print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... " - gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite") + gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite") unless File.exists?(gitolite_config_path) puts "can't check because of previous errors".magenta return end - if `stat --printf %U #{gitolite_config_path}` == "git" && # user - `stat --printf %G #{gitolite_config_path}` == "git" #group + if `stat --printf %U #{gitolite_config_path}` == gitolite_ssh_user && # user + `stat --printf %G #{gitolite_config_path}` == gitolite_ssh_user #group puts "yes".green else puts "no".red - puts "#{gitolite_config_path} is not owned by git".red + puts "#{gitolite_config_path} is not owned by #{gitolite_ssh_user}".red try_fixing_it( - "sudo chown -R git:git #{gitolite_config_path}" + "sudo chown -R #{gitolite_ssh_user}:#{gitolite_ssh_user} #{gitolite_config_path}" ) for_more_information( see_installation_guide_section "Gitolite" @@ -614,6 +617,7 @@ namespace :gitlab do hook_file = "post-receive" gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) + gitolite_ssh_user = Gitlab.config.ssh_user gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file) @@ -622,7 +626,7 @@ namespace :gitlab do else puts "no".red try_fixing_it( - "sudo -u git cp #{gitlab_hook_file} #{gitolite_hook_file}" + "sudo -u #{gitolite_ssh_user} cp #{gitlab_hook_file} #{gitolite_hook_file}" ) for_more_information( see_installation_guide_section "Setup GitLab Hooks" @@ -638,6 +642,7 @@ namespace :gitlab do gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) gitolite_hook_content = File.read(gitolite_hook_file) + gitolite_ssh_user = Gitlab.config.ssh_user unless File.exists?(gitolite_hook_file) puts "can't check because of previous errors".magenta @@ -652,7 +657,7 @@ namespace :gitlab do else puts "no".red try_fixing_it( - "sudo -u git cp #{gitlab_hook_file} #{gitolite_hook_file}" + "sudo -u #{gitolite_ssh_user} cp #{gitlab_hook_file} #{gitolite_hook_file}" ) for_more_information( see_installation_guide_section "Setup GitLab Hooks" @@ -708,7 +713,8 @@ namespace :gitlab do end def check_repo_base_user_and_group - print "Repo base owned by git:git? ... " + gitolite_ssh_user = Gitlab.config.ssh_user + print "Repo base owned by #{gitolite_ssh_user}:#{gitolite_ssh_user}? ... " repo_base_path = Gitlab.config.git_base_path unless File.exists?(repo_base_path) @@ -716,14 +722,14 @@ namespace :gitlab do return end - if `stat --printf %U #{repo_base_path}` == "git" && # user - `stat --printf %G #{repo_base_path}` == "git" #group + if `stat --printf %U #{repo_base_path}` == gitolite_ssh_user && # user + `stat --printf %G #{repo_base_path}` == gitolite_ssh_user #group puts "yes".green else puts "no".red - puts "#{repo_base_path} is not owned by git".red + puts "#{repo_base_path} is not owned by #{gitolite_ssh_user}".red try_fixing_it( - "sudo chown -R git:git #{repo_base_path}" + "sudo chown -R #{gitolite_ssh_user}:#{gitolite_ssh_user} #{repo_base_path}" ) for_more_information( see_installation_guide_section "Gitolite" @@ -773,6 +779,7 @@ namespace :gitlab do hook_file = "post-receive" gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) + gitolite_ssh_user = Gitlab.config.ssh_user unless File.exists?(gitolite_hook_file) puts "can't check because of previous errors".magenta @@ -792,7 +799,7 @@ namespace :gitlab do unless File.exists?(project_hook_file) puts "missing".red try_fixing_it( - "sudo -u git ln -sf #{gitolite_hook_file} #{project_hook_file}" + "sudo -u #{gitolite_ssh_user} ln -sf #{gitolite_hook_file} #{project_hook_file}" ) for_more_information( "lib/support/rewrite-hooks.sh" @@ -806,7 +813,7 @@ namespace :gitlab do else puts "not a link to Gitolite's hook".red try_fixing_it( - "sudo -u git ln -sf #{gitolite_hook_file} #{project_hook_file}" + "sudo -u #{gitolite_ssh_user} ln -sf #{gitolite_hook_file} #{project_hook_file}" ) for_more_information( "lib/support/rewrite-hooks.sh" @@ -860,7 +867,6 @@ namespace :gitlab do puts "yes".green else puts "no".red - puts "#{repo_base_path} is not owned by git".red try_fixing_it( "sudo service gitlab restart", "or", -- cgit v1.2.1 From f2db188dbe26b93e76eb3536f1a972a4a9e01f66 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 21:39:55 +0200 Subject: Processing with note events. reformated dashboard for more events to handle --- app/assets/stylesheets/sections/events.scss | 9 ++++++--- app/controllers/milestones_controller.rb | 5 ++--- app/models/event.rb | 15 +++++++++------ app/models/milestone.rb | 2 +- app/observers/activity_observer.rb | 25 +++++++++++++++++-------- app/roles/note_event.rb | 21 +++++++++++++++++++++ app/views/events/_event.html.haml | 14 ++++++-------- app/views/events/event/_note.html.haml | 15 +++++++++++---- 8 files changed, 73 insertions(+), 33 deletions(-) create mode 100644 app/roles/note_event.rb diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 28551d9a6ee..710426441fe 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -31,7 +31,6 @@ * */ .event-item { - min-height: 40px; border-bottom: 1px solid #eee; .event-title { color: #333; @@ -50,14 +49,18 @@ } } .avatar { - width: 32px; + position: relative; + top: -3px; } .event_icon { + position: relative; float: right; border: 1px solid #EEE; padding: 5px; @include border-radius(5px); background: #F9F9F9; + margin-left: 10px; + top: -6px; img { width: 20px; } @@ -71,7 +74,7 @@ } } - padding: 15px 5px; + padding: 16px 5px; &:last-child { border:none } .wll:hover { background:none } diff --git a/app/controllers/milestones_controller.rb b/app/controllers/milestones_controller.rb index fb3bdf4a3dd..a0c824e8abb 100644 --- a/app/controllers/milestones_controller.rb +++ b/app/controllers/milestones_controller.rb @@ -43,7 +43,7 @@ class MilestonesController < ProjectResourceController def create @milestone = @project.milestones.new(params[:milestone]) - @milestone.author_id = current_user.id + @milestone.author_id_of_changes = current_user.id if @milestone.save redirect_to project_milestone_path(@project, @milestone) @@ -53,8 +53,7 @@ class MilestonesController < ProjectResourceController end def update - @milestone.author_id = current_user.id - @milestone.update_attributes(params[:milestone]) + @milestone.update_attributes(params[:milestone].merge(author_id_of_changes: current_user.id)) respond_to do |format| format.js diff --git a/app/models/event.rb b/app/models/event.rb index ee1998e5d4f..90376e73753 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -15,6 +15,7 @@ # class Event < ActiveRecord::Base + include NoteEvent include PushEvent attr_accessible :project, :action, :data, :author_id, :project_id, @@ -58,12 +59,14 @@ class Event < ActiveRecord::Base end end - # Next events currently enabled for system - # - push - # - new issue - # - merge request - def allowed? - push? || issue? || merge_request? || membership_changed? || note? || milestone? + def proper? + if push? + true + elsif membership_changed? + true + else + (issue? || merge_request? || note? || milestone?) && target + end end def project_name diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 9e3c2bb5df6..6e3b0c15a5e 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -14,7 +14,7 @@ class Milestone < ActiveRecord::Base attr_accessible :title, :description, :due_date, :closed - attr_accessor :author_id + attr_accessor :author_id, :author_id_of_changes belongs_to :project has_many :issues diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index fa39bbfbd34..6fb10423eb7 100644 --- a/app/observers/activity_observer.rb +++ b/app/observers/activity_observer.rb @@ -2,17 +2,26 @@ class ActivityObserver < ActiveRecord::Observer observe :issue, :merge_request, :note, :milestone def after_create(record) - Event.create( - project: record.project, - target_id: record.id, - target_type: record.class.name, - action: Event.determine_action(record), - author_id: record.author_id - ) + event_author_id = record.author_id || record.author_id_of_changes + + # Skip status notes + if record.kind_of?(Note) && record.note.include?("_Status changed to ") + return true + end + + if event_author_id + Event.create( + project: record.project, + target_id: record.id, + target_type: record.class.name, + action: Event.determine_action(record), + author_id: event_author_id + ) + end end def after_save(record) - if record.changed.include?("closed") + if record.changed.include?("closed") && record.author_id_of_changes Event.create( project: record.project, target_id: record.id, diff --git a/app/roles/note_event.rb b/app/roles/note_event.rb new file mode 100644 index 00000000000..cc6d7338a6d --- /dev/null +++ b/app/roles/note_event.rb @@ -0,0 +1,21 @@ +module NoteEvent + def note_commit_id + target.noteable_id + end + + def note_short_commit_id + note_commit_id[0..8] + end + + def note_commit? + target.noteable_type == "Commit" + end + + def note_target + target.noteable + end + + def note_target_id + target.noteable_id + end +end diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 9625e1e20de..191aed0747e 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -1,17 +1,15 @@ -- if event.allowed? +- if event.proper? %div.event-item - = event_image(event) + %span.cgray.right + #{time_ago_in_words(event.created_at)} ago. + = image_tag gravatar_icon(event.author_email), class: "avatar s24" - if event.push? = render "events/event/push", event: event - - if event.note? + .clearfix + - elsif event.note? = render "events/event/note", event: event - else = render "events/event/common", event: event - .clearfix - %span.cgray.right - = time_ago_in_words(event.created_at) - ago. - .clearfix diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 5dddef1f1ac..88b8532f8d8 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -1,9 +1,13 @@ .event-title %span.author_name= link_to_author event %span.event_label commented on #{event.target.noteable_type_name} - - if event.target and event.target.noteable_id - = link_to [event.project, event.target.noteable] do - %strong= truncate event.target.noteable_id + - if event.target and event.note_target + - if event.note_commit? + = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id" + - else + = link_to [event.project, event.note_target] do + %strong= truncate event.note_target_id + - else %strong (deleted) at @@ -13,4 +17,7 @@ = event.project_name .event-body - %p.hint= truncate event.target.note, length: 70 + %span.hint +   + %i.icon-comment + = truncate event.target.note, length: 70 -- cgit v1.2.1 From f03dc8716d8edd144b341cbde967ccd9db84d6f7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 21:48:16 +0200 Subject: Fix author_id_of_changes mass assignment --- app/models/milestone.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 6e3b0c15a5e..00bcbbff91f 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -13,7 +13,7 @@ # class Milestone < ActiveRecord::Base - attr_accessible :title, :description, :due_date, :closed + attr_accessible :title, :description, :due_date, :closed, :author_id_of_changes attr_accessor :author_id, :author_id_of_changes belongs_to :project -- cgit v1.2.1 From 0ff468160e11270af7178d2494d0d6dabde20a6e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 21:54:49 +0200 Subject: Fixed event.allowed? with event.proper? --- app/views/dashboard/index.atom.builder | 2 +- app/views/groups/show.atom.builder | 2 +- spec/models/event_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/dashboard/index.atom.builder b/app/views/dashboard/index.atom.builder index ffa15258f07..2bb42a65bac 100644 --- a/app/views/dashboard/index.atom.builder +++ b/app/views/dashboard/index.atom.builder @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? @events.each do |event| - if event.allowed? + if event.proper? event = EventDecorator.decorate(event) xml.entry do event_link = event.feed_url diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder index fa3bfade28b..9aa52ea5593 100644 --- a/app/views/groups/show.atom.builder +++ b/app/views/groups/show.atom.builder @@ -7,7 +7,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? @events.each do |event| - if event.allowed? + if event.proper? event = EventDecorator.decorate(event) xml.entry do event_link = event.feed_url diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 49cb49db375..82b46b68b64 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -59,7 +59,7 @@ describe Event do end it { @event.push?.should be_true } - it { @event.allowed?.should be_true } + it { @event.proper?.should be_true } it { @event.new_branch?.should be_true } it { @event.tag?.should be_false } it { @event.branch_name.should == "master" } -- cgit v1.2.1 From b79e00881ec441c7266e8aca6083a3eb9586cd40 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Dec 2012 22:05:10 +0200 Subject: Uncommented test observing comment event --- app/models/milestone.rb | 6 +++++- app/observers/activity_observer.rb | 2 +- spec/observers/activity_observer_spec.rb | 24 +++++++++++++----------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 00bcbbff91f..4be0873658a 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -14,7 +14,7 @@ class Milestone < ActiveRecord::Base attr_accessible :title, :description, :due_date, :closed, :author_id_of_changes - attr_accessor :author_id, :author_id_of_changes + attr_accessor :author_id_of_changes belongs_to :project has_many :issues @@ -68,4 +68,8 @@ class Milestone < ActiveRecord::Base def open? !closed end + + def author_id + author_id_of_changes + end end diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index 6fb10423eb7..c188e5720ac 100644 --- a/app/observers/activity_observer.rb +++ b/app/observers/activity_observer.rb @@ -2,7 +2,7 @@ class ActivityObserver < ActiveRecord::Observer observe :issue, :merge_request, :note, :milestone def after_create(record) - event_author_id = record.author_id || record.author_id_of_changes + event_author_id = record.author_id # Skip status notes if record.kind_of?(Note) && record.note.include?("_Status changed to ") diff --git a/spec/observers/activity_observer_spec.rb b/spec/observers/activity_observer_spec.rb index 0eec41f44e9..6af5d070888 100644 --- a/spec/observers/activity_observer_spec.rb +++ b/spec/observers/activity_observer_spec.rb @@ -34,15 +34,17 @@ describe ActivityObserver do it { @event.target.should == @issue } end - #describe "Issue commented" do - #before do - #@issue = create(:issue, project: project) - #@note = create(:note, noteable: @issue, project: project) - #@event = Event.last - #end - - #it_should_be_valid_event - #it { @event.action.should == Event::Commented } - #it { @event.target.should == @note } - #end + describe "Issue commented" do + before do + Note.observers.enable :activity_observer do + @issue = create(:issue, project: project) + @note = create(:note, noteable: @issue, project: project, author: @issue.author) + @event = Event.last + end + end + + it_should_be_valid_event + it { @event.action.should == Event::Commented } + it { @event.target.should == @note } + end end -- cgit v1.2.1 From 645afc384a12a06b7760fce1f0fdc822e9c6b164 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 14 Dec 2012 21:12:05 +0100 Subject: Display namespace for projects in gitlab:check task. --- lib/tasks/gitlab/check.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index a695c62e696..f70a3e7bbcf 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -184,7 +184,7 @@ namespace :gitlab do puts "" Project.find_each(batch_size: 100) do |project| - print "#{project.name.yellow} ... " + print "#{project.name_with_namespace.yellow} ... " if project.satellite.exists? puts "yes".green @@ -752,7 +752,7 @@ namespace :gitlab do } Project.find_each(batch_size: 100) do |project| - print "#{project.name.yellow} ... " + print "#{project.name_with_namespace.yellow} ... " correct_options = options.map do |name, value| run("git --git-dir=\"#{project.path_to_repo}\" config --get #{name}").try(:chomp) == value @@ -793,7 +793,7 @@ namespace :gitlab do puts "" Project.find_each(batch_size: 100) do |project| - print "#{project.name.yellow} ... " + print "#{project.name_with_namespace.yellow} ... " project_hook_file = File.join(project.path_to_repo, "hooks", hook_file) unless File.exists?(project_hook_file) -- cgit v1.2.1 From 40c11a366309818a7d0e5133c78b65faa1967dca Mon Sep 17 00:00:00 2001 From: Matthieu Vachon Date: Fri, 14 Dec 2012 16:06:02 -0500 Subject: Removed delete section in issues API documentation --- doc/api/issues.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/doc/api/issues.md b/doc/api/issues.md index aaad3305489..434ec95b03f 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -168,17 +168,3 @@ Parameters: Will return updated issue with status `200 OK` on success, or `404 Not found` on fail. -## Delete issue - -Delete existing project issue. - -``` -DELETE /projects/:id/issues/:issue_id -``` - -Parameters: - -+ `id` (required) - The ID or code name of a project -+ `issue_id` (required) - The ID of a project's issue - -Status code `200` will be returned on success. -- cgit v1.2.1 From 0f7d3f591cea40d922250260326892ed49275968 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 15 Dec 2012 12:32:09 +0200 Subject: Moving repositories spec to roles. Added missing spec for project --- app/views/merge_requests/show/_mr_box.html.haml | 6 +- app/views/merge_requests/show/_mr_title.html.haml | 5 -- spec/models/project_spec.rb | 99 ++--------------------- spec/roles/repository_spec.rb | 89 +++++++++++++++++++- 4 files changed, 101 insertions(+), 98 deletions(-) diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml index f64182c6e68..cd33732d191 100644 --- a/app/views/merge_requests/show/_mr_box.html.haml +++ b/app/views/merge_requests/show/_mr_box.html.haml @@ -1,7 +1,11 @@ .main_box .top_box_content %h4.box-title - - if @merge_request.closed + - if @merge_request.merged + .error.status_info + %i.icon-ok + Merged + - elsif @merge_request.closed .error.status_info Closed = gfm escape_once(@merge_request.title) diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml index 745dc93fbfb..c2ffe8e3770 100644 --- a/app/views/merge_requests/show/_mr_title.html.haml +++ b/app/views/merge_requests/show/_mr_title.html.haml @@ -6,11 +6,6 @@ %span.label_branch= @merge_request.target_branch %span.right - - if @merge_request.merged? - %span.btn.small.disabled.grouped.success - %strong - %i.icon-ok - = "MERGED" - if can?(current_user, :modify_merge_request, @merge_request) - if @merge_request.open? .left.btn-group diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index db0d30727b4..b9eafc7fa1e 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -129,6 +129,13 @@ describe Project do it { should respond_to(:execute_hooks) } it { should respond_to(:post_receive_data) } it { should respond_to(:trigger_post_receive) } + + # Namespaced Project Role + it { should respond_to(:transfer) } + it { should respond_to(:name_with_namespace) } + it { should respond_to(:namespace_owner) } + it { should respond_to(:chief) } + it { should respond_to(:path_with_namespace) } end describe 'modules' do @@ -136,6 +143,7 @@ describe Project do it { should include_module(PushObserver) } it { should include_module(Authority) } it { should include_module(Team) } + it { should include_module(NamespacedProject) } end it "should return valid url to repo" do @@ -153,18 +161,6 @@ describe Project do project.web_url.should == "#{Gitlab.config.url}/somewhere" end - describe :valid_repo? do - it "should be valid repo" do - project = create(:project) - project.valid_repo?.should be_true - end - - it "should be invalid repo" do - project = Project.new(name: "ok_name", path: "/INVALID_PATH/", path: "NEOK") - project.valid_repo?.should be_false - end - end - describe "last_activity methods" do let(:project) { create(:project) } let(:last_event) { double(created_at: Time.now) } @@ -188,85 +184,6 @@ describe Project do end end - describe "fresh commits" do - let(:project) { create(:project) } - - it { project.fresh_commits(3).count.should == 3 } - it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" } - it { project.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" } - end - - describe "commits_between" do - let(:project) { create(:project) } - - subject do - commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff", - "8470d70da67355c9c009e4401746b1d5410af2e3") - commits.map { |c| c.id } - end - - it { should have(3).elements } - it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") } - it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") } - end - - describe "Git methods" do - let(:project) { create(:project) } - - describe :repo do - it "should return valid repo" do - project.repo.should be_kind_of(Grit::Repo) - end - - it "should return nil" do - lambda { Project.new(path: "invalid").repo }.should raise_error(Grit::NoSuchPathError) - end - - it "should return nil" do - lambda { Project.new.repo }.should raise_error(TypeError) - end - end - - describe :commit do - it "should return first head commit if without params" do - project.commit.id.should == project.repo.commits.first.id - end - - it "should return valid commit" do - project.commit(ValidCommit::ID).should be_valid_commit - end - - it "should return nil" do - project.commit("+123_4532530XYZ").should be_nil - end - end - - describe :tree do - before do - @commit = project.commit(ValidCommit::ID) - end - - it "should raise error w/o arguments" do - lambda { project.tree }.should raise_error - end - - it "should return root tree for commit" do - tree = project.tree(@commit) - tree.contents.size.should == ValidCommit::FILES_COUNT - tree.contents.map(&:name).should == ValidCommit::FILES - end - - it "should return root tree for commit with correct path" do - tree = project.tree(@commit, ValidCommit::C_FILE_PATH) - tree.contents.map(&:name).should == ValidCommit::C_FILES - end - - it "should return root tree for commit with incorrect path" do - project.tree(@commit, "invalid_path").should be_nil - end - end - end - describe :update_merge_requests do let(:project) { create(:project) } diff --git a/spec/roles/repository_spec.rb b/spec/roles/repository_spec.rb index 3507585aa8d..e1d01cbfeaf 100644 --- a/spec/roles/repository_spec.rb +++ b/spec/roles/repository_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Project, "Repository" do - let(:project) { build(:project) } + let(:project) { create(:project) } describe "#empty_repo?" do it "should return true if the repo doesn't exist" do @@ -69,4 +69,91 @@ describe Project, "Repository" do project.root_ref?('stable').should be_false end end + + describe :repo do + it "should return valid repo" do + project.repo.should be_kind_of(Grit::Repo) + end + + it "should return nil" do + lambda { Project.new(path: "invalid").repo }.should raise_error(Grit::NoSuchPathError) + end + + it "should return nil" do + lambda { Project.new.repo }.should raise_error(TypeError) + end + end + + describe :commit do + it "should return first head commit if without params" do + project.commit.id.should == project.repo.commits.first.id + end + + it "should return valid commit" do + project.commit(ValidCommit::ID).should be_valid_commit + end + + it "should return nil" do + project.commit("+123_4532530XYZ").should be_nil + end + end + + describe :tree do + before do + @commit = project.commit(ValidCommit::ID) + end + + it "should raise error w/o arguments" do + lambda { project.tree }.should raise_error + end + + it "should return root tree for commit" do + tree = project.tree(@commit) + tree.contents.size.should == ValidCommit::FILES_COUNT + tree.contents.map(&:name).should == ValidCommit::FILES + end + + it "should return root tree for commit with correct path" do + tree = project.tree(@commit, ValidCommit::C_FILE_PATH) + tree.contents.map(&:name).should == ValidCommit::C_FILES + end + + it "should return root tree for commit with incorrect path" do + project.tree(@commit, "invalid_path").should be_nil + end + end + + describe "fresh commits" do + let(:project) { create(:project) } + + it { project.fresh_commits(3).count.should == 3 } + it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" } + it { project.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" } + end + + describe "commits_between" do + let(:project) { create(:project) } + + subject do + commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff", + "8470d70da67355c9c009e4401746b1d5410af2e3") + commits.map { |c| c.id } + end + + it { should have(3).elements } + it { should include("f0f14c8eaba69ebddd766498a9d0b0e79becd633") } + it { should_not include("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") } + end + + describe :valid_repo? do + it "should be valid repo" do + project = create(:project) + project.valid_repo?.should be_true + end + + it "should be invalid repo" do + project = Project.new(name: "ok_name", path: "/INVALID_PATH/", path: "NEOK") + project.valid_repo?.should be_false + end + end end -- cgit v1.2.1 From f7e934696c99f2337cc4e254cb49f652a704310f Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Sat, 15 Dec 2012 14:33:45 +0400 Subject: added more denied project names --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 85b04c5d359..5871bc67f69 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -179,7 +179,7 @@ class Project < ActiveRecord::Base end def repo_name - denied_paths = %w(gitolite-admin groups projects dashboard help ) + denied_paths = %w(gitolite-admin admin dashboard groups help profile projects search) if denied_paths.include?(path) errors.add(:path, "like #{path} is not allowed") -- cgit v1.2.1 From d3b3810928a62f4fc5d2c68cdd7375006cb0a8b5 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 7 Dec 2012 13:11:51 +0100 Subject: fix dark code preview background when displaying long lines --- app/assets/stylesheets/highlight/dark.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index 4196ea7ad29..178bd583aec 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -2,6 +2,7 @@ pre { background-color: #333; color: #eee; + float: left; } .hll { display: block; background-color: darken($hover, 65%) } -- cgit v1.2.1 From 592412992daf1830fb1df5cc06aac02814c6f911 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 16 Dec 2012 18:27:16 +0200 Subject: Account role spec --- spec/models/user_spec.rb | 16 ++++----------- spec/roles/account_role_spec.rb | 44 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 spec/roles/account_role_spec.rb diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 79ffc05bca9..d09484f8fe0 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -66,6 +66,10 @@ describe User do it { should ensure_length_of(:bio).is_within(0..255) } end + describe 'modules' do + it { should include_module(Account) } + end + describe "Respond to" do it { should respond_to(:is_admin?) } it { should respond_to(:identifier) } @@ -115,16 +119,4 @@ describe User do user.authentication_token.should_not be_blank end end - - describe 'projects and namespaces' do - before do - ActiveRecord::Base.observers.enable(:user_observer) - @user = create :user - @project = create :project, namespace: @user.namespace - end - - it { @user.authorized_projects.should include(@project) } - it { @user.my_own_projects.should include(@project) } - it { @user.several_namespaces?.should be_false } - end end diff --git a/spec/roles/account_role_spec.rb b/spec/roles/account_role_spec.rb new file mode 100644 index 00000000000..4b214551453 --- /dev/null +++ b/spec/roles/account_role_spec.rb @@ -0,0 +1,44 @@ +require 'spec_helper' + +describe User, "Account" do + describe 'normal user' do + let(:user) { create(:user, name: 'John Smith') } + + it { user.is_admin?.should be_false } + it { user.require_ssh_key?.should be_true } + it { user.can_create_group?.should be_false } + it { user.can_create_project?.should be_true } + it { user.first_name.should == 'John' } + end + + describe 'blocking user' do + let(:user) { create(:user, name: 'John Smith') } + + it "should block user" do + user.block + user.blocked.should be_true + end + end + + describe 'projects' do + before do + ActiveRecord::Base.observers.enable(:user_observer) + @user = create :user + @project = create :project, namespace: @user.namespace + end + + it { @user.authorized_projects.should include(@project) } + it { @user.my_own_projects.should include(@project) } + end + + describe 'namespaced' do + before do + ActiveRecord::Base.observers.enable(:user_observer) + @user = create :user + @project = create :project, namespace: @user.namespace + end + + it { @user.several_namespaces?.should be_false } + it { @user.namespaces.should == [@user.namespace] } + end +end -- cgit v1.2.1 From 5058c4fdcf51e3040121ecc822a6f856e7f4537d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 16 Dec 2012 19:52:39 +0200 Subject: Fix wall notes event trying to render target --- app/roles/note_event.rb | 12 ++++++++++++ app/views/events/event/_note.html.haml | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/roles/note_event.rb b/app/roles/note_event.rb index cc6d7338a6d..884ab432ec8 100644 --- a/app/roles/note_event.rb +++ b/app/roles/note_event.rb @@ -18,4 +18,16 @@ module NoteEvent def note_target_id target.noteable_id end + + def wall_note? + target.noteable_type.blank? + end + + def note_target_type + if target.noteable_type.present? + target.noteable_type.titleize + else + "Wall" + end.downcase + end end diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 88b8532f8d8..8c12969345f 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -1,13 +1,15 @@ .event-title %span.author_name= link_to_author event - %span.event_label commented on #{event.target.noteable_type_name} - - if event.target and event.note_target + %span.event_label commented on #{event.note_target_type} + - if event.note_target - if event.note_commit? = link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id" - else = link_to [event.project, event.note_target] do %strong= truncate event.note_target_id + - elsif event.wall_note? + -# nothing here - else %strong (deleted) at -- cgit v1.2.1 From e7abd35f731e63fdb8bb4b210297a20cb9b70479 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 17 Dec 2012 15:11:33 +0200 Subject: gitolite fork up to v320 --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index d1d3b6912c3..159713dcba9 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -117,7 +117,7 @@ Create a user for GitLab: Clone GitLab's fork of the Gitolite source code: cd /home/git - sudo -u git -H git clone -b gl-v304 https://github.com/gitlabhq/gitolite.git /home/git/gitolite + sudo -u git -H git clone -b gl-v320 https://github.com/gitlabhq/gitolite.git /home/git/gitolite Setup Gitolite with GitLab as its admin: -- cgit v1.2.1 From f4a6f1fd5a9fb9f35bb43956275c5f1da96ce019 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 17 Dec 2012 15:57:10 +0200 Subject: Fix admin paging gap issue --- app/views/kaminari/admin/_gap.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/kaminari/admin/_gap.html.haml b/app/views/kaminari/admin/_gap.html.haml index f82f185ac35..3ffd12f8587 100644 --- a/app/views/kaminari/admin/_gap.html.haml +++ b/app/views/kaminari/admin/_gap.html.haml @@ -4,5 +4,6 @@ -# num_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote -%span.page.gap - = raw(t 'views.pagination.truncate') +%li{class: "page"} + %span.page.gap + = raw(t 'views.pagination.truncate') -- cgit v1.2.1 From 9ada67881970b05d4be49cbe329b4bf50ffe4f77 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Dec 2012 20:02:00 +0200 Subject: Split commit_id and noteable_id for Note --- app/models/merge_request.rb | 2 +- app/models/note.rb | 10 ++++++--- app/models/project.rb | 6 ++--- app/roles/note_event.rb | 8 +++++-- app/views/notes/_common_form.html.haml | 1 + app/views/notes/_per_line_form.html.haml | 1 + config/database.yml.postgresql | 1 + ...1218164840_move_noteable_commit_to_own_field.rb | 15 +++++++++++++ db/schema.rb | 26 +++++++++++----------- spec/models/merge_request_spec.rb | 2 +- spec/models/note_spec.rb | 10 ++++----- 11 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 db/migrate/20121218164840_move_noteable_commit_to_own_field.rb diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 2409fb80acb..052e0850d96 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -204,7 +204,7 @@ class MergeRequest < ActiveRecord::Base def mr_and_commit_notes commit_ids = commits.map(&:id) - Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND noteable_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids) + Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids) end # Returns the raw diff for this merge request diff --git a/app/models/note.rb b/app/models/note.rb index 219ed9b9332..28b3879239f 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -20,7 +20,7 @@ require 'file_size_validator' class Note < ActiveRecord::Base attr_accessible :note, :noteable, :noteable_id, :noteable_type, :project_id, - :attachment, :line_code + :attachment, :line_code, :commit_id attr_accessor :notify attr_accessor :notify_author @@ -35,10 +35,14 @@ class Note < ActiveRecord::Base validates :note, :project, presence: true validates :attachment, file_size: { maximum: 10.megabytes.to_i } + validates :noteable_id, presence: true, if: ->(n) { n.noteable_type.present? && n.noteable_type != 'Commit' } + validates :commit_id, presence: true, if: ->(n) { n.noteable_type == 'Commit' } + mount_uploader :attachment, AttachmentUploader # Scopes - scope :common, ->{ where(noteable_id: nil) } + scope :for_commits, ->{ where(noteable_type: "Commit") } + scope :common, ->{ where(noteable_id: nil, commit_id: nil) } scope :today, ->{ where("created_at >= :date", date: Date.today) } scope :last_week, ->{ where("created_at >= :date", date: (Date.today - 7.days)) } scope :since, ->(day) { where("created_at >= :date", date: (day)) } @@ -66,7 +70,7 @@ class Note < ActiveRecord::Base # override to return commits, which are not active record def noteable if for_commit? - project.commit(noteable_id) + project.commit(commit_id) else super end diff --git a/app/models/project.rb b/app/models/project.rb index 5871bc67f69..eb6e7cb1b08 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -203,15 +203,15 @@ class Project < ActiveRecord::Base end def build_commit_note(commit) - notes.new(noteable_id: commit.id, noteable_type: "Commit") + notes.new(commit_id: commit.id, noteable_type: "Commit") end def commit_notes(commit) - notes.where(noteable_id: commit.id, noteable_type: "Commit", line_code: nil) + notes.where(commit_id: commit.id, noteable_type: "Commit", line_code: nil) end def commit_line_notes(commit) - notes.where(noteable_id: commit.id, noteable_type: "Commit").where("line_code IS NOT NULL") + notes.where(commit_id: commit.id, noteable_type: "Commit").where("line_code IS NOT NULL") end def public? diff --git a/app/roles/note_event.rb b/app/roles/note_event.rb index 884ab432ec8..db4ced0c095 100644 --- a/app/roles/note_event.rb +++ b/app/roles/note_event.rb @@ -1,6 +1,6 @@ module NoteEvent def note_commit_id - target.noteable_id + target.commit_id end def note_short_commit_id @@ -16,7 +16,11 @@ module NoteEvent end def note_target_id - target.noteable_id + if note_commit? + target.commit_id + else + target.noteable_id.to_s + end end def wall_note? diff --git a/app/views/notes/_common_form.html.haml b/app/views/notes/_common_form.html.haml index 0725082d504..d76be75bc27 100644 --- a/app/views/notes/_common_form.html.haml +++ b/app/views/notes/_common_form.html.haml @@ -7,6 +7,7 @@ %div= msg = f.hidden_field :noteable_id + = f.hidden_field :commit_id = f.hidden_field :noteable_type = f.text_area :note, size: 255, class: 'note-text js-gfm-input' #preview-note.preview_note.hide diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml index c8d79850162..ff80ad4e0d5 100644 --- a/app/views/notes/_per_line_form.html.haml +++ b/app/views/notes/_per_line_form.html.haml @@ -11,6 +11,7 @@ %div= msg = f.hidden_field :noteable_id + = f.hidden_field :commit_id = f.hidden_field :noteable_type = f.hidden_field :line_code = f.text_area :note, size: 255, class: 'line-note-text js-gfm-input' diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql index 17b38f3d385..0e873d2b8fb 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -9,6 +9,7 @@ production: username: postgres password: # host: localhost + # port: 5432 # socket: /tmp/postgresql.sock # diff --git a/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb new file mode 100644 index 00000000000..556ac9e7898 --- /dev/null +++ b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb @@ -0,0 +1,15 @@ +class MoveNoteableCommitToOwnField < ActiveRecord::Migration + def up + add_column :notes, :commit_id, :string, null: true + add_column :notes, :new_noteable_id, :integer, null: true + Note.where(noteable_type: 'Commit').update_all('commit_id = noteable_id') + Note.where("noteable_type != 'Commit'").update_all('new_noteable_id = CAST (noteable_id AS INTEGER)') + remove_column :notes, :noteable_id + rename_column :notes, :new_noteable_id, :noteable_id + end + + def down + remove_column :notes, :commit_id + remove_column :notes, :new_noteable_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 923d2c5543e..e4a1ec4da97 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20121205201726) do +ActiveRecord::Schema.define(:version => 20121218164840) do create_table "events", :force => true do |t| t.string "target_type" @@ -69,19 +69,19 @@ ActiveRecord::Schema.define(:version => 20121205201726) do add_index "keys", ["user_id"], :name => "index_keys_on_user_id" create_table "merge_requests", :force => true do |t| - t.string "target_branch", :null => false - t.string "source_branch", :null => false - t.integer "project_id", :null => false + t.string "target_branch", :null => false + t.string "source_branch", :null => false + t.integer "project_id", :null => false t.integer "author_id" t.integer "assignee_id" t.string "title" - t.boolean "closed", :default => false, :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "st_commits", :limit => 2147483647 - t.text "st_diffs", :limit => 2147483647 - t.boolean "merged", :default => false, :null => false - t.integer "state", :default => 1, :null => false + t.boolean "closed", :default => false, :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "st_commits" + t.text "st_diffs" + t.boolean "merged", :default => false, :null => false + t.integer "state", :default => 1, :null => false t.integer "milestone_id" end @@ -124,7 +124,6 @@ ActiveRecord::Schema.define(:version => 20121205201726) do create_table "notes", :force => true do |t| t.text "note" - t.string "noteable_id" t.string "noteable_type" t.integer "author_id" t.datetime "created_at", :null => false @@ -132,10 +131,11 @@ ActiveRecord::Schema.define(:version => 20121205201726) do t.integer "project_id" t.string "attachment" t.string "line_code" + t.string "commit_id" + t.integer "noteable_id" end add_index "notes", ["created_at"], :name => "index_notes_on_created_at" - add_index "notes", ["noteable_id"], :name => "index_notes_on_noteable_id" add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type" add_index "notes", ["project_id"], :name => "index_notes_on_project_id" diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index d70647f668d..a0849401254 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -42,7 +42,7 @@ describe MergeRequest do before do merge_request.stub(:commits) { [merge_request.project.commit] } - create(:note, noteable: merge_request.commits.first) + create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit') create(:note, noteable: merge_request) end diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 4f9352b9a14..61aaf6455eb 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -81,18 +81,18 @@ describe Note do describe "Commit notes" do before do @note = create(:note, - noteable_id: commit.id, + commit_id: commit.id, noteable_type: "Commit") end it "should be accessible through #noteable" do - @note.noteable_id.should == commit.id + @note.commit_id.should == commit.id @note.noteable.should be_a(Commit) @note.noteable.should == commit end it "should save a valid note" do - @note.noteable_id.should == commit.id + @note.commit_id.should == commit.id @note.noteable == commit end @@ -104,13 +104,13 @@ describe Note do describe "Pre-line commit notes" do before do @note = create(:note, - noteable_id: commit.id, + commit_id: commit.id, noteable_type: "Commit", line_code: "0_16_1") end it "should save a valid note" do - @note.noteable_id.should == commit.id + @note.commit_id.should == commit.id @note.noteable.id.should == commit.id end -- cgit v1.2.1 From 552c6d4598f6396456c569cfece98ae469bfa84c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Dec 2012 20:43:44 +0200 Subject: Make tests green for postgres --- .travis.yml | 3 +-- Gemfile | 2 +- Gemfile.lock | 10 ++++++++-- features/support/env.rb | 2 -- spec/requests/issues_spec.rb | 10 +++++----- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 868a6c6c238..ad00ded07cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,7 @@ services: before_script: - "cp config/database.yml.$DB config/database.yml" - "cp config/gitlab.yml.example config/gitlab.yml" - - "bundle exec rake db:create RAILS_ENV=test" - - "bundle exec rake db:migrate RAILS_ENV=test" + - "bundle exec rake db:setup RAILS_ENV=test" - "bundle exec rake db:seed_fu RAILS_ENV=test" - "sh -e /etc/init.d/xvfb start" script: "bundle exec rake travis --trace" diff --git a/Gemfile b/Gemfile index fcda1353907..49fbcad04fc 100644 --- a/Gemfile +++ b/Gemfile @@ -124,7 +124,7 @@ group :development, :test do gem "capybara" gem "pry" gem "awesome_print" - gem "database_cleaner" + gem "database_cleaner", ref: "f89c34300e114be99532f14c115b2799a3380ac6", git: "https://github.com/bmabey/database_cleaner.git" gem "launchy" gem 'factory_girl_rails' diff --git a/Gemfile.lock b/Gemfile.lock index 7afacfce9cd..d8be14ba80a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/bmabey/database_cleaner.git + revision: f89c34300e114be99532f14c115b2799a3380ac6 + ref: f89c34300e114be99532f14c115b2799a3380ac6 + specs: + database_cleaner (0.9.1) + GIT remote: https://github.com/ctran/annotate_models.git revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e @@ -140,7 +147,6 @@ GEM colorize (0.5.8) crack (0.3.1) daemons (1.1.9) - database_cleaner (0.9.1) devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -458,7 +464,7 @@ DEPENDENCIES chosen-rails (= 0.9.8) coffee-rails (~> 3.2.2) colored - database_cleaner + database_cleaner! devise (~> 2.1.0) draper (~> 0.18.0) email_spec diff --git a/features/support/env.rb b/features/support/env.rb index a30b357718e..38fcc5ad092 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -36,8 +36,6 @@ Spinach.hooks.before_scenario do Gitlab.config.stub(git_base_path: Rails.root.join('tmp', 'test-git-base-path')) FileUtils.rm_rf Gitlab.config.git_base_path FileUtils.mkdir_p Gitlab.config.git_base_path - - DatabaseCleaner.start end Spinach.hooks.after_scenario do diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb index a4b026862ef..e5ecb9590f8 100644 --- a/spec/requests/issues_spec.rb +++ b/spec/requests/issues_spec.rb @@ -91,13 +91,13 @@ describe "Issues" do title: title) end - issue = Issue.first # with title 'foobar' - issue.milestone = create(:milestone, project: project) - issue.assignee = nil - issue.save + @issue = Issue.first # with title 'foobar' + @issue.milestone = create(:milestone, project: project) + @issue.assignee = nil + @issue.save end - let(:issue) { Issue.first } + let(:issue) { @issue } it "should allow filtering by issues with no specified milestone" do visit project_issues_path(project, milestone_id: '0') -- cgit v1.2.1 From 96af55bb852660486d25c72c937426f2d2ae971a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Dec 2012 21:06:29 +0200 Subject: if for migration --- db/migrate/20121218164840_move_noteable_commit_to_own_field.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb index 556ac9e7898..59faabba093 100644 --- a/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb +++ b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb @@ -3,7 +3,13 @@ class MoveNoteableCommitToOwnField < ActiveRecord::Migration add_column :notes, :commit_id, :string, null: true add_column :notes, :new_noteable_id, :integer, null: true Note.where(noteable_type: 'Commit').update_all('commit_id = noteable_id') - Note.where("noteable_type != 'Commit'").update_all('new_noteable_id = CAST (noteable_id AS INTEGER)') + + if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' + Note.where("noteable_type != 'Commit'").update_all('new_noteable_id = CAST (noteable_id AS INTEGER)') + else + Note.where("noteable_type != 'Commit'").update_all('new_noteable_id = noteable_id') + end + remove_column :notes, :noteable_id rename_column :notes, :new_noteable_id, :noteable_id end -- cgit v1.2.1 From 69c8231b49a8179697070d528d36811dc2f335e6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 12:08:27 +0200 Subject: index for commit_id. Schema rebuiled. Non rollback migration exception added --- ...1218164840_move_noteable_commit_to_own_field.rb | 3 +-- db/migrate/20121219095402_indices_for_notes.rb | 6 ++++++ db/schema.rb | 24 ++++++++++++---------- 3 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20121219095402_indices_for_notes.rb diff --git a/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb index 59faabba093..6f2da4136a3 100644 --- a/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb +++ b/db/migrate/20121218164840_move_noteable_commit_to_own_field.rb @@ -15,7 +15,6 @@ class MoveNoteableCommitToOwnField < ActiveRecord::Migration end def down - remove_column :notes, :commit_id - remove_column :notes, :new_noteable_id + raise ActiveRecord::IrreversibleMigration end end diff --git a/db/migrate/20121219095402_indices_for_notes.rb b/db/migrate/20121219095402_indices_for_notes.rb new file mode 100644 index 00000000000..4c5d041ce81 --- /dev/null +++ b/db/migrate/20121219095402_indices_for_notes.rb @@ -0,0 +1,6 @@ +class IndicesForNotes < ActiveRecord::Migration + def change + add_index :notes, :commit_id + add_index :notes, [:project_id, :noteable_type] + end +end diff --git a/db/schema.rb b/db/schema.rb index e4a1ec4da97..7de5593285a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20121218164840) do +ActiveRecord::Schema.define(:version => 20121219095402) do create_table "events", :force => true do |t| t.string "target_type" @@ -69,19 +69,19 @@ ActiveRecord::Schema.define(:version => 20121218164840) do add_index "keys", ["user_id"], :name => "index_keys_on_user_id" create_table "merge_requests", :force => true do |t| - t.string "target_branch", :null => false - t.string "source_branch", :null => false - t.integer "project_id", :null => false + t.string "target_branch", :null => false + t.string "source_branch", :null => false + t.integer "project_id", :null => false t.integer "author_id" t.integer "assignee_id" t.string "title" - t.boolean "closed", :default => false, :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.text "st_commits" - t.text "st_diffs" - t.boolean "merged", :default => false, :null => false - t.integer "state", :default => 1, :null => false + t.boolean "closed", :default => false, :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.text "st_commits", :limit => 2147483647 + t.text "st_diffs", :limit => 2147483647 + t.boolean "merged", :default => false, :null => false + t.integer "state", :default => 1, :null => false t.integer "milestone_id" end @@ -135,8 +135,10 @@ ActiveRecord::Schema.define(:version => 20121218164840) do t.integer "noteable_id" end + add_index "notes", ["commit_id"], :name => "index_notes_on_commit_id" add_index "notes", ["created_at"], :name => "index_notes_on_created_at" add_index "notes", ["noteable_type"], :name => "index_notes_on_noteable_type" + add_index "notes", ["project_id", "noteable_type"], :name => "index_notes_on_project_id_and_noteable_type" add_index "notes", ["project_id"], :name => "index_notes_on_project_id" create_table "projects", :force => true do |t| -- cgit v1.2.1 From 52fbcd45a4df8e93b04791fe25ff39c58f524bfa Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 18:34:24 +0200 Subject: Better organization of styles --- app/assets/stylesheets/gitlab_bootstrap.scss | 26 ++++++ app/assets/stylesheets/main.scss | 128 +++------------------------ app/assets/stylesheets/themes/ui_basic.scss | 12 --- 3 files changed, 38 insertions(+), 128 deletions(-) create mode 100644 app/assets/stylesheets/gitlab_bootstrap.scss diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss new file mode 100644 index 00000000000..d2efe1fa06a --- /dev/null +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -0,0 +1,26 @@ +/** Override bootstrap variables **/ +$baseFontSize: 13px !default; +$baseLineHeight: 18px !default; + +// BOOTSTRAP +@import "bootstrap"; +@import "bootstrap/responsive-utilities"; +@import "bootstrap/responsive-1200px-min"; + +@import "font-awesome"; +@import "variables.scss"; +@import "fonts.scss"; +@import "mixins.scss"; + +/** + * GitLab bootstrap. + * Overrides some styles of twitter bootstrap. + * Also give some common classes for GitLab app + */ +@import "gitlab_bootstrap/common.scss"; +@import "gitlab_bootstrap/typography.scss"; +@import "gitlab_bootstrap/buttons.scss"; +@import "gitlab_bootstrap/blocks.scss"; +@import "gitlab_bootstrap/files.scss"; +@import "gitlab_bootstrap/tables.scss"; +@import "gitlab_bootstrap/lists.scss"; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index ccae351eb8f..e74bc9d15cb 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -1,91 +1,13 @@ -/** Override bootstrap variables **/ -$baseFontSize: 13px !default; -$baseLineHeight: 18px !default; - -// BOOTSTRAP -@import "bootstrap"; -@import "bootstrap/responsive-utilities"; -@import "bootstrap/responsive-1200px-min"; - -// FONT AWESOME -@import "font-awesome"; - /** - * Variables - * Contains colors + * GitLab bootstrap: */ -@import "variables.scss"; +@import "gitlab_bootstrap.scss"; -/** - * Custom fonts - * Contains @font-face font Korolev and default $monotype - */ -@import "fonts.scss"; - -/** - * General mixins. - * Contains rounded borders, gradients and shades - */ -@import "mixins.scss"; +@import "common.scss"; +@import "ref_select.scss"; -/** - * Header of application. - * Contain application logo, search panel, profile icon - */ @import "sections/header.scss"; - -/** - * Navigation menu of application. - * Panel with links to pages depends on project, profile or admin area - */ @import "sections/nav.scss"; - -/** - * This file represent some UI that can be changed - * during web app restyle or theme select. - * - * Next items should be placed there - * - link, button colors - * - header restyles - * - main menu restyles - * - */ -@import "themes/ui_basic.scss"; - -/** - * UI themes: - */ -@import "themes/ui_mars.scss"; -@import "themes/ui_modern.scss"; -@import "themes/ui_gray.scss"; -@import "themes/ui_color.scss"; - -/** - * GitLab bootstrap. - * Overrides some styles of twitter bootstrap. - * Also give some common classes for GitLab app - */ -@import "gitlab_bootstrap/common.scss"; -@import "gitlab_bootstrap/typography.scss"; -@import "gitlab_bootstrap/buttons.scss"; -@import "gitlab_bootstrap/blocks.scss"; -@import "gitlab_bootstrap/files.scss"; -@import "gitlab_bootstrap/tables.scss"; -@import "gitlab_bootstrap/lists.scss"; - - -/** - * Most of application styles placed here. - * This file represent common UI that should not be changed between themes - * or project restyling like form width or user avatar class or commit title - * - * TODO: clean it - */ -@import "common.scss"; - -/** - * Styles related to specific part of app - */ @import "sections/commits.scss"; @import "sections/issues.scss"; @import "sections/projects.scss"; @@ -95,47 +17,21 @@ $baseLineHeight: 18px !default; @import "sections/graph.scss"; @import "sections/events.scss"; @import "sections/themes.scss"; - -/** - * This scss file redefine chozen selectbox styles for - * project Branch/Tag select element - */ -@import "ref_select.scss"; - -/** - * Code (files list) styles. Browsing project files there - */ @import "sections/tree.scss"; - -/** - * This file represent notes(comments) styles - */ @import "sections/notes.scss"; - -/** - * This file represent profile styles - */ @import "sections/profile.scss"; - -/** - * Devise styles - */ @import "sections/login.scss"; +@import "sections/editor.scss"; -/** - * CODE HIGHTLIGHT BASE - * - */ @import "highlight/white.scss"; - -/** - * CODE HIGHTLIGHT DARK schema - * - */ @import "highlight/dark.scss"; /** - * File Editor styles - * + * UI themes: */ -@import "sections/editor.scss"; +@import "themes/ui_basic.scss"; +@import "themes/ui_mars.scss"; +@import "themes/ui_modern.scss"; +@import "themes/ui_gray.scss"; +@import "themes/ui_color.scss"; + diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss index fee179899ce..b377727779a 100644 --- a/app/assets/stylesheets/themes/ui_basic.scss +++ b/app/assets/stylesheets/themes/ui_basic.scss @@ -4,18 +4,6 @@ * */ .ui_basic { - /* - * Common styles - * - */ - a { - color: $link_color; - &:hover { - text-decoration: none; - color: $primary_color; - } - } - .app_logo { .separator { margin-left: 0; -- cgit v1.2.1 From 965102b3f654544adada3283dcd0fab92028f253 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 19:02:12 +0200 Subject: Move mixins and variables under gitlab bootstrap --- app/assets/stylesheets/fonts.scss | 7 --- app/assets/stylesheets/gitlab_bootstrap.scss | 6 +- app/assets/stylesheets/gitlab_bootstrap/fonts.scss | 7 +++ .../stylesheets/gitlab_bootstrap/mixins.scss | 69 ++++++++++++++++++++++ .../stylesheets/gitlab_bootstrap/variables.scss | 5 ++ app/assets/stylesheets/mixins.scss | 69 ---------------------- app/assets/stylesheets/variables.scss | 5 -- 7 files changed, 84 insertions(+), 84 deletions(-) delete mode 100644 app/assets/stylesheets/fonts.scss create mode 100644 app/assets/stylesheets/gitlab_bootstrap/fonts.scss create mode 100644 app/assets/stylesheets/gitlab_bootstrap/mixins.scss create mode 100644 app/assets/stylesheets/gitlab_bootstrap/variables.scss delete mode 100644 app/assets/stylesheets/mixins.scss delete mode 100644 app/assets/stylesheets/variables.scss diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss deleted file mode 100644 index 88c966d18f7..00000000000 --- a/app/assets/stylesheets/fonts.scss +++ /dev/null @@ -1,7 +0,0 @@ -@font-face{ - font-family: Korolev; - src: font-url('korolev-medium-compressed.otf'); -} - -/** Typo **/ -$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; \ No newline at end of file diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index d2efe1fa06a..f53e0e50bab 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -8,15 +8,15 @@ $baseLineHeight: 18px !default; @import "bootstrap/responsive-1200px-min"; @import "font-awesome"; -@import "variables.scss"; -@import "fonts.scss"; -@import "mixins.scss"; /** * GitLab bootstrap. * Overrides some styles of twitter bootstrap. * Also give some common classes for GitLab app */ +@import "gitlab_bootstrap/variables.scss"; +@import "gitlab_bootstrap/fonts.scss"; +@import "gitlab_bootstrap/mixins.scss"; @import "gitlab_bootstrap/common.scss"; @import "gitlab_bootstrap/typography.scss"; @import "gitlab_bootstrap/buttons.scss"; diff --git a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss new file mode 100644 index 00000000000..88c966d18f7 --- /dev/null +++ b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss @@ -0,0 +1,7 @@ +@font-face{ + font-family: Korolev; + src: font-url('korolev-medium-compressed.otf'); +} + +/** Typo **/ +$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace; \ No newline at end of file diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss new file mode 100644 index 00000000000..81830368c4c --- /dev/null +++ b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss @@ -0,0 +1,69 @@ +/** + * Generic mixins + */ + @mixin box-shadow($shadow) { + -webkit-box-shadow: $shadow; + -moz-box-shadow: $shadow; + -ms-box-shadow: $shadow; + -o-box-shadow: $shadow; + box-shadow: $shadow; +} + +@mixin border-radius($radius) { + -webkit-border-radius: $radius; + -moz-border-radius: $radius; + -ms-border-radius: $radius; + -o-border-radius: $radius; + border-radius: $radius; +} + +@mixin linear-gradient($from, $to) { + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); + background-image: -webkit-linear-gradient($from, $to); + background-image: -moz-linear-gradient($from, $to); + background-image: -o-linear-gradient($from, $to); +} + +/** + * Prefilled mixins + * Mixins with fixed values + */ +@mixin bg-light-gray-gradient { + background: #f1f1f1; + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); + background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); + background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); +} + +@mixin bg-gray-gradient { + background: #eee; + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); +} + +@mixin bg-dark-gray-gradient { + background: #eee; + background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); + background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); +} + +@mixin shade { + @include box-shadow(0 0 3px #ddd); +} + +@mixin solid-shade { + @include box-shadow(0 0 0 3px #f1f1f1); +} + +@mixin header-font { + color: $style_color; + text-shadow: 0 1px 1px #FFF; + font-family: 'Korolev', sans-serif; + font-size: 28px; + line-height: 48px; + font-weight: normal; +} diff --git a/app/assets/stylesheets/gitlab_bootstrap/variables.scss b/app/assets/stylesheets/gitlab_bootstrap/variables.scss new file mode 100644 index 00000000000..869eb168c0d --- /dev/null +++ b/app/assets/stylesheets/gitlab_bootstrap/variables.scss @@ -0,0 +1,5 @@ +/** Colors **/ +$primary_color: #2FA0BB; +$link_color: #3A89A3; +$style_color: #474D57; +$hover: #D9EDF7; diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss deleted file mode 100644 index 81830368c4c..00000000000 --- a/app/assets/stylesheets/mixins.scss +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Generic mixins - */ - @mixin box-shadow($shadow) { - -webkit-box-shadow: $shadow; - -moz-box-shadow: $shadow; - -ms-box-shadow: $shadow; - -o-box-shadow: $shadow; - box-shadow: $shadow; -} - -@mixin border-radius($radius) { - -webkit-border-radius: $radius; - -moz-border-radius: $radius; - -ms-border-radius: $radius; - -o-border-radius: $radius; - border-radius: $radius; -} - -@mixin linear-gradient($from, $to) { - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); - background-image: -webkit-linear-gradient($from, $to); - background-image: -moz-linear-gradient($from, $to); - background-image: -o-linear-gradient($from, $to); -} - -/** - * Prefilled mixins - * Mixins with fixed values - */ -@mixin bg-light-gray-gradient { - background: #f1f1f1; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1)); - background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1); - background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1); -} - -@mixin bg-gray-gradient { - background: #eee; - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); -} - -@mixin bg-dark-gray-gradient { - background: #eee; - background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); - background-image: -o-linear-gradient(#e9e9e9, #d7d7d7); -} - -@mixin shade { - @include box-shadow(0 0 3px #ddd); -} - -@mixin solid-shade { - @include box-shadow(0 0 0 3px #f1f1f1); -} - -@mixin header-font { - color: $style_color; - text-shadow: 0 1px 1px #FFF; - font-family: 'Korolev', sans-serif; - font-size: 28px; - line-height: 48px; - font-weight: normal; -} diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss deleted file mode 100644 index 869eb168c0d..00000000000 --- a/app/assets/stylesheets/variables.scss +++ /dev/null @@ -1,5 +0,0 @@ -/** Colors **/ -$primary_color: #2FA0BB; -$link_color: #3A89A3; -$style_color: #474D57; -$hover: #D9EDF7; -- cgit v1.2.1 From 4ea9b3331f34f9ad39282627b1f94b44caa938b6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 19:44:15 +0200 Subject: Change travis rake task --- lib/tasks/travis.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/travis.rake b/lib/tasks/travis.rake index 13e32135c66..e04bfbaf1c0 100644 --- a/lib/tasks/travis.rake +++ b/lib/tasks/travis.rake @@ -1,5 +1,5 @@ task :travis do - ["spinach", "rspec spec"].each do |cmd| + ["rake spinach", "rake spec"].each do |cmd| puts "Starting to run #{cmd}..." system("export DISPLAY=:99.0 && bundle exec #{cmd}") raise "#{cmd} failed!" unless $?.exitstatus == 0 -- cgit v1.2.1 From 9b57bf78112017072ff3303946f9f2129a015cba Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 20:57:41 +0200 Subject: Remove main. Use application.scss instead --- app/assets/stylesheets/application.css | 10 ------- app/assets/stylesheets/application.scss | 47 +++++++++++++++++++++++++++++++++ app/assets/stylesheets/main.scss | 37 -------------------------- 3 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/application.scss delete mode 100644 app/assets/stylesheets/main.scss diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index a23d4532915..00000000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This is a manifest file that'll automatically include all the stylesheets available in this directory - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require jquery.ui.gitlab - *= require jquery.atwho - *= require chosen - *= require_self - *= require main -*/ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 00000000000..54690e73f81 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,47 @@ +/* + * This is a manifest file that'll automatically include all the stylesheets available in this directory + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + * the top of the compiled file, but it's generally better to create a new file per style scope. + *= require jquery.ui.gitlab + *= require jquery.atwho + *= require chosen + *= require_self +*/ + +/** + * GitLab bootstrap: + */ +@import "gitlab_bootstrap.scss"; + +@import "common.scss"; +@import "ref_select.scss"; + +@import "sections/header.scss"; +@import "sections/nav.scss"; +@import "sections/commits.scss"; +@import "sections/issues.scss"; +@import "sections/projects.scss"; +@import "sections/snippets.scss"; +@import "sections/votes.scss"; +@import "sections/merge_requests.scss"; +@import "sections/graph.scss"; +@import "sections/events.scss"; +@import "sections/themes.scss"; +@import "sections/tree.scss"; +@import "sections/notes.scss"; +@import "sections/profile.scss"; +@import "sections/login.scss"; +@import "sections/editor.scss"; + +@import "highlight/white.scss"; +@import "highlight/dark.scss"; + +/** + * UI themes: + */ +@import "themes/ui_basic.scss"; +@import "themes/ui_mars.scss"; +@import "themes/ui_modern.scss"; +@import "themes/ui_gray.scss"; +@import "themes/ui_color.scss"; + diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss deleted file mode 100644 index e74bc9d15cb..00000000000 --- a/app/assets/stylesheets/main.scss +++ /dev/null @@ -1,37 +0,0 @@ -/** - * GitLab bootstrap: - */ -@import "gitlab_bootstrap.scss"; - -@import "common.scss"; -@import "ref_select.scss"; - -@import "sections/header.scss"; -@import "sections/nav.scss"; -@import "sections/commits.scss"; -@import "sections/issues.scss"; -@import "sections/projects.scss"; -@import "sections/snippets.scss"; -@import "sections/votes.scss"; -@import "sections/merge_requests.scss"; -@import "sections/graph.scss"; -@import "sections/events.scss"; -@import "sections/themes.scss"; -@import "sections/tree.scss"; -@import "sections/notes.scss"; -@import "sections/profile.scss"; -@import "sections/login.scss"; -@import "sections/editor.scss"; - -@import "highlight/white.scss"; -@import "highlight/dark.scss"; - -/** - * UI themes: - */ -@import "themes/ui_basic.scss"; -@import "themes/ui_mars.scss"; -@import "themes/ui_modern.scss"; -@import "themes/ui_gray.scss"; -@import "themes/ui_color.scss"; - -- cgit v1.2.1 From 2b921a6c725d53e2223a670b0110833f25877f4e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 11:52:42 +0200 Subject: Few icons for services list --- app/views/services/index.html.haml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index ae3dbef97ad..2b4655285e2 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -4,23 +4,27 @@ %ul.unstyled.ui-box %li.wll - %h4 + %h4.cgreen = link_to edit_project_service_path(@project, :gitlab_ci) do GitLab CI %small Continuous integration server from GitLab .right - if @gitlab_ci_service.try(:active) - %small.cgreen Enabled + %small.cgreen + %i.icon-ok + Enabled - else - %small.cgray Disabled + %small.cgray + %i.icon-off + Disabled %li.wll - %h4 + %h4.cgray Jenkins CI %small An extendable open source continuous integration server .right %small Not implemented yet %li.wll - %h4 + %h4.cgray Campfire %small Web-based group chat tool .right -- cgit v1.2.1 From 85d5f606f656fc8680e28baf3d58d24898d23261 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Dec 2012 06:14:05 +0300 Subject: Labels autocomplete --- app/assets/javascripts/main.js.coffee | 6 ++++++ app/helpers/issues_helper.rb | 6 ++++++ app/views/issues/_form.html.haml | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 3334439ca87..f6c398c0acf 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -13,6 +13,12 @@ window.errorMessage = (message) -> ehtml.html(message) ehtml +window.split = (val) -> + return val.split( /,\s*/ ) + +window.extractLast = (term) -> + return split( term ).pop() + # Disable button if text field is empty window.disableButtonIfEmptyField = (field_selector, button_selector) -> field = $(field_selector) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 6b21f463c4c..264b764fa26 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -30,4 +30,10 @@ module IssuesHelper open: "open" } end + + def labels_autocomplete_source + labels = @project.issues_labels.order('count DESC') + labels = labels.map{ |l| { label: l.name, value: l.name } } + labels.to_json + end end diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 670b4e059f4..8a9a91a36a8 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -55,3 +55,36 @@ = link_to "Cancel", project_issues_path(@project), class: cancel_class - else = link_to "Cancel", project_issue_path(@project, @issue), class: cancel_class + + + + +:javascript + $(function(){ + $("#issue_label_list") + .bind( "keydown", function( event ) { + if ( event.keyCode === $.ui.keyCode.TAB && + $( this ).data( "autocomplete" ).menu.active ) { + event.preventDefault(); + } + }) + .autocomplete({ + minLength: 0, + source: function( request, response ) { + response( $.ui.autocomplete.filter( + #{raw labels_autocomplete_source}, extractLast( request.term ) ) ); + }, + focus: function() { + return false; + }, + select: function(event, ui) { + var terms = split( this.value ); + terms.pop(); + terms.push( ui.item.value ); + terms.push( "" ); + this.value = terms.join( ", " ); + return false; + } + }); + }); + -- cgit v1.2.1 From 8826077471d667680ee0ed9f86a41c4b30429e5c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Dec 2012 06:14:05 +0300 Subject: Refactor css lists. Use well-list class --- app/assets/stylesheets/common.scss | 28 ----- .../stylesheets/gitlab_bootstrap/blocks.scss | 13 --- .../stylesheets/gitlab_bootstrap/common.scss | 5 - app/assets/stylesheets/gitlab_bootstrap/lists.scss | 40 ++++++-- app/assets/stylesheets/jquery.ui.gitlab.css | 113 --------------------- app/assets/stylesheets/sections/commits.scss | 2 - app/assets/stylesheets/sections/events.scss | 1 - app/assets/stylesheets/sections/issues.scss | 9 -- app/assets/stylesheets/sections/projects.scss | 43 +++----- app/views/commits/_commits.html.haml | 2 +- app/views/compare/show.html.haml | 2 +- app/views/dashboard/_groups.html.haml | 6 +- app/views/dashboard/_projects.html.haml | 8 +- app/views/dashboard/issues.html.haml | 2 +- app/views/dashboard/merge_requests.html.haml | 7 +- app/views/events/event/_push.html.haml | 2 +- app/views/groups/_projects.html.haml | 6 +- app/views/groups/issues.html.haml | 2 +- app/views/groups/merge_requests.html.haml | 2 +- app/views/groups/people.html.haml | 4 +- app/views/issues/_issues.html.haml | 2 +- app/views/issues/_show.html.haml | 2 +- app/views/issues/index.html.haml | 2 +- app/views/labels/_label.html.haml | 2 +- app/views/labels/index.html.haml | 2 +- app/views/merge_requests/_merge_request.html.haml | 2 +- app/views/merge_requests/index.html.haml | 2 +- app/views/merge_requests/show/_commits.html.haml | 6 +- app/views/milestones/index.html.haml | 2 +- app/views/services/index.html.haml | 12 +-- app/views/team_members/_show.html.haml | 2 +- app/views/team_members/_team.html.haml | 6 +- 32 files changed, 87 insertions(+), 252 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d38aa1738a3..2f32845e90f 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -281,33 +281,6 @@ p.time { border: 2px solid #ddd; } -.leftbar { - h5, .title { - padding: 5px 10px; - } - - h4 { - font-size: 14px; - padding: 2px 10px; - color: #666; - border-bottom: 1px solid #f1f1f1; - } - a:last-child h4 { border: none; } - - a:hover { - h4 { - color: #111; - background: $hover; - border-color: #CCC; - .ico.project { - background-position:-209px -21px; - } - } - } - .bottom { - padding: 10px; - } -} /* Fix for readme code (stopped it from being yellow) */ @@ -321,7 +294,6 @@ p.time { } } - .highlight_word { background: #EEDC94; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index f1d2b85f137..f9c8b7b05ea 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -152,19 +152,6 @@ } } - li, .wll { - padding: 10px; - &:first-child { - @include border-radius(4px 4px 0 0); - border-top: none; - } - - &:last-child { - @include border-radius(0 0 4px 4px); - border: none; - } - } - .ui-box-body { padding: 10px; } diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index b8e89e7c78a..3bb7cdbf706 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -10,11 +10,6 @@ /** COMMON CLASSES **/ .left { float:left } .right { float:right!important } -.width-50p { width:50% } -.width-49p { width:49% } -.width-30p { width:30% } -.width-65p { width:65% } -.width-100p { width:100% } .append-bottom-10 { margin-bottom:10px } .append-bottom-20 { margin-bottom:20px } .prepend-top-10 { margin-top:10px } diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss index fc97af43339..edaf3cef2cf 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss @@ -1,23 +1,38 @@ -/** LISTS **/ - -ul { - /** - * List li block element #1 - * - */ - .wll { +/** + * Well styled list + * + */ +.well-list { + margin: 0; + list-style: none; + li { background-color: #FFF; - padding: 10px 5px; + padding: 10px; min-height: 20px; border-bottom: 1px solid #eee; border-bottom: 1px solid rgba(0, 0, 0, 0.05); + &.disabled { + color: #888; + } + &.smoke { background-color: #f5f5f5; } + &:hover { background: $hover; border-bottom: 1px solid #ADF; } - &:last-child { border:none } + + &:first-child { + @include border-radius(4px 4px 0 0); + border-top: none; + } + + &:last-child { + @include border-radius(0 0 4px 4px); + border: none; + } + .author { color: #999; } p { @@ -29,6 +44,11 @@ ul { top: 3px; } } + + .well-title { + font-size: 14px; + line-height: 18px; + } } } diff --git a/app/assets/stylesheets/jquery.ui.gitlab.css b/app/assets/stylesheets/jquery.ui.gitlab.css index 171857657b6..5c51600ba67 100644 --- a/app/assets/stylesheets/jquery.ui.gitlab.css +++ b/app/assets/stylesheets/jquery.ui.gitlab.css @@ -1,27 +1,3 @@ -/* - * jQuery UI CSS Framework 1.8.7 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - */ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - - /* Interaction Cues ----------------------------------*/ .ui-state-disabled { cursor: default !important; } @@ -140,26 +116,6 @@ /* Overlays */ .ui-widget-overlay { background: #262b33; opacity: .70;filter:Alpha(Opacity=70); } .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #000000; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; } -/* - * jQuery UI Resizable 1.8.7 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Resizable#theming - */ -.ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute; font-size: 0.1px; z-index: 999; display: block;} -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } -.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } -.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } -.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } -.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } -.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } -.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } -.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } -.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} /* * jQuery UI Selectable 1.8.7 * @@ -240,34 +196,7 @@ cursor: pointer; font-weight: bold; } -/* - * jQuery UI Slider 1.8.7 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Slider#theming - */ -.ui-slider { position: relative; text-align: left; background: #d7d7d7; z-index: 1; } -.ui-slider { -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; box-shadow: 0 1px 2px rgba(0,0,0,0.5) inset; } -.ui-slider .ui-slider-handle { background: url(slider_handles.png) 0px -23px no-repeat; position: absolute; z-index: 2; width: 23px; height: 23px; cursor: default; border: none; outline: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.ui-slider .ui-state-hover, .ui-slider .ui-state-active { background-position: 0 0; } -.ui-slider .ui-slider-range { background: #a3cae0; position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } -.ui-slider .ui-slider-range { -moz-box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; -webkit-box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; box-shadow: 0 1px 2px rgba(17,35,45,0.6) inset; } - -.ui-slider-horizontal { height: 5px; } -.ui-slider-horizontal .ui-slider-handle { top: -8px; margin-left: -13px; } -.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } -.ui-slider-horizontal .ui-slider-range-min { left: 0; } -.ui-slider-horizontal .ui-slider-range-max { right: 0; } - -.ui-slider-vertical { width: 5px; height: 100px; } -.ui-slider-vertical .ui-slider-handle { left: -8px; margin-left: 0; margin-bottom: -13px; } -.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } -.ui-slider-vertical .ui-slider-range-min { bottom: 0; } -.ui-slider-vertical .ui-slider-range-max { top: 0; } /* * jQuery UI Datepicker 1.8.7 * @@ -326,45 +255,3 @@ .ui-datepicker table .ui-state-highlight { border-color: #ADE; } .ui-datepicker-calendar .ui-state-default { background: transparent; border-color: #FFF; } .ui-datepicker-calendar .ui-state-active { background: #D9EDF7; border-color: #ADE; color: #3A89A3; font-weight: bold; text-shadow: 0 1px 1px #fff; } - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; } - - -/* Extra Input Field Styling */ -.ui-form textarea, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]) { - padding: 3px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - border: 1px solid #cecece; - outline: none; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2); - box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2); - -webkit-transition: all 250ms ease-in-out; - -moz-transition: all 250ms ease-in-out; - -o-transition: all 250ms ease-in-out; - transition: all 250ms ease-in-out; -} -.ui-form textarea:hover, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]):hover { - border: 1px solid #bdbdbd; - -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2); - -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2); - box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2); -} -.ui-form textarea:focus, .ui-form input:not([type="submit"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="file"]):not([type="range"]):focus { - border: 1px solid #95bdd4; - -webkit-box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2); - -moz-box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2); - box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2); -} diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index bf405bfcd51..aaf9254755a 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -229,8 +229,6 @@ /** COMMIT ROW **/ .commit { - @extend .wll; - .browse_code_link_holder { @extend .span2; float: right; diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 710426441fe..071a9c35468 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -76,7 +76,6 @@ padding: 16px 5px; &:last-child { border:none } - .wll:hover { background:none } .event_commits { margin-top: 5px; diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss index ef3821f23ef..fd995728978 100644 --- a/app/assets/stylesheets/sections/issues.scss +++ b/app/assets/stylesheets/sections/issues.scss @@ -121,12 +121,3 @@ input.check_all_issues { #update_status { width: 100px; } - - -/** - * Milestones list - * - */ -.milestone { - @extend .wll; -} diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 3f4b591a5dd..717f85024cc 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -8,7 +8,7 @@ .groups_box, .projects_box { - h5 { + > h5 { color: $style_color; font-size: 16px; text-shadow: 0 1px 1px #fff; @@ -16,37 +16,22 @@ line-height: 32px; font-size: 14px; } - ul { - li { - padding: 0; - a { - display: block; - .group_name { - font-size: 14px; - line-height: 18px; - } - .project_name { - color: #4fa2bd; - font-size: 14px; - line-height: 18px; - } - .arrow { - float: right; - padding: 10px; - margin: 0; - } - .last_activity { - padding-top: 5px; - display: block; - span, strong { - font-size: 12px; - color: #666; - } - } + .nav-projects-tabs li { padding: 0; } + .well-list { + .arrow { + float: right; + padding: 10px; + margin: 0; + } + .last_activity { + padding-top: 5px; + display: block; + span, strong { + font-size: 12px; + color: #666; } } } - @extend .leftbar; @extend .ui-box; } } diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml index c3c7d49ce74..c9217989884 100644 --- a/app/views/commits/_commits.html.haml +++ b/app/views/commits/_commits.html.haml @@ -3,4 +3,4 @@ %h5.small %i.icon-calendar = day.stamp("28 Aug, 2010") - %ul.unstyled= render commits + %ul.well-list= render commits diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml index 528c8b44af4..2abbd3fc0ee 100644 --- a/app/views/compare/show.html.haml +++ b/app/views/compare/show.html.haml @@ -9,7 +9,7 @@ - if @commits.present? %div.ui-box %h5.small Commits (#{@commits.count}) - %ul.unstyled= render @commits + %ul.well-list= render @commits - unless @diffs.empty? %h4 Diff diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index 0ef054155b6..9e3401e51b8 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -8,11 +8,11 @@ = link_to new_admin_group_path, class: "btn very_small info" do %i.icon-plus New Group - %ul.unstyled + %ul.well-list - groups.each do |group| - %li.wll + %li = link_to group_path(id: group.path), class: dom_class(group) do - %strong.group_name= truncate(group.name, length: 35) + %strong.well-title= truncate(group.name, length: 35) %span.arrow → %span.last_activity diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index d92983ff6a5..cffafb5445c 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -16,14 +16,14 @@ = nav_tab :scope, 'joined' do = link_to "Joined", dashboard_path(scope: 'joined') - %ul.unstyled + %ul.well-list - projects.each do |project| - %li.wll + %li = link_to project_path(project), class: dom_class(project) do - if project.namespace = project.namespace.human_name \/ - %strong.project_name + %strong.well-title = truncate(project.name, length: 25) %span.arrow → @@ -31,6 +31,6 @@ %strong Last activity: %span= project_last_activity(project) - if projects.blank? - %li.wll + %li %h3.nothing_here_message There are no projects here. .bottom= paginate projects, theme: "gitlab" diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index c2c124980f4..52863229644 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -14,7 +14,7 @@ %div.ui-box - @project = group[0] %h5= link_to_project @project - %ul.unstyled.issues_table + %ul.well-list.issues_table - group[1].each do |issue| = render(partial: 'issues/show', locals: {issue: issue}) %hr diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index ce9438405c8..ea7c8c9a3d5 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -10,11 +10,12 @@ .span9 - if @merge_requests.any? - @merge_requests.group_by(&:project).each do |group| - %ul.unstyled.ui-box + .ui-box - @project = group[0] %h5= link_to_project @project - - group[1].each do |merge_request| - = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) + %ul.well-list + - group[1].each do |merge_request| + = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request}) %hr = paginate @merge_requests, theme: "gitlab" diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 8d0718ad650..119b8e828d0 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -12,7 +12,7 @@ - if event.push_with_commits? - project = event.project .event-body - %ul.unstyled.event_commits + %ul.well-list.event_commits - few_commits = event.commits[0...2] - few_commits.each do |commit| = render "events/commit", commit: commit, project: project diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 39c0b6af685..0b491879fe0 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -8,13 +8,13 @@ = link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do %i.icon-plus New Project - %ul.unstyled + %ul.well-list - if projects.blank? %p.nothing_here_message This groups has no projects yet - projects.each do |project| - %li.wll + %li = link_to project_path(project), class: dom_class(project) do - %strong.project_name= truncate(project.name, length: 25) + %strong.well-title= truncate(project.name, length: 25) %span.arrow → %span.last_activity diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index cc488d57e9e..0daf4d752a8 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -10,7 +10,7 @@ %div.ui-box - @project = group[0] %h5= @project.name - %ul.unstyled.issues_table + %ul.well-list.issues_table - group[1].each do |issue| = render(partial: 'issues/show', locals: {issue: issue}) %hr diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 23a7e7222d7..72aa4ad11e1 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -6,7 +6,7 @@ %br - if @merge_requests.any? - @merge_requests.group_by(&:project).each do |group| - %ul.unstyled.ui-box + %ul.well-list.ui-box - @project = group[0] %h5= @project.name - group[1].each do |merge_request| diff --git a/app/views/groups/people.html.haml b/app/views/groups/people.html.haml index 68102b6a85a..be3dd7a4d78 100644 --- a/app/views/groups/people.html.haml +++ b/app/views/groups/people.html.haml @@ -9,9 +9,9 @@ Team %small (#{@users.size}) - %ul.unstyled + %ul.well-list - @users.each do |user| - %li.wll + %li = image_tag gravatar_icon(user.email, 16), class: "avatar s16" %strong= user.name %span.cgray= user.email diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml index f82ae8bde58..d7ba4300ce7 100644 --- a/app/views/issues/_issues.html.haml +++ b/app/views/issues/_issues.html.haml @@ -6,7 +6,7 @@ .row .span7= paginate @issues, remote: true, theme: "gitlab" .span3.right - %span.cgray.right + %span.cgray.right %span.issue_counter #{@issues.total_count} issues for this filter - else diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index ca8cdf704a9..b4c9ed98a6e 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -1,4 +1,4 @@ -%li.wll{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) } +%li{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) } - if controller.controller_name == 'issues' .issue_check = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue) diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index d89b183d360..4f551ffff92 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -55,7 +55,7 @@ = hidden_field_tag :f, params[:f] .clearfix - %ul#issues-table.unstyled.issues_table + %ul#issues-table.well-list.issues_table = render "issues" #new_issue_dialog diff --git a/app/views/labels/_label.html.haml b/app/views/labels/_label.html.haml index 8a465a9e02c..6e223e8e61d 100644 --- a/app/views/labels/_label.html.haml +++ b/app/views/labels/_label.html.haml @@ -1,4 +1,4 @@ -%li.wll +%li %strong %i.icon-tag = label.name diff --git a/app/views/labels/index.html.haml b/app/views/labels/index.html.haml index 4e41d375d6a..6eb2c00e56d 100644 --- a/app/views/labels/index.html.haml +++ b/app/views/labels/index.html.haml @@ -4,7 +4,7 @@ Labels %br %div.ui-box - %ul.unstyled.labels-table + %ul.well-list.labels-table - @labels.each do |label| = render 'label', label: label diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml index 4f68c5f2620..7369f3dd061 100644 --- a/app/views/merge_requests/_merge_request.html.haml +++ b/app/views/merge_requests/_merge_request.html.haml @@ -1,4 +1,4 @@ -%li.wll{ class: mr_css_classes(merge_request) } +%li{ class: mr_css_classes(merge_request) } .right .left - if merge_request.merged? diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index 7bcb7a81e1a..5b234bfbe02 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -30,7 +30,7 @@ = hidden_field_tag :f, params[:f] .clearfix - %ul.unstyled + %ul.well-list = render @merge_requests - if @merge_requests.blank? %li diff --git a/app/views/merge_requests/show/_commits.html.haml b/app/views/merge_requests/show/_commits.html.haml index d25e707c64e..796922776d9 100644 --- a/app/views/merge_requests/show/_commits.html.haml +++ b/app/views/merge_requests/show/_commits.html.haml @@ -5,19 +5,19 @@ Commits (#{@commits.count}) .merge-request-commits - if @commits.count > 8 - %ul.first_mr_commits.unstyled + %ul.first_mr_commits.well-list - @commits.first(8).each do |commit| = render "commits/commit", commit: commit %li.bottom 8 of #{@commits.count} commits displayed. %strong %a.mr_show_all_commits Click here to show all - %ul.all_mr_commits.hide.unstyled + %ul.all_mr_commits.hide.well-list - @commits.each do |commit| = render "commits/commit", commit: commit - else - %ul.unstyled + %ul.well-list - @commits.each do |commit| = render "commits/commit", commit: commit diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml index 813fb362e25..3089595fe0b 100644 --- a/app/views/milestones/index.html.haml +++ b/app/views/milestones/index.html.haml @@ -18,7 +18,7 @@ = link_to project_milestones_path(@project, f: "all") do All - %ul.unstyled + %ul.well-list = render @milestones - if @milestones.present? diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 2b4655285e2..2c94f965eec 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -2,8 +2,8 @@ %h3.page_title Services %br -%ul.unstyled.ui-box - %li.wll +%ul.ui-box.well-list + %li %h4.cgreen = link_to edit_project_service_path(@project, :gitlab_ci) do GitLab CI @@ -17,14 +17,14 @@ %small.cgray %i.icon-off Disabled - %li.wll - %h4.cgray + %li.disabled + %h4 Jenkins CI %small An extendable open source continuous integration server .right %small Not implemented yet - %li.wll - %h4.cgray + %li.disabled + %h4 Campfire %small Web-based group chat tool .right diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml index 8938c7d8a6d..8082f47fca8 100644 --- a/app/views/team_members/_show.html.haml +++ b/app/views/team_members/_show.html.haml @@ -1,6 +1,6 @@ - user = member.user - allow_admin = can? current_user, :admin_project, @project -%li.wll{id: dom_id(member), class: "team_member_row user_#{user.id}"} +%li{id: dom_id(member), class: "team_member_row user_#{user.id}"} .row .span6 = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml index e5fc4316279..462e75af183 100644 --- a/app/views/team_members/_team.html.haml +++ b/app/views/team_members/_team.html.haml @@ -1,9 +1,9 @@ - grouper_project_members(@project).each do |access, members| - %fieldset - %legend + .ui-box + %h5 = Project.access_options.key(access).pluralize %small= members.size - %ul.unstyled + %ul.well-list - members.sort_by(&:user_name).each do |up| = render(partial: 'team_members/show', locals: {member: up}) -- cgit v1.2.1 From aa8d4d9fea175e209ac3652f3743ce2801144a66 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Dec 2012 18:39:35 +0200 Subject: Return postgres to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6a713ea1703..868a6c6c238 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ env: + - DB=postgresql - DB=mysql before_install: - sudo apt-get install libicu-dev -y -- cgit v1.2.1 From 2f7effe804bdae9fca4ca0bb55c841664c2de978 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 06:14:05 +0300 Subject: Refactor issues, Remove ajax --- app/assets/javascripts/issues.js | 73 ++-------------------------- app/controllers/issues_controller.rb | 14 +----- app/controllers/merge_requests_controller.rb | 13 +---- app/models/milestone.rb | 6 ++- app/views/issues/_form.html.haml | 20 +++----- app/views/issues/_show.html.haml | 2 +- app/views/issues/create.js.haml | 10 ---- app/views/issues/edit.js.haml | 4 -- app/views/issues/index.html.haml | 7 ++- app/views/issues/new.js.haml | 3 -- app/views/issues/update.js.haml | 14 ------ app/views/merge_requests/_form.html.haml | 2 +- app/views/milestones/_milestone.html.haml | 27 +++++----- config/routes.rb | 6 +-- features/project/issues/issues.feature | 11 ----- features/steps/project/project_issues.rb | 4 +- spec/requests/issues_spec.rb | 2 +- 17 files changed, 44 insertions(+), 174 deletions(-) delete mode 100644 app/views/issues/create.js.haml delete mode 100644 app/views/issues/edit.js.haml delete mode 100644 app/views/issues/new.js.haml delete mode 100644 app/views/issues/update.js.haml diff --git a/app/assets/javascripts/issues.js b/app/assets/javascripts/issues.js index e2fe1075903..719d2c176c1 100644 --- a/app/assets/javascripts/issues.js +++ b/app/assets/javascripts/issues.js @@ -1,43 +1,3 @@ -function switchToNewIssue(){ - $(".issues_content").hide("fade", { direction: "left" }, 150, function(){ - $('select#issue_assignee_id').chosen(); - $('select#issue_milestone_id').chosen(); - $("#new_issue_dialog").show("fade", { direction: "right" }, 150); - $('.top-tabs .add_new').hide(); - disableButtonIfEmptyField("#issue_title", ".save-btn"); - GitLab.GfmAutoComplete.setup(); - }); -} - -function switchToEditIssue(){ - $(".issues_content").hide("fade", { direction: "left" }, 150, function(){ - $('select#issue_assignee_id').chosen(); - $('select#issue_milestone_id').chosen(); - $("#edit_issue_dialog").show("fade", { direction: "right" }, 150); - $('.add_new').hide(); - disableButtonIfEmptyField("#issue_title", ".save-btn"); - GitLab.GfmAutoComplete.setup(); - }); -} - -function switchFromNewIssue(){ - backToIssues(); -} - -function switchFromEditIssue(){ - backToIssues(); -} - -function backToIssues(){ - $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){ - $(".issues_content").show("fade", { direction: "left" }, 150, function() { - $("#edit_issue_dialog").html(""); - $("#new_issue_dialog").html(""); - $('.add_new').show(); - }); - }); -} - function initIssuesSearch() { var href = $('#issue_search_form').attr('action'); var last_terms = ''; @@ -76,23 +36,15 @@ function issuesPage(){ $(this).closest("form").submit(); }); - $("#new_issue_link").click(function(){ - updateNewIssueURL(); - }); - - $('body').on('ajax:success', '.close_issue, .reopen_issue, #new_issue', function(){ + $('body').on('ajax:success', '.close_issue, .reopen_issue', function(){ var t = $(this), totalIssues, - reopen = t.hasClass('reopen_issue'), - newIssue = false; - if( this.id == 'new_issue' ){ - newIssue = true; - } - $('.issue_counter, #new_issue').each(function(){ + reopen = t.hasClass('reopen_issue'); + $('.issue_counter').each(function(){ var issue = $(this); totalIssues = parseInt( $(this).html(), 10 ); - if( newIssue || ( reopen && issue.closest('.main_menu').length ) ){ + if( reopen && issue.closest('.main_menu').length ){ $(this).html( totalIssues+1 ); }else { $(this).html( totalIssues-1 ); @@ -126,20 +78,3 @@ function issuesCheckChanged() { $('.issues_filters').show(); } } - -function updateNewIssueURL(){ - var new_issue_link = $("#new_issue_link"); - var milestone_id = $("#milestone_id").val(); - var assignee_id = $("#assignee_id").val(); - var new_href = ""; - if(milestone_id){ - new_href = "issue[milestone_id]=" + milestone_id + "&"; - } - if(assignee_id){ - new_href = new_href + "issue[assignee_id]=" + assignee_id; - } - if(new_href.length){ - new_href = new_issue_link.attr("href") + "?" + new_href; - new_issue_link.attr("href", new_href); - } -}; diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 0f28fc3a111..5a1ce2cfcc4 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -1,6 +1,6 @@ class IssuesController < ProjectResourceController before_filter :module_enabled - before_filter :issue, only: [:edit, :update, :destroy, :show] + before_filter :issue, only: [:edit, :update, :show] # Allow read any issue before_filter :authorize_read_issue! @@ -11,9 +11,6 @@ class IssuesController < ProjectResourceController # Allow modify issue before_filter :authorize_modify_issue!, only: [:edit, :update] - # Allow destroy issue - before_filter :authorize_admin_issue!, only: [:destroy] - respond_to :js, :html def index @@ -77,15 +74,6 @@ class IssuesController < ProjectResourceController end end - def destroy - @issue.destroy - - respond_to do |format| - format.html { redirect_to project_issues_path } - format.js { render nothing: true } - end - end - def sort return render_404 unless can?(current_user, :admin_issue, @project) diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 72f6445a593..fa4eaff8469 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -1,6 +1,6 @@ class MergeRequestsController < ProjectResourceController before_filter :module_enabled - before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status] + before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status] before_filter :validates_merge_request, only: [:show, :diffs] before_filter :define_show_vars, only: [:show, :diffs] @@ -13,9 +13,6 @@ class MergeRequestsController < ProjectResourceController # Allow modify merge_request before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort] - # Allow destroy merge_request - before_filter :authorize_admin_merge_request!, only: [:destroy] - def index @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute end @@ -85,14 +82,6 @@ class MergeRequestsController < ProjectResourceController end end - def destroy - @merge_request.destroy - - respond_to do |format| - format.html { redirect_to project_merge_requests_url(@project) } - end - end - def branch_from @commit = project.commit(params[:ref]) @commit = CommitDecorator.decorate(@commit) diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 4be0873658a..4fac9bec259 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -62,7 +62,11 @@ class Milestone < ActiveRecord::Base end def can_be_closed? - issues.count > 0 && open? && issues.opened.count.zero? + open? && issues.opened.count.zero? + end + + def is_empty? + total_items_count.zero? end def open? diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml index 8a9a91a36a8..030f797c088 100644 --- a/app/views/issues/_form.html.haml +++ b/app/views/issues/_form.html.haml @@ -1,18 +1,18 @@ %div.issue-form-holder %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" - = form_for [@project, @issue], remote: request.xhr? do |f| + = form_for [@project, @issue] do |f| -if @issue.errors.any? .alert-message.block-message.error - %ul - - @issue.errors.full_messages.each do |msg| - %li= msg + - @issue.errors.full_messages.each do |msg| + %span= msg + %br .issue_form_box .issue_title .clearfix = f.label :title do %strong= "Subject *" .input - = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true + = f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true .issue_middle_block .issue_assignee = f.label :assignee_id do @@ -47,14 +47,8 @@ -else = f.submit 'Save changes', class: "save-btn btn" - - cancel_class = 'btn cancel-btn' - - if request.xhr? - = link_to "Cancel", "#back", onclick: "backToIssues();", class: cancel_class - - else - - if @issue.new_record? - = link_to "Cancel", project_issues_path(@project), class: cancel_class - - else - = link_to "Cancel", project_issue_path(@project, @issue), class: cancel_class + - cancel_path = @issue.new_record? ? project_issues_path(@project) : project_issue_path(@project, @issue) + = link_to "Cancel", cancel_path, class: 'btn cancel-btn' diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index b4c9ed98a6e..4641e8bdc63 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -16,7 +16,7 @@ = link_to 'Reopen', project_issue_path(issue.project, issue, issue: {closed: false }, status_only: true), method: :put, class: "btn small grouped reopen_issue", remote: true - else = link_to 'Close', project_issue_path(issue.project, issue, issue: {closed: true }, status_only: true), method: :put, class: "btn small grouped close_issue", remote: true - = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link grouped", remote: true do + = link_to edit_project_issue_path(issue.project, issue), class: "btn small edit-issue-link grouped" do %i.icon-edit Edit diff --git a/app/views/issues/create.js.haml b/app/views/issues/create.js.haml deleted file mode 100644 index d90cbf0d30c..00000000000 --- a/app/views/issues/create.js.haml +++ /dev/null @@ -1,10 +0,0 @@ -- if @issue.valid? - :plain - switchFromNewIssue(); - $("#issues-table").prepend("#{escape_javascript(render(partial: 'show', locals: {issue: @issue}))}"); - $.ajax({type: "GET", url: location.href, dataType: "script"}); -- else - :plain - $("#new_issue_dialog").empty(); - $("#new_issue_dialog").append("#{escape_javascript(render('form'))}"); - $('select#issue_assignee_id').chosen(); diff --git a/app/views/issues/edit.js.haml b/app/views/issues/edit.js.haml deleted file mode 100644 index a994572f9b9..00000000000 --- a/app/views/issues/edit.js.haml +++ /dev/null @@ -1,4 +0,0 @@ -:plain - $("#edit_issue_dialog").html("#{escape_javascript(render('form'))}"); - switchToEditIssue(); - diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 4f551ffff92..a3b47cabe52 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -1,4 +1,6 @@ = render "issues/head" +#new_issue_dialog +#edit_issue_dialog .issues_content %h3.page_title Issues @@ -6,7 +8,7 @@ .right .span5 - if can? current_user, :write_issue, @project - = link_to new_project_issue_path(@project), class: "right btn", title: "New Issue", remote: true, id: "new_issue_link" do + = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "right btn", title: "New Issue", id: "new_issue_link" do %i.icon-plus New Issue = form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do @@ -58,9 +60,6 @@ %ul#issues-table.well-list.issues_table = render "issues" -#new_issue_dialog -#edit_issue_dialog - :javascript $(function(){ issuesPage(); diff --git a/app/views/issues/new.js.haml b/app/views/issues/new.js.haml deleted file mode 100644 index 4cbcc563e28..00000000000 --- a/app/views/issues/new.js.haml +++ /dev/null @@ -1,3 +0,0 @@ -:plain - $("#new_issue_dialog").html("#{escape_javascript(render('form'))}"); - switchToNewIssue(); diff --git a/app/views/issues/update.js.haml b/app/views/issues/update.js.haml deleted file mode 100644 index 44722895025..00000000000 --- a/app/views/issues/update.js.haml +++ /dev/null @@ -1,14 +0,0 @@ -- if params[:status_only] - - if @issue.valid? - :plain - $("##{dom_id(@issue)}").fadeOut(); -- else - - if @issue.valid? - :plain - updatePage(); - switchFromEditIssue(); - - else - :plain - $("#edit_issue_dialog").empty(); - $("#edit_issue_dialog").append("#{escape_javascript(render('form'))}"); - $('select#issue_assignee_id').chosen(); diff --git a/app/views/merge_requests/_form.html.haml b/app/views/merge_requests/_form.html.haml index 302e75cfb00..9606e2e53b3 100644 --- a/app/views/merge_requests/_form.html.haml +++ b/app/views/merge_requests/_form.html.haml @@ -32,7 +32,7 @@ .top_box_content = f.label :title do %strong= "Title *" - .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5 + .input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true .merge_requests_middle_box .merge_requests_assignee = f.label :assignee_id do diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml index 462b9e395a1..3864792f7e8 100644 --- a/app/views/milestones/_milestone.html.haml +++ b/app/views/milestones/_milestone.html.haml @@ -10,15 +10,18 @@ %span.cred (Expired) %small = milestone.expires_at - .row - .span4 - .progress.progress-info - .bar{style: "width: #{milestone.percent_complete}%;"} - .span6 - = link_to project_issues_path(milestone.project, milestone_id: milestone.id) do - = pluralize milestone.issues.count, 'Issue' -   - = link_to project_merge_requests_path(milestone.project, milestone_id: milestone.id) do - = pluralize milestone.merge_requests.count, 'Merge Request' -   - %span.light #{milestone.percent_complete}% complete + - if milestone.is_empty? + %span.muted Empty + - else + .row + .span4 + .progress.progress-info + .bar{style: "width: #{milestone.percent_complete}%;"} + .span6 + = link_to project_issues_path(milestone.project, milestone_id: milestone.id) do + = pluralize milestone.issues.count, 'Issue' +   + = link_to project_merge_requests_path(milestone.project, milestone_id: milestone.id) do + = pluralize milestone.merge_requests.count, 'Merge Request' +   + %span.light #{milestone.percent_complete}% complete diff --git a/config/routes.rb b/config/routes.rb index 6e20ae77398..7214a786132 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -164,7 +164,7 @@ Gitlab::Application.routes.draw do end end - resources :merge_requests, constraints: {id: /\d+/} do + resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do member do get :diffs get :automerge @@ -200,9 +200,9 @@ Gitlab::Application.routes.draw do :via => [:get, :post], constraints: {from: /.+/, to: /.+/} resources :team, controller: 'team_members', only: [:index] - resources :milestones + resources :milestones, except: [:destroy] resources :labels, only: [:index] - resources :issues do + resources :issues, except: [:destroy] do collection do post :sort post :bulk_update diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 99529373d4d..5da4260127b 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -24,11 +24,9 @@ Feature: Project Issues Given I click link "Release 0.4" Then I should see issue "Release 0.4" - @javascript Scenario: I submit new unassigned issue Given I click link "New Issue" And I submit new issue "500 error on profile" - Given I click link "500 error on profile" Then I should see issue "500 error on profile" @javascript @@ -57,15 +55,6 @@ Feature: Project Issues Then I should see "Release 0.3" in issues And I should not see "Release 0.4" in issues - # TODO: find out solution for poltergeist/phantomjs or remove - # @javascript - # Scenario: I clear search - # Given I click link "All" - # And I fill in issue search with "Something" - # And I fill in issue search with "" - # Then I should see "Release 0.4" in issues - # And I should see "Release 0.3" in issues - @javascript Scenario: I create Issue with pre-selected milestone Given project "Shop" has milestone "v2.2" diff --git a/features/steps/project/project_issues.rb b/features/steps/project/project_issues.rb index cc0acb5b481..2103aeb1715 100644 --- a/features/steps/project/project_issues.rb +++ b/features/steps/project/project_issues.rb @@ -95,7 +95,7 @@ class ProjectIssues < Spinach::FeatureSteps end Then 'I should see selected milestone with title "v3.0"' do - issues_milestone_selector = "#milestone_id_chzn > a" + issues_milestone_selector = "#issue_milestone_id_chzn > a" page.find(issues_milestone_selector).should have_content("v3.0") end @@ -106,7 +106,7 @@ class ProjectIssues < Spinach::FeatureSteps end Then 'I should see first assignee from "Shop" as selected assignee' do - issues_assignee_selector = "#assignee_id_chzn > a" + issues_assignee_selector = "#issue_assignee_id_chzn > a" project = Project.find_by_name "Shop" assignee_name = project.users.first.name page.find(issues_assignee_selector).should have_content(assignee_name) diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb index e5ecb9590f8..0814108523b 100644 --- a/spec/requests/issues_spec.rb +++ b/spec/requests/issues_spec.rb @@ -11,7 +11,7 @@ describe "Issues" do project.add_access(user2, :read, :write) end - describe "Edit issue", js: true do + describe "Edit issue" do let!(:issue) do create(:issue, author: @user, -- cgit v1.2.1 From adb17d60522f17dd22dfda9b37ed874f4d4430cd Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 15:39:54 +0200 Subject: Cleanup after issues refactor and fix test --- app/views/issues/index.html.haml | 2 -- features/project/issues/issues.feature | 28 +++++++++++++++------------- spec/routing/project_routing_spec.rb | 3 +++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index a3b47cabe52..cc47da65b72 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -1,6 +1,4 @@ = render "issues/head" -#new_issue_dialog -#edit_issue_dialog .issues_content %h3.page_title Issues diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 5da4260127b..d6ef384c9a6 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -55,17 +55,19 @@ Feature: Project Issues Then I should see "Release 0.3" in issues And I should not see "Release 0.4" in issues - @javascript - Scenario: I create Issue with pre-selected milestone - Given project "Shop" has milestone "v2.2" - And project "Shop" has milestone "v3.0" - And I visit project "Shop" issues page - When I select milestone "v3.0" - And I click link "New Issue" - Then I should see selected milestone with title "v3.0" + # Disable this two cause of random failing + # TODO: fix after v4.0 released + #@javascript + #Scenario: I create Issue with pre-selected milestone + #Given project "Shop" has milestone "v2.2" + #And project "Shop" has milestone "v3.0" + #And I visit project "Shop" issues page + #When I select milestone "v3.0" + #And I click link "New Issue" + #Then I should see selected milestone with title "v3.0" - @javascript - Scenario: I create Issue with pre-selected assignee - When I select first assignee from "Shop" project - And I click link "New Issue" - Then I should see first assignee from "Shop" as selected assignee + #@javascript + #Scenario: I create Issue with pre-selected assignee + #When I select first assignee from "Shop" project + #And I click link "New Issue" + #Then I should see first assignee from "Shop" as selected assignee diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index 25db2f91d4d..09e11588164 100644 --- a/spec/routing/project_routing_spec.rb +++ b/spec/routing/project_routing_spec.rb @@ -245,6 +245,7 @@ describe MergeRequestsController, "routing" do it_behaves_like "RESTful project resources" do let(:controller) { 'merge_requests' } + let(:actions) { [:index, :create, :new, :edit, :show, :update] } end end @@ -325,6 +326,7 @@ end describe MilestonesController, "routing" do it_behaves_like "RESTful project resources" do let(:controller) { 'milestones' } + let(:actions) { [:index, :create, :new, :edit, :show, :update] } end end @@ -360,6 +362,7 @@ describe IssuesController, "routing" do it_behaves_like "RESTful project resources" do let(:controller) { 'issues' } + let(:actions) { [:index, :create, :new, :edit, :show, :update] } end end -- cgit v1.2.1 From 4b02f4a22d2c7f10418c9202bb718dab185e6d82 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 07:14:05 +0300 Subject: show production.log, show only active milestone for issue filter --- app/helpers/issues_helper.rb | 4 ++++ app/views/admin/logs/show.html.haml | 16 ++++++++++++++++ app/views/issues/index.html.haml | 4 ++-- lib/gitlab/logger.rb | 5 +++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 264b764fa26..2825787fd2f 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -36,4 +36,8 @@ module IssuesHelper labels = labels.map{ |l| { label: l.name, value: l.name } } labels.to_json end + + def issues_active_milestones + @project.milestones.active.order("id desc").all + end end diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml index e33c5468555..25644d6321a 100644 --- a/app/views/admin/logs/show.html.haml +++ b/app/views/admin/logs/show.html.haml @@ -3,6 +3,8 @@ = link_to "githost.log", "#githost", 'data-toggle' => 'tab' %li = link_to "application.log", "#application", 'data-toggle' => 'tab' + %li + = link_to "production.log", "#production", 'data-toggle' => 'tab' %p.light To prevent perfomance issues admin logs output the last 2000 lines .tab-content @@ -34,3 +36,17 @@ - Gitlab::AppLogger.read_latest.each do |line| %li %p= line + .tab-pane#production + .file_holder#README + .file_title + %i.icon-file + production.log + .right + = link_to '#', class: 'log-bottom' do + %i.icon-arrow-down + Scroll down + .file_content.logs + %ol + - Gitlab::Logger.read_latest_for('production.log').each do |line| + %li + %p= line diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index cc47da65b72..08d4393b201 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -27,7 +27,7 @@ .left = select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status") = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee") - = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone") + = select_tag('update[milestone_id]', options_from_collection_for_select(issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone") = hidden_field_tag 'update[issues_ids]', [] = hidden_field_tag :f, params[:f] = button_tag "Save", class: "btn update_selected_issues" @@ -51,7 +51,7 @@ = form_tag project_issues_path(@project), method: :get, class: :right do = select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), prompt: "Labels") = select_tag(:assignee_id, options_from_collection_for_select([unassigned_filter] + @project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee") - = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone") + = select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + issues_active_milestones, "id", "title", params[:milestone_id]), prompt: "Milestone") = hidden_field_tag :f, params[:f] .clearfix diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 8b4eee5da06..389eef3395f 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb @@ -14,6 +14,11 @@ module Gitlab logs = `tail -n 2000 #{path}`.split("\n") end + def self.read_latest_for filename + path = Rails.root.join("log", filename) + logs = `tail -n 2000 #{path}`.split("\n") + end + def self.build new(Rails.root.join("log", file_name)) end -- cgit v1.2.1 From a09d93821521e8908c46a418471969999ab8a312 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Thu, 20 Dec 2012 13:31:09 +0100 Subject: Flipping commit ids in commits_between, fixes #513 --- app/models/commit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/commit.rb b/app/models/commit.rb index 200c915a335..aa91bd546bd 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -92,7 +92,7 @@ class Commit older = commits.last result[:same] = (younger.id == older.id) - result[:commits] = project.repo.commits_between(younger.id, older.id).map {|c| Commit.new(c)} + result[:commits] = project.repo.commits_between(older.id, younger.id).map {|c| Commit.new(c)} result[:diffs] = project.repo.diff(younger.id, older.id) rescue [] result[:commit] = Commit.new(older) end -- cgit v1.2.1 From 6d93eafa6a0db951afb15f584856a0b18a9ce03b Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Thu, 20 Dec 2012 13:50:43 +0100 Subject: disabled sorting of commits before compare --- app/models/commit.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/models/commit.rb b/app/models/commit.rb index aa91bd546bd..ee16bf084de 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -87,14 +87,10 @@ class Commit last = project.commit(from.try(:strip)) if first && last - commits = [first, last].sort_by(&:created_at) - younger = commits.first - older = commits.last - - result[:same] = (younger.id == older.id) - result[:commits] = project.repo.commits_between(older.id, younger.id).map {|c| Commit.new(c)} - result[:diffs] = project.repo.diff(younger.id, older.id) rescue [] - result[:commit] = Commit.new(older) + result[:same] = (first.id == last.id) + result[:commits] = project.repo.commits_between(last.id, first.id).map {|c| Commit.new(c)} + result[:diffs] = project.repo.diff(last.id, first.id) rescue [] + result[:commit] = Commit.new(first) end result -- cgit v1.2.1 From 9916e8d6dc66b0a4f71bf88bae55d8077204b5f6 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Thu, 20 Dec 2012 14:39:39 +0100 Subject: Updated test to match with switched commits Added compare switch --- app/assets/stylesheets/sections/commits.scss | 9 +++++++++ app/views/compare/_form.html.haml | 3 +++ features/steps/project/project_browse_commits.rb | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index aaf9254755a..12c0a17b1e0 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -300,3 +300,12 @@ color: #fff; font-family: $monospace; } + + +.commits-compare-switch{ + background: url('switch_icon.png'); + width: 16px; + height: 18px; + text-indent: -9999px; + display: inline-block; +} \ No newline at end of file diff --git a/app/views/compare/_form.html.haml b/app/views/compare/_form.html.haml index 07f1c818e4d..088b6ad9158 100644 --- a/app/views/compare/_form.html.haml +++ b/app/views/compare/_form.html.haml @@ -13,12 +13,15 @@ = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge" = "..." = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" + = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} - if @refs_are_same .alert %span Refs are the same .actions = submit_tag "Compare", class: "btn primary wide commits-compare-btn" + + :javascript $(function() { var availableTags = #{@project.ref_names.to_json}; diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb index 6bf164e2c8f..2c03ce14fc1 100644 --- a/features/steps/project/project_browse_commits.rb +++ b/features/steps/project/project_browse_commits.rb @@ -32,8 +32,8 @@ class ProjectBrowseCommits < Spinach::FeatureSteps end And 'I fill compare fields with refs' do - fill_in "from", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" - fill_in "to", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812" + fill_in "from", with: "8716fc78f3c65bbf7bcf7b574febd583bc5d2812" + fill_in "to", with: "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" click_button "Compare" end -- cgit v1.2.1 From d11f9a632c19b6579bc9d0a676208c38a357fb57 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Thu, 20 Dec 2012 14:42:05 +0100 Subject: only show switch if from and to are set --- app/views/compare/_form.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/compare/_form.html.haml b/app/views/compare/_form.html.haml index 088b6ad9158..123c1c457f8 100644 --- a/app/views/compare/_form.html.haml +++ b/app/views/compare/_form.html.haml @@ -13,7 +13,8 @@ = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge" = "..." = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" - = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} + - if params[:to] && params[:from] + = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} - if @refs_are_same .alert %span Refs are the same -- cgit v1.2.1 From b2e31692a51318171e110f01363af782129b7ce7 Mon Sep 17 00:00:00 2001 From: Koen Punt Date: Thu, 20 Dec 2012 14:58:07 +0100 Subject: Added icon --- app/assets/images/switch_icon.png | Bin 0 -> 1203 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/switch_icon.png diff --git a/app/assets/images/switch_icon.png b/app/assets/images/switch_icon.png new file mode 100644 index 00000000000..7c11f206593 Binary files /dev/null and b/app/assets/images/switch_icon.png differ -- cgit v1.2.1 From a7aee9d1ee9b8e90deb9c8d71a4ea9d96c0d6f8f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 20:14:05 +0300 Subject: Pretty compare mode --- app/assets/stylesheets/sections/commits.scss | 11 +++++++--- app/views/compare/_form.html.haml | 33 +++++++++++++++------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 12c0a17b1e0..7ed53333f8c 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -303,9 +303,14 @@ .commits-compare-switch{ - background: url('switch_icon.png'); + background: url("switch_icon.png") no-repeat center center; width: 16px; height: 18px; text-indent: -9999px; - display: inline-block; -} \ No newline at end of file + float: left; + margin-right: 9px; + border: 1px solid #DDD; + @include border-radius(4px); + padding: 4px; + background-color: #EEE; +} diff --git a/app/views/compare/_form.html.haml b/app/views/compare/_form.html.haml index 123c1c457f8..7e3a2a0e1f5 100644 --- a/app/views/compare/_form.html.haml +++ b/app/views/compare/_form.html.haml @@ -1,28 +1,31 @@ %div - %p.slead - Fill input field with commit id like - %code.label_branch 4eedf23 - or branch/tag name like - %code.label_branch master - and press compare button for commits list, code diff. + - unless params[:to] + %p.slead + Fill input field with commit id like + %code.label_branch 4eedf23 + or branch/tag name like + %code.label_branch master + and press compare button for commits list, code diff. - %br + %br = form_tag project_compare_index_path(@project), method: :post do .clearfix - = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge" - = "..." - = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" - - if params[:to] && params[:from] - = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} + .pull-left + - if params[:to] && params[:from] + = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} + = text_field_tag :from, params[:from], placeholder: "master", class: "xlarge" + = "..." + = text_field_tag :to, params[:to], placeholder: "aa8b4ef", class: "xlarge" + .pull-left +   + = submit_tag "Compare", class: "btn primary wide commits-compare-btn" - if @refs_are_same .alert %span Refs are the same - .actions - = submit_tag "Compare", class: "btn primary wide commits-compare-btn" - + :javascript $(function() { var availableTags = #{@project.ref_names.to_json}; -- cgit v1.2.1 From b772c2c3f02c5beebd4c7ba8d43f9f5ac351b3f7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 16:42:13 +0200 Subject: Fix issue update.js --- app/views/issues/update.js.haml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 app/views/issues/update.js.haml diff --git a/app/views/issues/update.js.haml b/app/views/issues/update.js.haml new file mode 100644 index 00000000000..7f66022a2de --- /dev/null +++ b/app/views/issues/update.js.haml @@ -0,0 +1,4 @@ +- if params[:status_only] + - if @issue.valid? + :plain + $("##{dom_id(@issue)}").fadeOut(); -- cgit v1.2.1 From 4496903950f56dde684d4cf603358f5a9535cdb5 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 15 Dec 2012 01:45:44 +0100 Subject: Rename config options --- config/gitlab.yml.example | 86 +++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 37 deletions(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 7fcfc5b7cf3..c8387fa2caf 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1,57 +1,62 @@ -# # # # # # # # # # # # # # # # # # -# Gitlab application config file # -# # # # # # # # # # # # # # # # # # # -# 1. Common settings +# 1. GitLab app settings # ========================== -# Web application specific settings -web: +## GitLab settings +gitlab: + ## Web server settings host: localhost port: 80 https: false -# Email used for notification -# about new issues, comments -email: - from: notify@localhost + ## Email settings + # Email address used in the "From" field in mails sent by GitLab + email_from: gitlab@localhost -# Application specific settings -# Like default project limit for user etc -app: + ## Project settings default_projects_limit: 10 - # backup_path: "/vol/backups" # default: Rails.root + backups/ - # backup_keep_time: 604800 # default: 0 (forever) (in seconds) - # disable_gravatar: true # default: false - Disable user avatars from Gravatar.com - # gravatar_url: "http://" # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm - # gravatar_ssl_url: "https://" # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm + +## Gravatar +gravatar: + enabled: true # Use user avatar images from Gravatar.com (default: true) + # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm + # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm + # # 2. Auth settings # ========================== -ldap: + +## LDAP settings +ldap: enabled: false host: '_your_ldap_server' base: '_the_base_where_you_search_for_users' port: 636 uid: 'sAMAccountName' - method: 'ssl' # plain + method: 'ssl' # "ssl" or "plain" bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' +## Omniauth settings omniauth: # Enable ability for users - # to login via twitter, google .. + # Allow logging in via Twitter, Google, etc. using Omniauth providers enabled: false - # IMPORTANT! - # It allows user to login without having user account + # CAUTION! + # This allows users to login without having a user account first (default: false) + # User accounts will be created automatically when authentication was successful. allow_single_sign_on: false + # Locks down those users until they have been cleared by the admin (default: true) block_auto_created_users: true - # Auth providers + ## Auth providers + # Uncomment the lines and fill in the data of the auth provider you want to use + # If your favorite auth provider is not listed you can user others: + # see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers providers: # - { name: 'google_oauth2', app_id: 'YOUR APP ID', # app_secret: 'YOUR APP SECRET', @@ -62,29 +67,36 @@ omniauth: # app_secret: 'YOUR APP SECRET' } + # -# 3. Advanced settings: +# 3. Advanced settings # ========================== -# Git Hosting configuration -git_host: +## Backup settings +backup: + path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) + # keep_time: 604800 # default: 0 (forever) (in seconds) + +## Gitolite settings +gitolite: admin_uri: git@localhost:gitolite-admin - base_path: /home/git/repositories/ + repos_path: /home/git/repositories/ hooks_path: /home/git/.gitolite/hooks/ - gitolite_admin_key: gitlab - git_user: git + admin_key: gitlab upload_pack: true receive_pack: true - # host: localhost + ssh_user: git + ssh_host: localhost + # ssh_port: 22 # config_file: gitolite.conf - # port: 22 -# Git settings -# Use default values unless you understand it +## Git settings +# CAUTION! +# Use the default values unless you really know what you are doing git: - path: /usr/bin/git + bin_path: /usr/bin/git # Max size of git object like commit, in bytes # This value can be increased if you have a very large commits - git_max_size: 5242880 # 5.megabytes + max_size: 5242880 # 5.megabytes # Git timeout to read commit, in seconds - git_timeout: 10 + timeout: 10 -- cgit v1.2.1 From b2e46f44ceee2078b8e1d92ae5ff892c044bc0e7 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 16:52:29 +0100 Subject: Refactor Settings initializer All overrides are marked as deprecated. Default settings are at the bottom. --- config/initializers/1_settings.rb | 206 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 200 insertions(+), 6 deletions(-) diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index e684f37857d..4fe3ced4d8d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -2,23 +2,43 @@ class Settings < Settingslogic source "#{Rails.root}/config/gitlab.yml" class << self + # FIXME: Deprecated: remove for 4.1 def web_protocol + ActiveSupport::Deprecation.warn("Settings.web_protocol is deprecated and will be removed from GitLab 4.1", caller) + gitlab.protocol + rescue Settingslogic::MissingSetting self.web['protocol'] ||= web.https ? "https" : "http" end + # FIXME: Deprecated: remove for 4.1 def web_host + ActiveSupport::Deprecation.warn("Settings.web_host is deprecated and will be removed from GitLab 4.1", caller) + gitlab.host + rescue Settingslogic::MissingSetting self.web['host'] ||= 'localhost' end + # FIXME: Deprecated: remove for 4.1 def email_from + ActiveSupport::Deprecation.warn("Settings.email_from is deprecated and will be removed from GitLab 4.1", caller) + gitlab.email_from + rescue Settingslogic::MissingSetting self.email['from'] ||= ("notify@" + web_host) end + # FIXME: Deprecated: remove for 4.1 def url + ActiveSupport::Deprecation.warn("Settings.url is deprecated and will be removed from GitLab 4.1", caller) + gitlab.url + rescue Settingslogic::MissingSetting self['url'] ||= build_url end + # FIXME: Deprecated: remove for 4.1 def web_port + ActiveSupport::Deprecation.warn("Settings.web_port is deprecated and will be removed from GitLab 4.1", caller) + gitlab.port.to_i + rescue Settingslogic::MissingSetting if web.https web['port'] = 443 else @@ -26,11 +46,17 @@ class Settings < Settingslogic end.to_i end + # FIXME: Deprecated: remove for 4.1 def web_custom_port? + ActiveSupport::Deprecation.warn("Settings.web_custom_port? is deprecated and will be removed from GitLab 4.1", caller) + gitlab_on_non_standard_port? + rescue Settingslogic::MissingSetting ![443, 80].include?(web_port) end + # FIXME: Deprecated: remove for 4.1 def build_url + ActiveSupport::Deprecation.warn("Settings.build_url is deprecated and will be removed from GitLab 4.1", caller) if web_custom_port? custom_port = ":#{web_port}" else @@ -44,19 +70,35 @@ class Settings < Settingslogic ].join('') end + # FIXME: Deprecated: remove for 4.1 def ssh_port + ActiveSupport::Deprecation.warn("Settings.ssh_port is deprecated and will be removed from GitLab 4.1", caller) + gitolite.ssh_port + rescue Settingslogic::MissingSetting git_host['port'] || 22 end + # FIXME: Deprecated: remove for 4.1 def ssh_user + ActiveSupport::Deprecation.warn("Settings.ssh_user is deprecated and will be removed from GitLab 4.1", caller) + gitolite.ssh_user + rescue Settingslogic::MissingSetting git_host['git_user'] || 'git' end + # FIXME: Deprecated: remove for 4.1 def ssh_host + ActiveSupport::Deprecation.warn("Settings.ssh_host is deprecated and will be removed from GitLab 4.1", caller) + gitolite.ssh_host + rescue Settingslogic::MissingSetting git_host['host'] || web_host || 'localhost' end + # FIXME: Deprecated: remove for 4.1 def ssh_path + ActiveSupport::Deprecation.warn("Settings.ssh_path is deprecated and will be removed from GitLab 4.1", caller) + gitolite.ssh_path_prefix + rescue Settingslogic::MissingSetting if ssh_port != 22 "ssh://#{ssh_user}@#{ssh_host}:#{ssh_port}/" else @@ -64,15 +106,27 @@ class Settings < Settingslogic end end + # FIXME: Deprecated: remove for 4.1 def git_base_path + ActiveSupport::Deprecation.warn("Settings.git_base_path is deprecated and will be removed from GitLab 4.1", caller) + gitolite.repos_path + rescue Settingslogic::MissingSetting git_host['base_path'] || '/home/git/repositories/' end + # FIXME: Deprecated: remove for 4.1 def git_hooks_path + ActiveSupport::Deprecation.warn("Settings.git_hooks_path is deprecated and will be removed from GitLab 4.1", caller) + gitolite.hooks_path + rescue Settingslogic::MissingSetting git_host['hooks_path'] || '/home/git/share/gitolite/hooks/' end + # FIXME: Deprecated: remove for 4.1 def git_upload_pack + ActiveSupport::Deprecation.warn("Settings.git_upload_pack is deprecated and will be removed from GitLab 4.1", caller) + gitolite.upload_pack + rescue Settingslogic::MissingSetting if git_host['upload_pack'] != false true else @@ -80,7 +134,11 @@ class Settings < Settingslogic end end + # FIXME: Deprecated: remove for 4.1 def git_receive_pack + ActiveSupport::Deprecation.warn("Settings.git_receive_pack is deprecated and will be removed from GitLab 4.1", caller) + gitolite.receive_pack + rescue Settingslogic::MissingSetting if git_host['receive_pack'] != false true else @@ -88,71 +146,207 @@ class Settings < Settingslogic end end + # FIXME: Deprecated: remove for 4.1 def git_bin_path + ActiveSupport::Deprecation.warn("Settings.git_bin_path is deprecated and will be removed from GitLab 4.1", caller) + git.bin_path + rescue Settingslogic::MissingSetting git['path'] || '/usr/bin/git' end + # FIXME: Deprecated: remove for 4.1 def git_max_size + ActiveSupport::Deprecation.warn("Settings.git_max_size is deprecated and will be removed from GitLab 4.1", caller) + git.max_size + rescue Settingslogic::MissingSetting git['git_max_size'] || 5242880 # 5.megabytes end + # FIXME: Deprecated: remove for 4.1 def git_timeout + ActiveSupport::Deprecation.warn("Settings.git_timeout is deprecated and will be removed from GitLab 4.1", caller) + git.timeout + rescue Settingslogic::MissingSetting git['git_timeout'] || 10 end + # FIXME: Deprecated: remove for 4.1 def gitolite_admin_uri + ActiveSupport::Deprecation.warn("Settings.gitolite_admin_uri is deprecated and will be removed from GitLab 4.1", caller) + gitolite.admin_uri + rescue Settingslogic::MissingSetting git_host['admin_uri'] || 'git@localhost:gitolite-admin' end + # FIXME: Deprecated: remove for 4.1 def gitolite_config_file + ActiveSupport::Deprecation.warn("Settings.gitolite_config_file is deprecated and will be removed from GitLab 4.1", caller) + gitolite.config_file + rescue Settingslogic::MissingSetting git_host['config_file'] || 'gitolite.conf' end + # FIXME: Deprecated: remove for 4.1 def gitolite_admin_key + ActiveSupport::Deprecation.warn("Settings.gitolite_admin_key is deprecated and will be removed from GitLab 4.1", caller) + gitolite.admin_key + rescue Settingslogic::MissingSetting git_host['gitolite_admin_key'] || 'gitlab' end + # FIXME: Deprecated: remove for 4.1 def default_projects_limit + ActiveSupport::Deprecation.warn("Settings.default_projects_limit is deprecated and will be removed from GitLab 4.1", caller) + gitlab.default_projects_limit + rescue Settingslogic::MissingSetting app['default_projects_limit'] || 10 end + # FIXME: Deprecated: remove for 4.1 def backup_path - t = app['backup_path'] || "backups/" - t = /^\//.match(t) ? t : Rails.root .join(t) - t + ActiveSupport::Deprecation.warn("Settings.backup_path is deprecated and will be removed from GitLab 4.1", caller) + backup.path + rescue Settingslogic::MissingSetting + File.expand_path(app['backup_path'] || "backups/", Rails.root) end + # FIXME: Deprecated: remove for 4.1 def backup_keep_time + ActiveSupport::Deprecation.warn("Settings.backup_keep_time is deprecated and will be removed from GitLab 4.1", caller) + backup.keep_time + rescue Settingslogic::MissingSetting app['backup_keep_time'] || 0 end + # FIXME: Deprecated: remove for 4.1 def ldap_enabled? - ldap && ldap['enabled'] + ActiveSupport::Deprecation.warn("Settings.ldap_enabled? is deprecated and will be removed from GitLab 4.1", caller) + ldap.enabled rescue Settingslogic::MissingSetting false end + # FIXME: Deprecated: remove for 4.1 def omniauth_enabled? - omniauth && omniauth['enabled'] + ActiveSupport::Deprecation.warn("Settings.omniauth_enabled? is deprecated and will be removed from GitLab 4.1", caller) + omniauth.enabled rescue Settingslogic::MissingSetting false end + # FIXME: Deprecated: remove for 4.1 def omniauth_providers - (omniauth_enabled? && omniauth['providers']) || [] + ActiveSupport::Deprecation.warn("Settings.omniauth_providers is deprecated and will be removed from GitLab 4.1", caller) + omniauth.providers + rescue Settingslogic::MissingSetting + [] end + # FIXME: Deprecated: remove for 4.1 def disable_gravatar? + ActiveSupport::Deprecation.warn("Settings.disable_gravatar? is deprecated and will be removed from GitLab 4.1", caller) + !gravatar.enabled + rescue Settingslogic::MissingSetting app['disable_gravatar'] || false end + # FIXME: Deprecated: remove for 4.1 def gravatar_url + ActiveSupport::Deprecation.warn("Settings.gravatar_url is deprecated and will be removed from GitLab 4.1", caller) + gravatar.plain_url + rescue Settingslogic::MissingSetting app['gravatar_url'] || 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' end + # FIXME: Deprecated: remove for 4.1 def gravatar_ssl_url + ActiveSupport::Deprecation.warn("Settings.gravatar_ssl_url is deprecated and will be removed from GitLab 4.1", caller) + gravatar.ssl_url + rescue Settingslogic::MissingSetting app['gravatar_ssl_url'] || 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' end + + + def gitlab_on_non_standard_port? + ![443, 80].include?(gitlab.port.to_i) + end + + private + + def build_gitolite_ssh_path_prefix + if gitolite.ssh_port != 22 + "ssh://#{gitolite.ssh_user}@#{gitolite.ssh_host}:#{gitolite.ssh_port}/" + else + "#{gitolite.ssh_user}@#{gitolite.ssh_host}:" + end + end + + def build_gitlab_url + if gitlab_on_non_standard_port? + custom_port = ":#{gitlab.port}" + else + custom_port = nil + end + [ gitlab.protocol, + "://", + gitlab.host, + custom_port + ].join('') + end end end + + +# Default settings + +# FIXME: Deprecated: remove for 4.1 +# all Settings.web ... +# all Settings.app ... +# all Settings.email ... +# all Settings.git_host ... +Settings['pre_40_config'] ||= Settings['web'].present? + +Settings['ldap'] ||= Settingslogic.new({}) +Settings.ldap['enabled'] ||= false + +Settings['omniauth'] ||= Settingslogic.new({}) +Settings.omniauth['enabled'] ||= false +Settings.omniauth['providers'] ||= [] + +Settings['gitlab'] ||= Settingslogic.new({}) +Settings.gitlab['default_projects_limit'] ||= Settings.pre_40_config ? Settings.default_projects_limit : 10 +Settings.gitlab['host'] ||= Settings.pre_40_config ? Settings.web_host : 'localhost' +Settings.gitlab['https'] ||= Settings.pre_40_config ? Settings.web.https : false +Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 +Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" +Settings.gitlab['email_from'] ||= Settings.pre_40_config ? Settings.email_from : "gitlab@#{Settings.gitlab.host}" +Settings.gitlab['url'] ||= Settings.pre_40_config ? Settings.url : Settings.send(:build_gitlab_url) + +Settings['gravatar'] ||= Settingslogic.new({}) +Settings.gravatar['enabled'] ||= Settings.pre_40_config ? !Settings.disable_gravatar? : true +Settings.gravatar['plain_url'] ||= Settings.pre_40_config ? Settings.gravatar_url : 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' +Settings.gravatar['ssl_url'] ||= Settings.pre_40_config ? Settings.gravatar_ssl_url : 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm' + +Settings['gitolite'] ||= Settingslogic.new({}) +Settings.gitolite['admin_key'] ||= Settings.pre_40_config ? Settings.gitolite_admin_key : 'gitlab' +Settings.gitolite['admin_uri'] ||= Settings.pre_40_config ? Settings.gitolite_admin_uri : 'git@localhost:gitolite-admin' +Settings.gitolite['config_file'] ||= Settings.pre_40_config ? Settings.gitolite_config_file : 'gitolite.conf' +Settings.gitolite['hooks_path'] ||= Settings.pre_40_config ? Settings.git_hooks_path : '/home/git/share/gitolite/hooks/' +Settings.gitolite['receive_pack'] ||= Settings.pre_40_config ? Settings.git_receive_pack : (Settings.gitolite['receive_pack'] != false) +Settings.gitolite['repos_path'] ||= Settings.pre_40_config ? Settings.git_base_path : '/home/git/repositories/' +Settings.gitolite['upload_pack'] ||= Settings.pre_40_config ? Settings.git_upload_pack : (Settings.gitolite['upload_pack'] != false) +Settings.gitolite['ssh_host'] ||= Settings.pre_40_config ? Settings.ssh_host : (Settings.gitlab.host || 'localhost') +Settings.gitolite['ssh_port'] ||= Settings.pre_40_config ? Settings.ssh_port : 22 +Settings.gitolite['ssh_user'] ||= Settings.pre_40_config ? Settings.ssh_user : 'git' +Settings.gitolite['ssh_path_prefix'] ||= Settings.pre_40_config ? Settings.ssh_path : Settings.send(:build_gitolite_ssh_path_prefix) + +Settings['backup'] ||= Settingslogic.new({}) +Settings.backup['keep_time'] ||= Settings.pre_40_config ? Settings.backup_keep_time : 0 +Settings.backup['path'] = Settings.pre_40_config ? Settings.backup_path : File.expand_path(Settings.backup['path'] || "tmp/backups/", Rails.root) + +Settings['git'] ||= Settingslogic.new({}) +Settings.git['max_size'] ||= Settings.pre_40_config ? Settings.git_max_size : 5242880 # 5.megabytes +Settings.git['bin_path'] ||= Settings.pre_40_config ? Settings.git_bin_path : '/usr/bin/git' +Settings.git['timeout'] ||= Settings.pre_40_config ? Settings.git_timeout : 10 +Settings.git['path'] ||= Settings.git.bin_path # FIXME: Deprecated: remove for 4.1 -- cgit v1.2.1 From 19eb63741995e3be60781db74edab5d5ae896c6b Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 15 Dec 2012 01:16:25 +0100 Subject: Update uses of Gitolite.config.foo settings --- app/controllers/admin/users_controller.rb | 2 +- app/controllers/omniauth_callbacks_controller.rb | 2 +- app/helpers/application_helper.rb | 4 +-- app/mailers/notify.rb | 8 ++--- app/models/namespace.rb | 8 ++--- app/models/project.rb | 2 +- app/roles/push_observer.rb | 2 +- app/roles/repository.rb | 4 +-- app/views/admin/groups/show.html.haml | 2 +- app/views/errors/gitolite.html.haml | 4 +-- app/views/profiles/account.html.haml | 2 +- app/views/profiles/show.html.haml | 2 +- app/views/shared/_clone_panel.html.haml | 2 +- app/workers/post_receive.rb | 4 +-- config/initializers/3_grit_ext.rb | 4 +-- config/initializers/devise.rb | 2 +- config/routes.rb | 8 ++--- features/support/env.rb | 6 ++-- lib/gitlab/auth.rb | 2 +- lib/gitlab/backend/gitolite.rb | 2 +- lib/gitlab/backend/gitolite_config.rb | 6 ++-- lib/gitlab/project_mover.rb | 4 +-- lib/tasks/gitlab/activate_namespaces.rake | 2 +- lib/tasks/gitlab/backup.rake | 22 ++++++------- lib/tasks/gitlab/check.rake | 42 ++++++++++++------------ lib/tasks/gitlab/import.rake | 2 +- lib/tasks/gitlab/info.rake | 22 ++++++------- spec/lib/gitolite_spec.rb | 2 +- spec/lib/project_mover_spec.rb | 2 +- spec/models/project_hooks_spec.rb | 2 +- spec/models/project_spec.rb | 4 +-- spec/spec_helper.rb | 6 ++-- spec/workers/post_receive_spec.rb | 2 +- 33 files changed, 95 insertions(+), 95 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 5614aaa2a67..5f259bd7e27 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -30,7 +30,7 @@ class Admin::UsersController < AdminController def new - @admin_user = User.new({ projects_limit: Gitlab.config.default_projects_limit }, as: :admin) + @admin_user = User.new({ projects_limit: Gitlab.config.gitlab.default_projects_limit }, as: :admin) end def edit diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 2fb783b289b..c4ebf0e4889 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -1,5 +1,5 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController - Gitlab.config.omniauth_providers.each do |provider| + Gitlab.config.omniauth.providers.each do |provider| define_method provider['name'] do handle_omniauth end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 571c0cb71b6..c9e939801c2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,7 @@ module ApplicationHelper if Gitlab.config.disable_gravatar? || user_email.blank? 'no_avatar.png' else - gravatar_url = request.ssl? ? Gitlab.config.gravatar_ssl_url : Gitlab.config.gravatar_url + gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url user_email.strip! sprintf(gravatar_url, {:hash => Digest::MD5.hexdigest(user_email.downcase), :email => URI.escape(user_email), :size => size}) end @@ -48,7 +48,7 @@ module ApplicationHelper end def web_app_url - "#{request_protocol}://#{Gitlab.config.web_host}/" + "#{request_protocol}://#{Gitlab.config.gitlab.host}/" end def last_commit(project) diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 29cebadaf94..f954a05c883 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -3,11 +3,11 @@ class Notify < ActionMailer::Base add_template_helper ApplicationHelper add_template_helper GitlabMarkdownHelper - default_url_options[:host] = Gitlab.config.web_host - default_url_options[:protocol] = Gitlab.config.web_protocol - default_url_options[:port] = Gitlab.config.web_port if Gitlab.config.web_custom_port? + default_url_options[:host] = Gitlab.config.gitlab.host + default_url_options[:protocol] = Gitlab.config.gitlab.protocol + default_url_options[:port] = Gitlab.config.gitlab.port if Gitlab.config.gitlab_on_non_standard_port? - default from: Gitlab.config.email_from + default from: Gitlab.config.gitlab.email_from diff --git a/app/models/namespace.rb b/app/models/namespace.rb index e1c24de949a..3c087e26c19 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -48,14 +48,14 @@ class Namespace < ActiveRecord::Base end def ensure_dir_exist - namespace_dir_path = File.join(Gitlab.config.git_base_path, path) + namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path) system("mkdir -m 770 #{namespace_dir_path}") unless File.exists?(namespace_dir_path) end def move_dir if path_changed? - old_path = File.join(Gitlab.config.git_base_path, path_was) - new_path = File.join(Gitlab.config.git_base_path, path) + old_path = File.join(Gitlab.config.gitolite.repos_path, path_was) + new_path = File.join(Gitlab.config.gitolite.repos_path, path) if File.exists?(new_path) raise "Already exists" end @@ -64,7 +64,7 @@ class Namespace < ActiveRecord::Base end def rm_dir - dir_path = File.join(Gitlab.config.git_base_path, path) + dir_path = File.join(Gitlab.config.gitolite.repos_path, path) system("rm -rf #{dir_path}") end end diff --git a/app/models/project.rb b/app/models/project.rb index eb6e7cb1b08..6a427fddfac 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -195,7 +195,7 @@ class Project < ActiveRecord::Base end def web_url - [Gitlab.config.url, path_with_namespace].join("/") + [Gitlab.config.gitlab.url, path_with_namespace].join("/") end def common_notes diff --git a/app/roles/push_observer.rb b/app/roles/push_observer.rb index 0b3d57f48a7..dda18267207 100644 --- a/app/roles/push_observer.rb +++ b/app/roles/push_observer.rb @@ -114,7 +114,7 @@ module PushObserver id: commit.id, message: commit.safe_message, timestamp: commit.date.xmlschema, - url: "#{Gitlab.config.url}/#{path_with_namespace}/commit/#{commit.id}", + url: "#{Gitlab.config.gitlab.url}/#{path_with_namespace}/commit/#{commit.id}", author: { name: commit.author_name, email: commit.author_email diff --git a/app/roles/repository.rb b/app/roles/repository.rb index 4e80d50cc72..78190ca96d0 100644 --- a/app/roles/repository.rb +++ b/app/roles/repository.rb @@ -97,7 +97,7 @@ module Repository end def path_to_repo - File.join(Gitlab.config.git_base_path, "#{path_with_namespace}.git") + File.join(Gitlab.config.gitolite.repos_path, "#{path_with_namespace}.git") end def namespace_dir @@ -199,7 +199,7 @@ module Repository end def http_url_to_repo - http_url = [Gitlab.config.url, "/", path_with_namespace, ".git"].join('') + http_url = [Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('') end # Check if current branch name is marked as protected in the system diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 1b02475fa80..41f6d9b3516 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -22,7 +22,7 @@ %b Path: %td - %span.monospace= File.join(Gitlab.config.git_base_path, @group.path) + %span.monospace= File.join(Gitlab.config.gitolite.repos_path, @group.path) %tr %td %b diff --git a/app/views/errors/gitolite.html.haml b/app/views/errors/gitolite.html.haml index 6eec95836d6..590bca71dd4 100644 --- a/app/views/errors/gitolite.html.haml +++ b/app/views/errors/gitolite.html.haml @@ -21,5 +21,5 @@ Permissions: %pre = preserve do - sudo chown -R git:git #{Gitlab.config.git_base_path} - sudo chmod -R ug+rwXs #{Gitlab.config.git_base_path} + sudo chown -R git:git #{Gitlab.config.gitolite.repos_path} + sudo chmod -R ug+rwXs #{Gitlab.config.gitolite.repos_path} diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index 1c51f48f401..3b5099edbdb 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -1,4 +1,4 @@ -- if Gitlab.config.omniauth_enabled? +- if Gitlab.config.omniauth.enabled %fieldset %legend Social Accounts .oauth_select_holder diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index ac36fa3aa55..177119f093a 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -37,7 +37,7 @@ %li %p You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"} - - if Gitlab.config.omniauth_enabled? && @user.provider? + - if Gitlab.config.omniauth.enabled && @user.provider? %li %p You can login through #{@user.provider.titleize}! diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index f632e1221f9..e283d9b3085 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -1,4 +1,4 @@ .input-prepend.project_clone_holder %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH - %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.web_protocol.upcase + %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select input-xxlarge" diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb index 11281b8b656..1414ed490c9 100644 --- a/app/workers/post_receive.rb +++ b/app/workers/post_receive.rb @@ -2,7 +2,7 @@ class PostReceive @queue = :post_receive def self.perform(repo_path, oldrev, newrev, ref, identifier) - repo_path.gsub!(Gitlab.config.git_base_path.to_s, "") + repo_path.gsub!(Gitlab.config.gitolite.repos_path.to_s, "") repo_path.gsub!(/.git$/, "") repo_path.gsub!(/^\//, "") @@ -10,7 +10,7 @@ class PostReceive return false if project.nil? # Ignore push from non-gitlab users - user = if identifier.eql? Gitlab.config.gitolite_admin_key + user = if identifier.eql? Gitlab.config.gitolite.admin_key email = project.commit(newrev).author.email rescue nil User.find_by_email(email) if email elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier) diff --git a/config/initializers/3_grit_ext.rb b/config/initializers/3_grit_ext.rb index d114ea6cc8b..097c301a06a 100644 --- a/config/initializers/3_grit_ext.rb +++ b/config/initializers/3_grit_ext.rb @@ -1,8 +1,8 @@ require 'grit' require 'pygments' -Grit::Git.git_timeout = Gitlab.config.git_timeout -Grit::Git.git_max_size = Gitlab.config.git_max_size +Grit::Git.git_timeout = Gitlab.config.git.timeout +Grit::Git.git_max_size = Gitlab.config.git.max_size Grit::Blob.class_eval do include Linguist::BlobHelper diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 8f3cef5a2ac..db7246a1b9b 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -4,7 +4,7 @@ Devise.setup do |config| # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class with default "from" parameter. - config.mailer_sender = Gitlab.config.email_from + config.mailer_sender = Gitlab.config.gitlab.email_from # Configure the class responsible to send e-mails. # config.mailer = "Devise::Mailer" diff --git a/config/routes.rb b/config/routes.rb index 7214a786132..e08bfebc020 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,10 +14,10 @@ Gitlab::Application.routes.draw do # Enable Grack support mount Grack::Bundle.new({ - git_path: Gitlab.config.git_bin_path, - project_root: Gitlab.config.git_base_path, - upload_pack: Gitlab.config.git_upload_pack, - receive_pack: Gitlab.config.git_receive_pack + git_path: Gitlab.config.git.bin_path, + project_root: Gitlab.config.gitolite.repos_path, + upload_pack: Gitlab.config.gitolite.upload_pack, + receive_pack: Gitlab.config.gitolite.receive_pack }), at: '/:path', constraints: { path: /[-\/\w\.-]+\.git/ } # diff --git a/features/support/env.rb b/features/support/env.rb index 38fcc5ad092..500de0f3e20 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -33,9 +33,9 @@ DatabaseCleaner.strategy = :truncation Spinach.hooks.before_scenario do # Use tmp dir for FS manipulations - Gitlab.config.stub(git_base_path: Rails.root.join('tmp', 'test-git-base-path')) - FileUtils.rm_rf Gitlab.config.git_base_path - FileUtils.mkdir_p Gitlab.config.git_base_path + Gitlab.config.gitolite.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path')) + FileUtils.rm_rf Gitlab.config.gitolite.repos_path + FileUtils.mkdir_p Gitlab.config.gitolite.repos_path end Spinach.hooks.after_scenario do diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 056fb034daf..8c45c93557e 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -38,7 +38,7 @@ module Gitlab email: email, password: password, password_confirmation: password, - projects_limit: Gitlab.config.default_projects_limit, + projects_limit: Gitlab.config.gitlab.default_projects_limit, }, as: :admin) if Gitlab.config.omniauth['block_auto_created_users'] && !ldap @user.blocked = true diff --git a/lib/gitlab/backend/gitolite.rb b/lib/gitlab/backend/gitolite.rb index 7c3861bdd13..3b8a2090f73 100644 --- a/lib/gitlab/backend/gitolite.rb +++ b/lib/gitlab/backend/gitolite.rb @@ -38,7 +38,7 @@ module Gitlab end def url_to_repo path - Gitlab.config.ssh_path + "#{path}.git" + Gitlab.config.gitolite.ssh_path_prefix + "#{path}.git" end def enable_automerge diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb index 70ccc4782c6..a2bc4ca8d74 100644 --- a/lib/gitlab/backend/gitolite_config.rb +++ b/lib/gitlab/backend/gitolite_config.rb @@ -16,7 +16,7 @@ module Gitlab def ga_repo @ga_repo ||= ::Gitolite::GitoliteAdmin.new( File.join(config_tmp_dir,'gitolite'), - conf: Gitlab.config.gitolite_config_file + conf: Gitlab.config.gitolite.config_file ) end @@ -167,7 +167,7 @@ module Gitlab # Enable access to all repos for gitolite admin. # We use it for accept merge request feature def admin_all_repo - owner_name = Gitlab.config.gitolite_admin_key + owner_name = Gitlab.config.gitolite.admin_key # @ALL repos premission for gitolite owner repo_name = "@all" @@ -189,7 +189,7 @@ module Gitlab def pull tmp_dir Dir.mkdir tmp_dir - `git clone #{Gitlab.config.gitolite_admin_uri} #{tmp_dir}/gitolite` + `git clone #{Gitlab.config.gitolite.admin_uri} #{tmp_dir}/gitolite` unless File.exists?(File.join(tmp_dir, 'gitolite', 'conf', 'gitolite.conf')) raise PullError, "unable to clone gitolite-admin repo" diff --git a/lib/gitlab/project_mover.rb b/lib/gitlab/project_mover.rb index eeab22ae6e7..def6e90001b 100644 --- a/lib/gitlab/project_mover.rb +++ b/lib/gitlab/project_mover.rb @@ -15,10 +15,10 @@ module Gitlab def execute # Create new dir if missing - new_dir_path = File.join(Gitlab.config.git_base_path, new_dir) + new_dir_path = File.join(Gitlab.config.gitolite.repos_path, new_dir) system("mkdir -m 770 #{new_dir_path}") unless File.exists?(new_dir_path) - old_path = File.join(Gitlab.config.git_base_path, old_dir, "#{project.path}.git") + old_path = File.join(Gitlab.config.gitolite.repos_path, old_dir, "#{project.path}.git") new_path = File.join(new_dir_path, "#{project.path}.git") if File.exists? new_path diff --git a/lib/tasks/gitlab/activate_namespaces.rake b/lib/tasks/gitlab/activate_namespaces.rake index 08df0a8040b..70ec88d0b3f 100644 --- a/lib/tasks/gitlab/activate_namespaces.rake +++ b/lib/tasks/gitlab/activate_namespaces.rake @@ -27,7 +27,7 @@ namespace :gitlab do end print "\n\nMove projects from groups under groups dirs:".yellow - git_path = Gitlab.config.git_base_path + git_path = Gitlab.config.gitolite.repos_path Project.where('namespace_id IS NOT NULL').find_each(batch_size: 500) do |project| next unless project.group diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index c01fe479dba..307a6288a24 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -8,7 +8,7 @@ namespace :gitlab do Rake::Task["gitlab:app:db_dump"].invoke Rake::Task["gitlab:app:repo_dump"].invoke - Dir.chdir(Gitlab.config.backup_path) + Dir.chdir(Gitlab.config.backup.path) # saving additional informations s = {} @@ -17,7 +17,7 @@ namespace :gitlab do s[:gitlab_version] = %x{git rev-parse HEAD}.gsub(/\n/,"") s[:tar_version] = %x{tar --version | head -1}.gsub(/\n/,"") - File.open("#{Gitlab.config.backup_path}/backup_information.yml", "w+") do |file| + File.open("#{Gitlab.config.backup.path}/backup_information.yml", "w+") do |file| file << s.to_yaml.gsub(/^---\n/,'') end @@ -39,10 +39,10 @@ namespace :gitlab do # delete backups print "Deleting old backups... " - if Gitlab.config.backup_keep_time > 0 + if Gitlab.config.backup.keep_time > 0 file_list = Dir.glob("*_gitlab_backup.tar").map { |f| f.split(/_/).first.to_i } file_list.sort.each do |timestamp| - if Time.at(timestamp) < (Time.now - Gitlab.config.backup_keep_time) + if Time.at(timestamp) < (Time.now - Gitlab.config.backup.keep_time) %x{rm #{timestamp}_gitlab_backup.tar} end end @@ -55,7 +55,7 @@ namespace :gitlab do # Restore backup of GitLab system desc "GITLAB | Restore a previously created backup" task :backup_restore => :environment do - Dir.chdir(Gitlab.config.backup_path) + Dir.chdir(Gitlab.config.backup.path) # check for existing backups in the backup dir file_list = Dir.glob("*_gitlab_backup.tar").each.map { |f| f.split(/_/).first.to_i } @@ -111,7 +111,7 @@ namespace :gitlab do ################################# REPOSITORIES ################################# task :repo_dump => :environment do - backup_path_repo = File.join(Gitlab.config.backup_path, "repositories") + backup_path_repo = File.join(Gitlab.config.backup.path, "repositories") FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo) puts "Dumping repositories:" project = Project.all.map { |n| [n.path, n.path_to_repo] } @@ -127,7 +127,7 @@ namespace :gitlab do end task :repo_restore => :environment do - backup_path_repo = File.join(Gitlab.config.backup_path, "repositories") + backup_path_repo = File.join(Gitlab.config.backup.path, "repositories") puts "Restoring repositories:" project = Project.all.map { |n| [n.path, n.path_to_repo] } project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] @@ -136,8 +136,8 @@ namespace :gitlab do FileUtils.rm_rf(project.second) if File.dirname(project.second) # delete old stuff if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1") permission_commands = [ - "sudo chmod -R g+rwX #{Gitlab.config.git_base_path}", - "sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}" + "sudo chmod -R g+rwX #{Gitlab.config.gitolite.repos_path}", + "sudo chown -R #{Gitlab.config.gitolite.ssh_user}:#{Gitlab.config.gitolite.ssh_user} #{Gitlab.config.gitolite.repos_path}" ] permission_commands.each { |command| Kernel.system(command) } puts "[DONE]".green @@ -150,7 +150,7 @@ namespace :gitlab do ###################################### DB ###################################### task :db_dump => :environment do - backup_path_db = File.join(Gitlab.config.backup_path, "db") + backup_path_db = File.join(Gitlab.config.backup.path, "db") FileUtils.mkdir_p(backup_path_db) unless Dir.exists?(backup_path_db) puts "Dumping database tables:" @@ -170,7 +170,7 @@ namespace :gitlab do end task :db_restore=> :environment do - backup_path_db = File.join(Gitlab.config.backup_path, "db") + backup_path_db = File.join(Gitlab.config.backup.path, "db") puts "Restoring database tables:" Rake::Task["db:reset"].invoke diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index f70a3e7bbcf..0a452686c43 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -268,7 +268,7 @@ namespace :gitlab do options = { "user.name" => "GitLab", - "user.email" => Gitlab.config.email_from + "user.email" => Gitlab.config.gitlab.email_from } correct_options = options.map do |name, value| run("git config --global --get #{name}").try(:squish) == value @@ -290,7 +290,7 @@ namespace :gitlab do end def check_gitlab_in_git_group - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user print "gitlab user is in #{gitolite_ssh_user} group? ... " if run_and_match("id -rnG", /\Wgit\W/) @@ -309,10 +309,10 @@ namespace :gitlab do # see https://github.com/gitlabhq/gitlabhq/issues/1059 def check_issue_1056_shell_profile_error - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... " - profile_file = File.expand_path("~#{Gitlab.config.ssh_user}/.profile") + profile_file = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.profile") unless File.read(profile_file) =~ /^-e PATH/ puts "yes".green @@ -414,7 +414,7 @@ namespace :gitlab do test_path = "/tmp/gitlab_gitolite_admin_test" FileUtils.rm_rf(test_path) - `git clone -q #{Gitlab.config.gitolite_admin_uri} #{test_path}` + `git clone -q #{Gitlab.config.gitolite.admin_uri} #{test_path}` raise unless $?.success? puts "yes".green @@ -423,7 +423,7 @@ namespace :gitlab do try_fixing_it( "Make sure the \"admin_uri\" is set correctly in config/gitlab.yml", "Try cloning it yourself with:", - " git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite-admin", + " git clone -q #{Gitlab.config.gitolite.admin_uri} /tmp/gitolite-admin", "Make sure Gitolite is installed correctly." ) for_more_information( @@ -452,7 +452,7 @@ namespace :gitlab do puts "no".red try_fixing_it( "Try committing to it yourself with:", - " git clone -q #{Gitlab.config.gitolite_admin_uri} /tmp/gitolite-admin", + " git clone -q #{Gitlab.config.gitolite.admin_uri} /tmp/gitolite-admin", " touch foo", " git add foo", " git commit -m \"foo\"", @@ -469,7 +469,7 @@ namespace :gitlab do def check_dot_gitolite_exists print "Config directory exists? ... " - gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite") + gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite") if File.directory?(gitolite_config_path) puts "yes".green @@ -490,7 +490,7 @@ namespace :gitlab do def check_dot_gitolite_permissions print "Config directory access is drwxr-x---? ... " - gitolite_config_path = File.expand_path("~#{Gitlab.config.ssh_user}/.gitolite") + gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite") unless File.exists?(gitolite_config_path) puts "can't check because of previous errors".magenta return @@ -512,7 +512,7 @@ namespace :gitlab do end def check_dot_gitolite_user_and_group - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... " gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite") @@ -615,9 +615,9 @@ namespace :gitlab do print "post-receive hook exists? ... " hook_file = "post-receive" - gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common") gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file) @@ -639,10 +639,10 @@ namespace :gitlab do print "post-receive hook up-to-date? ... " hook_file = "post-receive" - gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common") gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) gitolite_hook_content = File.read(gitolite_hook_file) - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user unless File.exists?(gitolite_hook_file) puts "can't check because of previous errors".magenta @@ -669,7 +669,7 @@ namespace :gitlab do def check_repo_base_exists print "Repo base directory exists? ... " - repo_base_path = Gitlab.config.git_base_path + repo_base_path = Gitlab.config.gitolite.repos_path if File.exists?(repo_base_path) puts "yes".green @@ -691,7 +691,7 @@ namespace :gitlab do def check_repo_base_permissions print "Repo base access is drwsrws---? ... " - repo_base_path = Gitlab.config.git_base_path + repo_base_path = Gitlab.config.gitolite.repos_path unless File.exists?(repo_base_path) puts "can't check because of previous errors".magenta return @@ -713,10 +713,10 @@ namespace :gitlab do end def check_repo_base_user_and_group - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user print "Repo base owned by #{gitolite_ssh_user}:#{gitolite_ssh_user}? ... " - repo_base_path = Gitlab.config.git_base_path + repo_base_path = Gitlab.config.gitolite.repos_path unless File.exists?(repo_base_path) puts "can't check because of previous errors".magenta return @@ -777,9 +777,9 @@ namespace :gitlab do print "post-receive hooks in repos are links: ... " hook_file = "post-receive" - gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") + gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common") gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) - gitolite_ssh_user = Gitlab.config.ssh_user + gitolite_ssh_user = Gitlab.config.gitolite.ssh_user unless File.exists?(gitolite_hook_file) puts "can't check because of previous errors".magenta @@ -828,7 +828,7 @@ namespace :gitlab do ######################## def gitolite_home - File.expand_path("~#{Gitlab.config.ssh_user}") + File.expand_path("~#{Gitlab.config.gitolite.ssh_user}") end def gitolite_version diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index 09f0dc9e459..81f66e2e406 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -12,7 +12,7 @@ namespace :gitlab do desc "GITLAB | Import bare repositories from git_host -> base_path into GitLab project instance" task :repos => :environment do - git_base_path = Gitlab.config.git_base_path + git_base_path = Gitlab.config.gitolite.repos_path repos_to_import = Dir.glob(git_base_path + '/*') repos_to_import.each do |repo_path| diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 2f633974c83..85458fe2c43 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -46,7 +46,7 @@ namespace :gitlab do http_clone_url = project.http_url_to_repo ssh_clone_url = project.ssh_url_to_repo - omniauth_providers = Gitlab.config.omniauth_providers + omniauth_providers = Gitlab.config.omniauth.providers omniauth_providers.map! { |provider| provider['name'] } puts "" @@ -55,17 +55,17 @@ namespace :gitlab do puts "Revision:\t#{Gitlab::Revision}" puts "Directory:\t#{Rails.root}" puts "DB Adapter:\t#{database_adapter}" - puts "URL:\t\t#{Gitlab.config.url}" + puts "URL:\t\t#{Gitlab.config.gitlab.url}" puts "HTTP Clone URL:\t#{http_clone_url}" puts "SSH Clone URL:\t#{ssh_clone_url}" - puts "Using LDAP:\t#{Gitlab.config.ldap_enabled? ? "yes".green : "no"}" - puts "Using Omniauth:\t#{Gitlab.config.omniauth_enabled? ? "yes".green : "no"}" - puts "Omniauth Providers: #{omniauth_providers.map(&:magenta).join(', ')}" if Gitlab.config.omniauth_enabled? + puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".green : "no"}" + puts "Using Omniauth:\t#{Gitlab.config.omniauth.enabled ? "yes".green : "no"}" + puts "Omniauth Providers: #{omniauth_providers.map(&:magenta).join(', ')}" if Gitlab.config.omniauth.enabled # check Gitolite version - gitolite_version_file = "#{Gitlab.config.git_base_path}/../gitolite/src/VERSION" + gitolite_version_file = "#{Gitlab.config.gitolite.repos_path}/../gitolite/src/VERSION" if File.exists?(gitolite_version_file) && File.readable?(gitolite_version_file) gitolite_version = File.read(gitolite_version_file) end @@ -73,11 +73,11 @@ namespace :gitlab do puts "" puts "Gitolite information".yellow puts "Version:\t#{gitolite_version || "unknown".red}" - puts "Admin URI:\t#{Gitlab.config.gitolite_admin_uri}" - puts "Admin Key:\t#{Gitlab.config.gitolite_admin_key}" - puts "Repositories:\t#{Gitlab.config.git_base_path}" - puts "Hooks:\t\t#{Gitlab.config.git_hooks_path}" - puts "Git:\t\t#{Gitlab.config.git.path}" + puts "Admin URI:\t#{Gitlab.config.gitolite.admin_uri}" + puts "Admin Key:\t#{Gitlab.config.gitolite.admin_key}" + puts "Repositories:\t#{Gitlab.config.gitolite.repos_path}" + puts "Hooks:\t\t#{Gitlab.config.gitolite.hooks_path}" + puts "Git:\t\t#{Gitlab.config.git.bin_path}" end diff --git a/spec/lib/gitolite_spec.rb b/spec/lib/gitolite_spec.rb index cc8ce8b2cce..8075b99ed99 100644 --- a/spec/lib/gitolite_spec.rb +++ b/spec/lib/gitolite_spec.rb @@ -16,7 +16,7 @@ describe Gitlab::Gitolite do it { should respond_to :create_repository } it { should respond_to :remove_repository } - it { gitolite.url_to_repo('diaspora').should == Gitlab.config.ssh_path + "diaspora.git" } + it { gitolite.url_to_repo('diaspora').should == Gitlab.config.gitolite.ssh_path_prefix + "diaspora.git" } it "should call config update" do gitolite_config.should_receive(:update_project!) diff --git a/spec/lib/project_mover_spec.rb b/spec/lib/project_mover_spec.rb index af24635d82b..2362bc2667b 100644 --- a/spec/lib/project_mover_spec.rb +++ b/spec/lib/project_mover_spec.rb @@ -6,7 +6,7 @@ describe Gitlab::ProjectMover do before do FileUtils.rm_rf base_path if File.exists? base_path - Gitlab.config.stub(git_base_path: base_path) + Gitlab.config.gitolite.stub(repos_path: base_path) @project = create(:project) end diff --git a/spec/models/project_hooks_spec.rb b/spec/models/project_hooks_spec.rb index 39a628a9436..df6a3831e30 100644 --- a/spec/models/project_hooks_spec.rb +++ b/spec/models/project_hooks_spec.rb @@ -108,7 +108,7 @@ describe Project, "Hooks" do it { should include(id: @commit.id) } it { should include(message: @commit.safe_message) } it { should include(timestamp: @commit.date.xmlschema) } - it { should include(url: "#{Gitlab.config.url}/#{project.code}/commit/#{@commit.id}") } + it { should include(url: "#{Gitlab.config.gitlab.url}/#{project.code}/commit/#{@commit.id}") } context "with a author" do subject { @data[:commits].first[:author] } diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index b9eafc7fa1e..83a76976098 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -148,7 +148,7 @@ describe Project do it "should return valid url to repo" do project = Project.new(path: "somewhere") - project.url_to_repo.should == Gitlab.config.ssh_path + "somewhere.git" + project.url_to_repo.should == Gitlab.config.gitolite.ssh_path_prefix + "somewhere.git" end it "should return path to repo" do @@ -158,7 +158,7 @@ describe Project do it "returns the full web URL for this repo" do project = Project.new(path: "somewhere") - project.web_url.should == "#{Gitlab.config.url}/somewhere" + project.web_url.should == "#{Gitlab.config.gitlab.url}/somewhere" end describe "last_activity methods" do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7728b1e9d84..9f066c0e7f3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -42,8 +42,8 @@ RSpec.configure do |config| # ActiveRecord::Base.observers.enable(:all) # Use tmp dir for FS manipulations - Gitlab.config.stub(git_base_path: Rails.root.join('tmp', 'test-git-base-path')) - FileUtils.rm_rf Gitlab.config.git_base_path - FileUtils.mkdir_p Gitlab.config.git_base_path + Gitlab.config.gitolite.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path')) + FileUtils.rm_rf Gitlab.config.gitolite.repos_path + FileUtils.mkdir_p Gitlab.config.gitolite.repos_path end end diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index b0f554c52ab..26b461c3825 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -39,6 +39,6 @@ describe PostReceive do end def pwd(project) - File.join(Gitlab.config.git_base_path, project.path_with_namespace) + File.join(Gitlab.config.gitolite.repos_path, project.path_with_namespace) end end -- cgit v1.2.1 From 757c7a52916fbee75a94ee453e055e8ce02a428e Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 15 Dec 2012 02:19:21 +0100 Subject: Fix gravatar and ldap config --- app/helpers/application_helper.rb | 2 +- app/views/profiles/show.html.haml | 2 +- config/initializers/devise.rb | 22 ++++++++++------------ spec/helpers/application_helper_spec.rb | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c9e939801c2..52715a265bd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,7 +34,7 @@ module ApplicationHelper def gravatar_icon(user_email = '', size = nil) size = 40 if size.nil? || size <= 0 - if Gitlab.config.disable_gravatar? || user_email.blank? + if !Gitlab.config.gravatar.enabled || user_email.blank? 'no_avatar.png' else gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 177119f093a..934c1fdf7c4 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -33,7 +33,7 @@ %ul %li %p You can change your password on Account page - -unless Gitlab.config.disable_gravatar? + - if Gitlab.config.gravatar.enabled %li %p You can change your avatar at #{link_to "gravatar.com", "http://gravatar.com"} diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index db7246a1b9b..ed3ab71862a 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -205,20 +205,18 @@ Devise.setup do |config| # manager.default_strategies(:scope => :user).unshift :some_external_strategy # end - gl = Gitlab.config - - if gl.ldap_enabled? + if Gitlab.config.ldap.enabled config.omniauth :ldap, - :host => gl.ldap['host'], - :base => gl.ldap['base'], - :uid => gl.ldap['uid'], - :port => gl.ldap['port'], - :method => gl.ldap['method'], - :bind_dn => gl.ldap['bind_dn'], - :password => gl.ldap['password'] + :host => Gitlab.config.ldap['host'], + :base => Gitlab.config.ldap['base'], + :uid => Gitlab.config.ldap['uid'], + :port => Gitlab.config.ldap['port'], + :method => Gitlab.config.ldap['method'], + :bind_dn => Gitlab.config.ldap['bind_dn'], + :password => Gitlab.config.ldap['password'] end - gl.omniauth_providers.each do |gl_provider| - config.omniauth gl_provider['name'].to_sym, gl_provider['app_id'], gl_provider['app_secret'] + Gitlab.config.omniauth.providers.each do |provider| + config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'] end end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index df66e3b48bd..ba1af08421b 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -43,7 +43,7 @@ describe ApplicationHelper do let(:user_email) { 'user@email.com' } it "should return a generic avatar path when Gravatar is disabled" do - Gitlab.config.stub(:disable_gravatar?).and_return(true) + Gitlab.config.gravatar.stub(:enabled).and_return(false) gravatar_icon(user_email).should == 'no_avatar.png' end @@ -63,7 +63,7 @@ describe ApplicationHelper do it "should return custom gravatar path when gravatar_url is set" do stub!(:request).and_return(double(:ssl? => false)) - Gitlab.config.stub(:gravatar_url).and_return('http://example.local/?s=%{size}&hash=%{hash}') + Gitlab.config.gravatar.stub(:plain_url).and_return('http://example.local/?s=%{size}&hash=%{hash}') gravatar_icon(user_email, 20).should == 'http://example.local/?s=20&hash=b58c6f14d292556214bd64909bcdb118' end -- cgit v1.2.1 From 4c8ac320dd72f6094bc05128a8c8878e5836f8c4 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 16:51:14 +0100 Subject: Updated gitlab:check task --- lib/tasks/gitlab/check.rake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 0a452686c43..d1f814080b5 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -90,7 +90,7 @@ namespace :gitlab do end def check_gitlab_config_not_outdated - print "GitLab config not outdated? ... " + print "GitLab config outdated? ... " gitlab_config_file = Rails.root.join("config", "gitlab.yml") unless File.exists?(gitlab_config_file) @@ -98,11 +98,12 @@ namespace :gitlab do end # omniauth or ldap could have been deleted from the file - if File.read(gitlab_config_file) =~ /^web:/ - puts "yes".green + unless Gitlab.config.pre_40_config + puts "no".green else - puts "no".red + puts "yes".red try_fixing_it( + "Backup your config/gitlab.yml", "Copy config/gitlab.yml.example to config/gitlab.yml", "Update config/gitlab.yml to match your setup" ) -- cgit v1.2.1 From 27ff15ad3e19bfbd6143f43cc61043fd78ffd3e1 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 18:53:07 +0100 Subject: Remove development.md --- doc/development.md | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 doc/development.md diff --git a/doc/development.md b/doc/development.md deleted file mode 100644 index b7213adc1e0..00000000000 --- a/doc/development.md +++ /dev/null @@ -1,36 +0,0 @@ -## Development tips: - - -### Installation - -Install the Gitlab development in a virtual machine with the [Gitlab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm). Installing it in a virtual machine makes it much easier to set up all the dependencies for integration testing. - - -### Start application in development mode - -#### 1. Via foreman - - bundle exec foreman start -p 3000 - -#### 2. Manually - - bundle exec rails s - bundle exec rake environment resque:work QUEUE=* VVERBOSE=1 - - -### Test DB setup & seed - - bundle exec rake db:setup RAILS_ENV=test - bundle exec rake db:seed_fu RAILS_ENV=test - - -### Run the Tests - - # All in one - bundle exec rake gitlab:test - - # Rspec - bundle exec rake spec - - # Spinach - bundle exec rake spinach -- cgit v1.2.1 From 691799a3fe2167ceacd048effddb7adfde1c4c78 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 18:53:23 +0100 Subject: Update CONTRIBUTING.md --- CONTRIBUTING.md | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 822baa032aa..00304dd3d64 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,32 +1,26 @@ -## Usage & Configuration +# Contact & support -Do you have a question related to usage or configuration, please head over to the [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq). +If you want quick help, head over to our [Support Forum](https://groups.google.com/forum/#!forum/gitlabhq). +Otherwise you can follow our [Issue Submission Guide](https://github.com/gitlabhq/gitlabhq/wiki/Issue-Submission-Guide) for a more systematic and thorough guide to solving your issues. -## Contribute to GitLab +# Contribute to GitLab -If you want to contribute to GitLab, follow this process: +## Recipes -1. Fork the project -2. Create a feature branch -3. Code -4. Create a pull request +We collect user submitted installation scripts and config file templates for platforms we don't support officially. +We believe there is merit in allowing a certain amount of diversity. +You can get and submit your solution to running/configuring GitLab with your favorite OS/distro, database, web server, cloud hoster, configuration management tool, etc. -We will only accept pull requests if: +Help us improve the collection of [GitLab Recipes](https://github.com/gitlabhq/gitlab-recipes/) -* Your code has proper tests and all tests pass -* Your code can be merged w/o problems -* It won't break existing functionality -* It's quality code -* We like it :) -For examples of feedback on pull requests please look at the [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed). +## Feature suggestions -## Installation +Follow the [Issue Submission Guide](https://github.com/gitlabhq/gitlabhq/wiki/Issue-Submission-Guide) and support other peoples ideas or propose your own. -Install the Gitlab development in a virtual machine with the [Gitlab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm). Installing it in a virtual machine makes it much easier to set up all the dependencies for integration testing. -## Running tests +## Code -For more information on running the tests please read the [development tips](https://github.com/gitlabhq/gitlabhq/blob/master/doc/development.md) +Follow our [Developer Guide](https://github.com/gitlabhq/gitlabhq/wiki/Developer-Guide) to set you up for hacking on GitLab. -- cgit v1.2.1 From 77d632890bce9835929daeec829b529799915815 Mon Sep 17 00:00:00 2001 From: Valeriy Sizov Date: Tue, 18 Dec 2012 20:52:18 +0200 Subject: refactoring gfm_autocomplete --- app/assets/javascripts/gfm_auto_complete.js.coffee | 34 +++++----------------- doc/api/projects.md | 1 + lib/api/projects.rb | 7 ++++- spec/requests/api/projects_spec.rb | 8 +++++ 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index a7038161668..1cc9d34dd80 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/app/assets/javascripts/gfm_auto_complete.js.coffee @@ -13,7 +13,6 @@ GitLab.GfmAutoComplete = url: '' params: private_token: '' - page: 1 template: '

  • ${username} ${name}
    • ' # Add GFM auto-completion to all input fields, that accept GFM input. @@ -29,30 +28,11 @@ GitLab.GfmAutoComplete = input.atWho '@', tpl: @Members.template callback: (query, callback) => - (getMoreMembers = => - $.getJSON(@Members.url, @Members.params).done (members) => - # pick the data we need - newMembersData = $.map(members, (m) -> - username: m.username - name: m.name - ) + request_params = $.extend({}, @Members.params, query: query) + $.getJSON(@Members.url, request_params).done (members) => + new_members_data = $.map(members, (m) -> + username: m.username, + name: m.name + ) + callback(new_members_data) - # add the new page of data to the rest - $.merge(@Members.data, newMembersData) - - # show the pop-up with a copy of the current data - callback(@Members.data[..]) - - # are we past the last page? - if newMembersData.length is 0 - # set static data and stop callbacks - input.atWho '@', - data: @Members.data - callback: null - else - # get next page - getMoreMembers() - - # so the next callback requests the next page - @Members.params.page += 1 - ).call() diff --git a/doc/api/projects.md b/doc/api/projects.md index fac4107fd93..c8cb263e705 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -126,6 +126,7 @@ GET /projects/:id/members Parameters: + `id` (required) - The ID or code name of a project ++ `query` - Query string ## Get project team member diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 384dbcd5473..044a6272766 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -57,10 +57,15 @@ module Gitlab # # Parameters: # id (required) - The ID or code name of a project + # query - Query string # Example Request: # GET /projects/:id/members get ":id/members" do - @members = paginate user_project.users + if params[:query].present? + @members = paginate user_project.users.where("username LIKE ?", "%#{params[:query]}%") + else + @members = paginate user_project.users + end present @members, with: Entities::ProjectMember, project: user_project end diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index b4e2fbbdab8..a396516438d 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -117,6 +117,14 @@ describe Gitlab::API do json_response.count.should == 2 json_response.first['email'].should == user.email end + + it "finds team members with query string" do + get api("/projects/#{project.path}/members", user), query: user.username + response.status.should == 200 + json_response.should be_an Array + json_response.count.should == 1 + json_response.first['email'].should == user.email + end end describe "GET /projects/:id/members/:user_id" do -- cgit v1.2.1 From d188adfd97417be489df8a1cef2ca3bf986676ee Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 21:16:42 +0200 Subject: Changelog updated. Added warnings to username form --- CHANGELOG | 11 +++++++++++ app/views/profiles/account.html.haml | 3 +++ config/gitlab.yml.example | 3 +++ 3 files changed, 17 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 73933e0be4b..95ed6e8db1c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,15 @@ v 4.0.0 + - Reorganized settings + - Fixed commits compare + - Refactored scss + - Improve status checks + - Validates presence of User#name + - Fixed postgres support + - Removed sqlite support + - Modified post-receive hook + - Milestones can be closed now + - Show comment events on dashboard + - Quick add team members via group#people page - [API] expose created date for hooks and SSH keys - [API] list, create issue notes - [API] list, create snippet notes diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index 3b5099edbdb..3c290948d6c 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -71,6 +71,9 @@ %span.update-failed.cred.hide %i.icon-ok Failed + %ul.cred + %li It will change web url for personal projects. + %li It will change the git path to repositories for personal projects. .input = f.submit 'Save username', class: "btn save-btn" diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c8387fa2caf..067dbd9b72b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1,3 +1,6 @@ +# # # # # # # # # # # # # # # # # # +# Gitlab application config file # +# # # # # # # # # # # # # # # # # # # # 1. GitLab app settings -- cgit v1.2.1 From e3a7e43ff4fb1ebf9e594b32abcb980a8b905c49 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 19:31:29 +0100 Subject: Rename gitlab:activate_namespaces to gitlab:enable_namespaces --- doc/raketasks/features.md | 4 +- lib/tasks/gitlab/activate_namespaces.rake | 67 ------------------------------- lib/tasks/gitlab/enable_namespaces.rake | 67 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 lib/tasks/gitlab/activate_namespaces.rake create mode 100644 lib/tasks/gitlab/enable_namespaces.rake diff --git a/doc/raketasks/features.md b/doc/raketasks/features.md index 2a66b1caca7..9dc6a4ef5eb 100644 --- a/doc/raketasks/features.md +++ b/doc/raketasks/features.md @@ -1,6 +1,6 @@ ### Enable usernames and namespaces for user projects -This command will enable the namespace feature introduced in v4.0. It will move every project in its namespace folder. +This command will enable the namespaces feature introduced in v4.0. It will move every project in its namespace folder. Note: @@ -13,7 +13,7 @@ Old path: `git@example.org:myrepo.git` New path: `git@example.org:username/myrepo.git` or `git@example.org:groupname/myrepo.git` ``` -bundle exec rake gitlab:activate_namespaces +bundle exec rake gitlab:enable_namespaces ``` diff --git a/lib/tasks/gitlab/activate_namespaces.rake b/lib/tasks/gitlab/activate_namespaces.rake deleted file mode 100644 index 70ec88d0b3f..00000000000 --- a/lib/tasks/gitlab/activate_namespaces.rake +++ /dev/null @@ -1,67 +0,0 @@ -namespace :gitlab do - desc "GITLAB | Enable usernames and namespaces for user projects" - task activate_namespaces: :environment do - print "\nUsernames for users:".yellow - - User.find_each(batch_size: 500) do |user| - next if user.namespace - - User.transaction do - username = user.email.match(/^[^@]*/)[0] - if user.update_attributes!(username: username) - print '.'.green - else - print 'F'.red - end - end - end - - print "\n\nDirs for groups:".yellow - - Group.find_each(batch_size: 500) do |group| - if group.ensure_dir_exist - print '.'.green - else - print 'F'.red - end - end - - print "\n\nMove projects from groups under groups dirs:".yellow - git_path = Gitlab.config.gitolite.repos_path - - Project.where('namespace_id IS NOT NULL').find_each(batch_size: 500) do |project| - next unless project.group - - group = project.group - - puts "\n" - print " * #{project.name}: " - - new_path = File.join(git_path, project.path_with_namespace + '.git') - - if File.exists?(new_path) - print "ok. already at #{new_path}".cyan - next - end - - old_path = File.join(git_path, project.path + '.git') - - unless File.exists?(old_path) - print "missing. not found at #{old_path}".red - next - end - - begin - Gitlab::ProjectMover.new(project, '', group.path).execute - print "ok. Moved to #{new_path}".green - rescue - print "Failed moving to #{new_path}".red - end - end - - print "\n\nRebuild gitolite:".yellow - gitolite = Gitlab::Gitolite.new - gitolite.update_repositories(Project.where('namespace_id IS NOT NULL')) - puts "\n" - end -end diff --git a/lib/tasks/gitlab/enable_namespaces.rake b/lib/tasks/gitlab/enable_namespaces.rake new file mode 100644 index 00000000000..1be9ba6469d --- /dev/null +++ b/lib/tasks/gitlab/enable_namespaces.rake @@ -0,0 +1,67 @@ +namespace :gitlab do + desc "GITLAB | Enable usernames and namespaces for user projects" + task enable_namespaces: :environment do + print "\nUsernames for users:".yellow + + User.find_each(batch_size: 500) do |user| + next if user.namespace + + User.transaction do + username = user.email.match(/^[^@]*/)[0] + if user.update_attributes!(username: username) + print '.'.green + else + print 'F'.red + end + end + end + + print "\n\nDirs for groups:".yellow + + Group.find_each(batch_size: 500) do |group| + if group.ensure_dir_exist + print '.'.green + else + print 'F'.red + end + end + + print "\n\nMove projects from groups under groups dirs:".yellow + git_path = Gitlab.config.gitolite.repos_path + + Project.where('namespace_id IS NOT NULL').find_each(batch_size: 500) do |project| + next unless project.group + + group = project.group + + puts "\n" + print " * #{project.name}: " + + new_path = File.join(git_path, project.path_with_namespace + '.git') + + if File.exists?(new_path) + print "ok. already at #{new_path}".cyan + next + end + + old_path = File.join(git_path, project.path + '.git') + + unless File.exists?(old_path) + print "missing. not found at #{old_path}".red + next + end + + begin + Gitlab::ProjectMover.new(project, '', group.path).execute + print "ok. Moved to #{new_path}".green + rescue + print "Failed moving to #{new_path}".red + end + end + + print "\n\nRebuild gitolite:".yellow + gitolite = Gitlab::Gitolite.new + gitolite.update_repositories(Project.where('namespace_id IS NOT NULL')) + puts "\n" + end +end -- cgit v1.2.1 From 501f048846bad9a66583bb73d448564eca752905 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 19:38:44 +0100 Subject: Rename gitlab:app:enable_automerge to gitlab:enable_automerge --- doc/raketasks/features.md | 2 +- lib/tasks/gitlab/check.rake | 2 +- lib/tasks/gitlab/enable_automerge.rake | 20 +++++++++----------- lib/tasks/gitlab/setup.rake | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/doc/raketasks/features.md b/doc/raketasks/features.md index 9dc6a4ef5eb..7a2a4b668bd 100644 --- a/doc/raketasks/features.md +++ b/doc/raketasks/features.md @@ -22,7 +22,7 @@ bundle exec rake gitlab:enable_namespaces This command will enable the auto merge feature. After this you will be able to **merge a merge request** via GitLab and use the **online editor**. ``` -bundle exec rake gitlab:app:enable_automerge +bundle exec rake gitlab:enable_automerge ``` Example output: diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index d1f814080b5..20d65e6e0d0 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -192,7 +192,7 @@ namespace :gitlab do else puts "no".red try_fixing_it( - "sudo -u gitlab -H bundle exec rake gitlab:app:enable_automerge" + "sudo -u gitlab -H bundle exec rake gitlab:enable_automerge" ) for_more_information( "doc/raketasks/maintenance.md " diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake index 13b4bab6edc..a543a8a7385 100644 --- a/lib/tasks/gitlab/enable_automerge.rake +++ b/lib/tasks/gitlab/enable_automerge.rake @@ -1,17 +1,15 @@ namespace :gitlab do - namespace :app do - desc "GITLAB | Enable auto merge" - task :enable_automerge => :environment do - Gitlab::Gitolite.new.enable_automerge + desc "GITLAB | Enable auto merge" + task :enable_automerge => :environment do + Gitlab::Gitolite.new.enable_automerge - Project.find_each do |project| - if project.repo_exists? && !project.satellite.exists? - puts "Creating satellite for #{project.name}...".green - project.satellite.create - end + Project.find_each do |project| + if project.repo_exists? && !project.satellite.exists? + puts "Creating satellite for #{project.name}...".green + project.satellite.create end - - puts "Done!".green end + + puts "Done!".green end end diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index 08f35c7e3f0..572a22aa1f6 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -4,7 +4,7 @@ namespace :gitlab do task :setup => [ 'db:setup', 'db:seed_fu', - 'gitlab:app:enable_automerge' + 'gitlab:enable_automerge' ] end end -- cgit v1.2.1 From 75dd7042940cc6fe7532d42612e1b0db0729a86d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 22:16:51 +0200 Subject: Send update instructions after project namespace id changed or namespace path changed --- app/mailers/notify.rb | 6 ++++++ app/models/namespace.rb | 9 +++++++- app/models/project.rb | 6 ++++++ app/observers/project_observer.rb | 3 ++- app/views/notify/project_was_moved_email.html.haml | 25 ++++++++++++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 app/views/notify/project_was_moved_email.html.haml diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index f954a05c883..ab35677fb64 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -102,6 +102,12 @@ class Notify < ActionMailer::Base end + def project_was_moved_email(user_project_id) + @users_project = UsersProject.find user_project_id + @project = @users_project.project + mail(to: @users_project.user.email, + subject: subject("project was moved")) + end # # User diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 3c087e26c19..8c90f5aee26 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -59,7 +59,10 @@ class Namespace < ActiveRecord::Base if File.exists?(new_path) raise "Already exists" end - system("mv #{old_path} #{new_path}") + + if system("mv #{old_path} #{new_path}") + send_update_instructions + end end end @@ -67,4 +70,8 @@ class Namespace < ActiveRecord::Base dir_path = File.join(Gitlab.config.gitolite.repos_path, path) system("rm -rf #{dir_path}") end + + def send_update_instructions + projects.each(&:send_move_instructions) + end end diff --git a/app/models/project.rb b/app/models/project.rb index 6a427fddfac..3e5c912e0b4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -259,4 +259,10 @@ class Project < ActiveRecord::Base merge_requests end end + + def send_move_instructions + self.users_projects.each do |member| + Notify.project_was_moved_email(member.id).deliver + end + end end diff --git a/app/observers/project_observer.rb b/app/observers/project_observer.rb index bd41e51e8e4..b1c694569d7 100644 --- a/app/observers/project_observer.rb +++ b/app/observers/project_observer.rb @@ -3,7 +3,8 @@ class ProjectObserver < ActiveRecord::Observer project.update_repository end - def after_save(project) + def after_update(project) + project.send_move_instructions if project.namespace_id_changed? end def after_destroy(project) diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml new file mode 100644 index 00000000000..e81ae70ba5a --- /dev/null +++ b/app/views/notify/project_was_moved_email.html.haml @@ -0,0 +1,25 @@ +%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} + %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #555; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"} + %tr + %td{width: "21"} + %td + %h3 + = "Project was moved in another location" + %td{width: "21"} + %tr + %td{width: "21"} + %td + %p + Project is now accessible via next link + = link_to project_url(@project) do + = @project.name_with_namespace + %p + You may want to update your local repository with new remote: + %br + %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"} + %tr + %td{valign: "top"} + %p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" } + git remote set-url origin #{@project.ssh_url_to_repo} + %br + %td{ width: "21"} -- cgit v1.2.1 From 56f9a674a6f398abc2541b435808361b13b7e713 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 21:52:26 +0100 Subject: Add gitlab:satellites:create as an alias for gitlab:enable_automerge --- doc/raketasks/maintenance.md | 10 ++++++++++ lib/tasks/gitlab/check.rake | 4 +++- lib/tasks/gitlab/enable_automerge.rake | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md index 7be631a773d..bb8e1ed29f7 100644 --- a/doc/raketasks/maintenance.md +++ b/doc/raketasks/maintenance.md @@ -139,6 +139,16 @@ Checking GitLab ... Finished ``` +### (Re-)Create satellite repos + +This will create satellite repos for all your projects. +If necessary, remove the `tmp/repo_satellites` directory and rerun the command below. + +``` +bundle exec rake gitlab:satellites:create +``` + + ### Rebuild each key at gitolite config This will send all users ssh public keys to gitolite and grant them access (based on their permission) to their projects. diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 20d65e6e0d0..baa706d2bee 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -192,7 +192,9 @@ namespace :gitlab do else puts "no".red try_fixing_it( - "sudo -u gitlab -H bundle exec rake gitlab:enable_automerge" + "sudo -u gitlab -H bundle exec rake gitlab:satellites:create", + "If necessary, remove the tmp/repo_satellites directory ...", + "... and rerun the above command" ) for_more_information( "doc/raketasks/maintenance.md " diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake index a543a8a7385..ed3d6368a99 100644 --- a/lib/tasks/gitlab/enable_automerge.rake +++ b/lib/tasks/gitlab/enable_automerge.rake @@ -12,4 +12,9 @@ namespace :gitlab do puts "Done!".green end + + namespace :satellites do + desc "GITLAB | Create satellite repos" + task create: 'gitlab:enable_automerge' + end end -- cgit v1.2.1 From c9bf2bb288cffba2d4a30f1937ca88b9b92e64ed Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 20:17:09 +0100 Subject: Rename gitlab:app:backup_* to gitlab:backup:* Rename gitlab:app:db_* to gitlab:backup:db:* Rename gitlab:app:repo_* to gitlab:backup:repo:* Rename *_dump to *_create --- doc/raketasks/backup_restore.md | 4 +- lib/tasks/gitlab/backup.rake | 138 +++++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 69 deletions(-) diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 575467b4371..bbfeeb716fa 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -4,7 +4,7 @@ Creates a backup archive of the database and all repositories. This archive will The filename will be `[TIMESTAMP]_gitlab_backup.tar`. This timestamp can be used to restore an specific backup. ``` -bundle exec rake gitlab:app:backup_create +bundle exec rake gitlab:backup:create ``` Example output: @@ -40,7 +40,7 @@ Deleting old backups... [SKIPPING] ### Restore a previously created backup ``` -bundle exec rake gitlab:app:backup_restore +bundle exec rake gitlab:backup:restore ``` Options: diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index 307a6288a24..b7a64394ad0 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -1,12 +1,12 @@ require 'active_record/fixtures' namespace :gitlab do - namespace :app do + namespace :backup do # Create backup of GitLab system desc "GITLAB | Create a backup of the GitLab system" - task :backup_create => :environment do - Rake::Task["gitlab:app:db_dump"].invoke - Rake::Task["gitlab:app:repo_dump"].invoke + task :create => :environment do + Rake::Task["gitlab:backup:db:create"].invoke + Rake::Task["gitlab:backup:repo:create"].invoke Dir.chdir(Gitlab.config.backup.path) @@ -54,7 +54,7 @@ namespace :gitlab do # Restore backup of GitLab system desc "GITLAB | Restore a previously created backup" - task :backup_restore => :environment do + task :restore => :environment do Dir.chdir(Gitlab.config.backup.path) # check for existing backups in the backup dir @@ -62,7 +62,7 @@ namespace :gitlab do puts "no backups found" if file_list.count == 0 if file_list.count > 1 && ENV["BACKUP"].nil? puts "Found more than one backup, please specify which one you want to restore:" - puts "rake gitlab:app:backup_restore BACKUP=timestamp_of_backup" + puts "rake gitlab:backup:restore BACKUP=timestamp_of_backup" exit 1; end @@ -93,8 +93,8 @@ namespace :gitlab do exit 1 end - Rake::Task["gitlab:app:db_restore"].invoke - Rake::Task["gitlab:app:repo_restore"].invoke + Rake::Task["gitlab:backup:db:restore"].invoke + Rake::Task["gitlab:backup:repo:restore"].invoke # cleanup: remove tmp files print "Deleting tmp directories..." @@ -110,82 +110,86 @@ namespace :gitlab do ################################# REPOSITORIES ################################# - task :repo_dump => :environment do - backup_path_repo = File.join(Gitlab.config.backup.path, "repositories") - FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo) - puts "Dumping repositories:" - project = Project.all.map { |n| [n.path, n.path_to_repo] } - project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] - project.each do |project| - print "- Dumping repository #{project.first}... " - if Kernel.system("cd #{project.second} > /dev/null 2>&1 && git bundle create #{backup_path_repo}/#{project.first}.bundle --all > /dev/null 2>&1") - puts "[DONE]".green - else - puts "[FAILED]".red + namespace :repo do + task :create => :environment do + backup_path_repo = File.join(Gitlab.config.backup.path, "repositories") + FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo) + puts "Dumping repositories:" + project = Project.all.map { |n| [n.path, n.path_to_repo] } + project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] + project.each do |project| + print "- Dumping repository #{project.first}... " + if Kernel.system("cd #{project.second} > /dev/null 2>&1 && git bundle create #{backup_path_repo}/#{project.first}.bundle --all > /dev/null 2>&1") + puts "[DONE]".green + else + puts "[FAILED]".red + end end end - end - task :repo_restore => :environment do - backup_path_repo = File.join(Gitlab.config.backup.path, "repositories") - puts "Restoring repositories:" - project = Project.all.map { |n| [n.path, n.path_to_repo] } - project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] - project.each do |project| - print "- Restoring repository #{project.first}... " - FileUtils.rm_rf(project.second) if File.dirname(project.second) # delete old stuff - if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1") - permission_commands = [ - "sudo chmod -R g+rwX #{Gitlab.config.gitolite.repos_path}", - "sudo chown -R #{Gitlab.config.gitolite.ssh_user}:#{Gitlab.config.gitolite.ssh_user} #{Gitlab.config.gitolite.repos_path}" - ] - permission_commands.each { |command| Kernel.system(command) } - puts "[DONE]".green - else - puts "[FAILED]".red + task :restore => :environment do + backup_path_repo = File.join(Gitlab.config.backup.path, "repositories") + puts "Restoring repositories:" + project = Project.all.map { |n| [n.path, n.path_to_repo] } + project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] + project.each do |project| + print "- Restoring repository #{project.first}... " + FileUtils.rm_rf(project.second) if File.dirname(project.second) # delete old stuff + if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1") + permission_commands = [ + "sudo chmod -R g+rwX #{Gitlab.config.git_base_path}", + "sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}" + ] + permission_commands.each { |command| Kernel.system(command) } + puts "[DONE]".green + else + puts "[FAILED]".red + end end end end ###################################### DB ###################################### - task :db_dump => :environment do - backup_path_db = File.join(Gitlab.config.backup.path, "db") - FileUtils.mkdir_p(backup_path_db) unless Dir.exists?(backup_path_db) - - puts "Dumping database tables:" - ActiveRecord::Base.connection.tables.each do |tbl| - print "- Dumping table #{tbl}... " - count = 1 - File.open(File.join(backup_path_db, tbl + ".yml"), "w+") do |file| - ActiveRecord::Base.connection.select_all("SELECT * FROM `#{tbl}`").each do |line| - line.delete_if{|k,v| v.blank?} - output = {tbl + '_' + count.to_s => line} - file << output.to_yaml.gsub(/^---\n/,'') + "\n" - count += 1 + namespace :db do + task :create => :environment do + backup_path_db = File.join(Gitlab.config.backup.path, "db") + FileUtils.mkdir_p(backup_path_db) unless Dir.exists?(backup_path_db) + + puts "Dumping database tables:" + ActiveRecord::Base.connection.tables.each do |tbl| + print "- Dumping table #{tbl}... " + count = 1 + File.open(File.join(backup_path_db, tbl + ".yml"), "w+") do |file| + ActiveRecord::Base.connection.select_all("SELECT * FROM `#{tbl}`").each do |line| + line.delete_if{|k,v| v.blank?} + output = {tbl + '_' + count.to_s => line} + file << output.to_yaml.gsub(/^---\n/,'') + "\n" + count += 1 + end + puts "[DONE]".green end - puts "[DONE]".green end end - end - task :db_restore=> :environment do - backup_path_db = File.join(Gitlab.config.backup.path, "db") + task :restore=> :environment do + backup_path_db = File.join(Gitlab.config.backup.path, "db") - puts "Restoring database tables:" - Rake::Task["db:reset"].invoke + puts "Restoring database tables:" + Rake::Task["db:reset"].invoke - Dir.glob(File.join(backup_path_db, "*.yml") ).each do |dir| - fixture_file = File.basename(dir, ".*" ) - print "- Loading fixture #{fixture_file}..." - if File.size(dir) > 0 - ActiveRecord::Fixtures.create_fixtures(backup_path_db, fixture_file) - puts "[DONE]".green - else - puts "[SKIPPING]".yellow + Dir.glob(File.join(backup_path_db, "*.yml") ).each do |dir| + fixture_file = File.basename(dir, ".*" ) + print "- Loading fixture #{fixture_file}..." + if File.size(dir) > 0 + ActiveRecord::Fixtures.create_fixtures(backup_path_db, fixture_file) + puts "[DONE]".green + else + puts "[SKIPPING]".yellow + end end end end - end # namespace end: app + end # namespace end: backup end # namespace end: gitlab -- cgit v1.2.1 From 1acff973c85fb836c6b28a5d36aafa4332029424 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 20:05:01 +0100 Subject: Rename add_user_to_project_teams to gitlab:import:user_to_projects Rename add_users_to_project_teams to gitlab:import:all_users_to_all_projects --- doc/raketasks/user_management.md | 4 ++-- lib/tasks/bulk_add_permission.rake | 20 -------------------- lib/tasks/gitlab/bulk_add_permission.rake | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 lib/tasks/bulk_add_permission.rake create mode 100644 lib/tasks/gitlab/bulk_add_permission.rake diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md index e4ca5280b78..021ce35931f 100644 --- a/doc/raketasks/user_management.md +++ b/doc/raketasks/user_management.md @@ -1,7 +1,7 @@ ### Add user to as a developer to all projects ``` -bundle exec rake add_user_to_project_teams[username@domain.tld] +bundle exec rake gitlab:import:user_to_projects[username@domain.tld] ``` @@ -12,5 +12,5 @@ Notes: * admin users are added as masters ``` -bundle exec rake add_users_to_project_teams +bundle exec rake gitlab:import:all_users_to_all_projects ``` diff --git a/lib/tasks/bulk_add_permission.rake b/lib/tasks/bulk_add_permission.rake deleted file mode 100644 index bf08ace8e9c..00000000000 --- a/lib/tasks/bulk_add_permission.rake +++ /dev/null @@ -1,20 +0,0 @@ -desc "Add all users to all projects (admin users are added as masters)" -task :add_users_to_project_teams => :environment do |t, args| - user_ids = User.where(:admin => false).pluck(:id) - admin_ids = User.where(:admin => true).pluck(:id) - - Project.find_each do |project| - puts "Importing #{user_ids.size} users into #{project.code}" - UsersProject.bulk_import(project, user_ids, UsersProject::DEVELOPER) - puts "Importing #{admin_ids.size} admins into #{project.code}" - UsersProject.bulk_import(project, admin_ids, UsersProject::MASTER) - end -end - -desc "Add user to as a developer to all projects" -task :add_user_to_project_teams, [:email] => :environment do |t, args| - user = User.find_by_email args.email - project_ids = Project.pluck(:id) - - UsersProject.user_bulk_import(user, project_ids, UsersProject::DEVELOPER) -end diff --git a/lib/tasks/gitlab/bulk_add_permission.rake b/lib/tasks/gitlab/bulk_add_permission.rake new file mode 100644 index 00000000000..36c51d060bc --- /dev/null +++ b/lib/tasks/gitlab/bulk_add_permission.rake @@ -0,0 +1,24 @@ +namespace :gitlab do + namespace :import do + desc "GITLAB | Add all users to all projects (admin users are added as masters)" + task :all_users_to_all_projects => :environment do |t, args| + user_ids = User.where(:admin => false).pluck(:id) + admin_ids = User.where(:admin => true).pluck(:id) + + Project.find_each do |project| + puts "Importing #{user_ids.size} users into #{project.code}" + UsersProject.bulk_import(project, user_ids, UsersProject::DEVELOPER) + puts "Importing #{admin_ids.size} admins into #{project.code}" + UsersProject.bulk_import(project, admin_ids, UsersProject::MASTER) + end + end + + desc "GITLAB | Add a specific user to all projects (as a developer)" + task :user_to_projects, [:email] => :environment do |t, args| + user = User.find_by_email args.email + project_ids = Project.pluck(:id) + + UsersProject.user_bulk_import(user, project_ids, UsersProject::DEVELOPER) + end + end +end \ No newline at end of file -- cgit v1.2.1 From 2a3f5dae0f562e08436934dbc95e0f6ed6902ee9 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 23:04:27 +0200 Subject: Fix email send on close/reopen issue. Display project name with namespace. remove css style --- app/mailers/notify.rb | 1 + app/observers/issue_observer.rb | 2 +- app/views/layouts/notify.html.haml | 17 +++++------------ app/views/notify/issue_status_changed_email.html.haml | 2 +- app/views/notify/new_issue_email.html.haml | 2 +- app/views/notify/new_merge_request_email.html.haml | 3 ++- app/views/notify/project_access_granted_email.html.haml | 15 ++++++++------- app/views/notify/project_was_moved_email.html.haml | 2 +- app/views/notify/reassigned_issue_email.html.haml | 2 +- .../notify/reassigned_merge_request_email.html.haml | 2 +- 10 files changed, 22 insertions(+), 26 deletions(-) diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index ab35677fb64..5cd9b82900c 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -31,6 +31,7 @@ class Notify < ActionMailer::Base def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id) @issue = Issue.find issue_id @issue_status = status + @project = @issue.project @updated_by = User.find updated_by_user_id mail(to: recipient(recipient_id), subject: subject("changed issue ##{@issue.id}", @issue.title)) diff --git a/app/observers/issue_observer.rb b/app/observers/issue_observer.rb index 9f9762aea07..131336be8b6 100644 --- a/app/observers/issue_observer.rb +++ b/app/observers/issue_observer.rb @@ -16,7 +16,7 @@ class IssueObserver < ActiveRecord::Observer if status Note.create_status_change_note(issue, current_user, status) [issue.author, issue.assignee].compact.each do |recipient| - Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) + Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user.id).deliver end end end diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 35bf5577e1c..c418e1dbc68 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -3,14 +3,7 @@ %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"} %title GitLab - :css - .header h1 {color: #BBBBBB !important; font: bold 22px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;} - .header p {color: #c6c6c6; font: normal 12px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 18px;} - .content h2 {color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; } - .content p {color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif;} - .content a {color: #0eb6ce; text-decoration: none;} - .footer p {font-size: 11px; color:#7d7a7a; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;} - .footer a {color: #0eb6ce; text-decoration: none;} + %body{bgcolor: "#EAEAEA", style: "margin: 0; padding: 0; background: #EAEAEA"} %table{align: "center", border: "0", cellpadding: "0", cellspacing: "0", style: "padding: 35px 0; background: #EAEAEA;", width: "100%"} %tr @@ -19,11 +12,11 @@ %tr %td{style: "font-size: 0px;", width: "20"} \  - %td{align: "left", style: "padding: 18px 0 10px;", width: "580"} - %h1{style: "color: #BBBBBB; font: normal 22px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"} + %td{align: "left", style: "padding: 10px 0", width: "580"} + %h1{style: "font-size: 24px; color: #BBBBBB; font: normal 22px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 32px;"} GITLAB - if @project - | #{@project.name} + → #{@project.name_with_namespace} %table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"} %tr= yield %tr @@ -35,5 +28,5 @@ %p{style: "font-size: 11px; color:#7d7a7a; margin: 0; padding: 0; font-family: Helvetica, Arial, sans-serif;"} You're receiving this notification because you are a member of the - if @project - #{@project.name} + #{@project.name_with_namespace} project team. diff --git a/app/views/notify/issue_status_changed_email.html.haml b/app/views/notify/issue_status_changed_email.html.haml index 59130f79d6c..c433e80c9e5 100644 --- a/app/views/notify/issue_status_changed_email.html.haml +++ b/app/views/notify/issue_status_changed_email.html.haml @@ -9,7 +9,7 @@ %tr %td{style: "font-size: 1px; line-height: 1px;", width: "21"} %td{align: "left", style: "padding: 20px 0 0;"} - %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} + %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "} = "Issue ##{@issue.id}" = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title %br diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml index 654d6cd12be..fba4b865487 100644 --- a/app/views/notify/new_issue_email.html.haml +++ b/app/views/notify/new_issue_email.html.haml @@ -9,7 +9,7 @@ %tr %td{style: "font-size: 1px; line-height: 1px;", width: "21"} %td{align: "left", style: "padding: 20px 0 0;"} - %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} + %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "} = "Issue ##{@issue.id}" = link_to_gfm truncate(@issue.title, length: 45), project_issue_url(@issue.project, @issue), title: @issue.title %br diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml index 151aac451fb..9819767011e 100644 --- a/app/views/notify/new_merge_request_email.html.haml +++ b/app/views/notify/new_merge_request_email.html.haml @@ -5,7 +5,8 @@ %td{align: "left", style: "padding: 20px 0 0;"} %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} = "New Merge Request !#{@merge_request.id}" - = link_to_gfm truncate(@merge_request.title, length: 16), project_merge_request_url(@merge_request.project, @merge_request) + %p{style: "color:#646464 !important; line-height: 26px; font-size: 16px; font-family: Helvetica, Arial, sans-serif; "} + = link_to_gfm truncate(@merge_request.title, length: 40), project_merge_request_url(@merge_request.project, @merge_request) %td{style: "font-size: 1px; line-height: 1px;", width: "21"} %tr %td{style: "font-size: 1px; line-height: 1px;", width: "21"} diff --git a/app/views/notify/project_access_granted_email.html.haml b/app/views/notify/project_access_granted_email.html.haml index 72b3f0658fc..11117bf0b33 100644 --- a/app/views/notify/project_access_granted_email.html.haml +++ b/app/views/notify/project_access_granted_email.html.haml @@ -1,14 +1,15 @@ %td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"} %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"} %tr - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} - %td{align: "left", style: "padding: 20px 0 0;"} - %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} + %td{width: "21"} + %td + %h2{style: "color:#646464;" } = "You have been granted #{@users_project.project_access_human} access to project" %td{style: "font-size: 1px; line-height: 1px;", width: "21"} %tr - %td{style: "font-size: 1px; line-height: 1px;", width: "21"} - %td{align: "left", style: "padding: 20px 0 0;"} - %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} - = link_to_gfm truncate(@project.name, length: 45), project_url(@project), title: @project.name + %td{width: "21"} + %td + %h3 + = link_to project_url(@project) do + = @project.name_with_namespace %br diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml index e81ae70ba5a..a0a7b65fc76 100644 --- a/app/views/notify/project_was_moved_email.html.haml +++ b/app/views/notify/project_was_moved_email.html.haml @@ -3,7 +3,7 @@ %tr %td{width: "21"} %td - %h3 + %h2 = "Project was moved in another location" %td{width: "21"} %tr diff --git a/app/views/notify/reassigned_issue_email.html.haml b/app/views/notify/reassigned_issue_email.html.haml index c7896af3a54..31a5d23242c 100644 --- a/app/views/notify/reassigned_issue_email.html.haml +++ b/app/views/notify/reassigned_issue_email.html.haml @@ -5,7 +5,7 @@ %td{align: "left", style: "padding: 20px 0 0;"} %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} = "Reassigned Issue ##{@issue.id}" - = link_to_gfm truncate(@issue.title, length: 16), project_issue_url(@issue.project, @issue) + = link_to_gfm truncate(@issue.title, length: 30), project_issue_url(@issue.project, @issue) %td{style: "font-size: 1px; line-height: 1px;", width: "21"} %tr %td{style: "font-size: 1px; line-height: 1px;", width: "21"} diff --git a/app/views/notify/reassigned_merge_request_email.html.haml b/app/views/notify/reassigned_merge_request_email.html.haml index e49b783635c..8f7308b3dba 100644 --- a/app/views/notify/reassigned_merge_request_email.html.haml +++ b/app/views/notify/reassigned_merge_request_email.html.haml @@ -5,7 +5,7 @@ %td{align: "left", style: "padding: 20px 0 0;"} %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} = "Reassigned Merge Request !#{@merge_request.id}" - = link_to_gfm truncate(@merge_request.title, length: 16), project_merge_request_url(@merge_request.project, @merge_request) + = link_to_gfm truncate(@merge_request.title, length: 30), project_merge_request_url(@merge_request.project, @merge_request) %td{style: "font-size: 1px; line-height: 1px;", width: "21"} %tr %td{style: "font-size: 1px; line-height: 1px;", width: "21"} -- cgit v1.2.1 From 4b649c2f4da31a22aaf658a4a512565e318ab037 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 20 Dec 2012 23:12:38 +0200 Subject: Release candidate 1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0c042a83799..3cdeb6b85ee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0pre +4.0.0rc1 -- cgit v1.2.1 From 0efc903eef01d2f1081fc9cf5fa68893c01e959a Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Thu, 20 Dec 2012 22:24:05 +0100 Subject: Fix text in project move mail --- app/views/notify/project_was_moved_email.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml index a0a7b65fc76..222bd0fecea 100644 --- a/app/views/notify/project_was_moved_email.html.haml +++ b/app/views/notify/project_was_moved_email.html.haml @@ -4,17 +4,17 @@ %td{width: "21"} %td %h2 - = "Project was moved in another location" + = "Project was moved to another location" %td{width: "21"} %tr %td{width: "21"} %td %p - Project is now accessible via next link + The project is now located under = link_to project_url(@project) do = @project.name_with_namespace %p - You may want to update your local repository with new remote: + To update the remote url in your local repository run: %br %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"} %tr -- cgit v1.2.1 From b510f8c4965b210cc1a583fc15dc09871669e1bf Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 21 Dec 2012 13:37:44 +0200 Subject: Fixed tests --- spec/observers/issue_observer_spec.rb | 8 ++++---- spec/tasks/gitlab/backup_rake_spec.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/observers/issue_observer_spec.rb b/spec/observers/issue_observer_spec.rb index 509c1d02b49..bbffbd342db 100644 --- a/spec/observers/issue_observer_spec.rb +++ b/spec/observers/issue_observer_spec.rb @@ -85,7 +85,7 @@ describe IssueObserver do it 'notification is delivered if the issue being closed' do issue.stub(:is_being_closed?).and_return(true) - Notify.should_receive(:issue_status_changed_email).twice + Notify.should_receive(:issue_status_changed_email).twice.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed') subject.after_update(issue) @@ -104,7 +104,7 @@ describe IssueObserver do issue_without_assignee.stub(:is_being_reassigned?).and_return(false) issue_without_assignee.stub(:is_being_closed?).and_return(true) issue_without_assignee.stub(:is_being_reopened?).and_return(false) - Notify.should_receive(:issue_status_changed_email).once + Notify.should_receive(:issue_status_changed_email).once.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue_without_assignee, some_user, 'closed') subject.after_update(issue_without_assignee) @@ -128,7 +128,7 @@ describe IssueObserver do it 'notification is delivered if the issue being reopened' do issue.stub(:is_being_reopened?).and_return(true) - Notify.should_receive(:issue_status_changed_email).twice + Notify.should_receive(:issue_status_changed_email).twice.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened') subject.after_update(issue) @@ -147,7 +147,7 @@ describe IssueObserver do issue_without_assignee.stub(:is_being_reassigned?).and_return(false) issue_without_assignee.stub(:is_being_closed?).and_return(false) issue_without_assignee.stub(:is_being_reopened?).and_return(true) - Notify.should_receive(:issue_status_changed_email).once + Notify.should_receive(:issue_status_changed_email).once.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue_without_assignee, some_user, 'reopened') subject.after_update(issue_without_assignee) diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index d9aa0543969..b17521e0148 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -15,8 +15,8 @@ describe 'gitlab:app namespace rake task' do end let :run_rake_task do - Rake::Task["gitlab:app:backup_restore"].reenable - Rake.application.invoke_task "gitlab:app:backup_restore" + Rake::Task["gitlab:backup:restore"].reenable + Rake.application.invoke_task "gitlab:backup:restore" end context 'gitlab version' do @@ -36,8 +36,8 @@ describe 'gitlab:app namespace rake task' do it 'should invoke restoration on mach' do YAML.stub :load_file => {:gitlab_version => gitlab_version} - Rake::Task["gitlab:app:db_restore"].should_receive :invoke - Rake::Task["gitlab:app:repo_restore"].should_receive :invoke + Rake::Task["gitlab:backup:db:restore"].should_receive :invoke + Rake::Task["gitlab:backup:repo:restore"].should_receive :invoke expect { run_rake_task }.to_not raise_error SystemExit end end -- cgit v1.2.1 From 931ec399bd16321f5bdd8e745f2f87dfe25a83ac Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 21 Dec 2012 18:43:46 +0100 Subject: Remove the code parameter from the projects API --- doc/api/projects.md | 4 ---- lib/api/entities.rb | 2 +- lib/api/projects.rb | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/api/projects.md b/doc/api/projects.md index c8cb263e705..42c20ff6e5f 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -10,7 +10,6 @@ GET /projects [ { "id": 3, - "code": "rails", "name": "rails", "description": null, "path": "rails", @@ -32,7 +31,6 @@ GET /projects }, { "id": 5, - "code": "gitlab", "name": "gitlab", "description": null, "path": "gitlab", @@ -70,7 +68,6 @@ Parameters: ```json { "id": 5, - "code": "gitlab", "name": "gitlab", "description": null, "path": "gitlab", @@ -103,7 +100,6 @@ POST /projects Parameters: + `name` (required) - new project name -+ `code` (optional) - new project code, uses project name if not set + `path` (optional) - new project path, uses project name if not set + `description` (optional) - short project description + `default_branch` (optional) - 'master' by default diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 070fbad27ed..92245a9f093 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -18,7 +18,7 @@ module Gitlab end class Project < Grape::Entity - expose :id, :code, :name, :description, :path, :default_branch + expose :id, :name, :description, :path, :default_branch expose :owner, using: Entities::UserBasic expose :private_flag, as: :private expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 044a6272766..2e140951484 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -27,7 +27,6 @@ module Gitlab # # Parameters: # name (required) - name for new project - # code (optional) - code for new project, uses project name if not set # path (optional) - path for new project, uses project name if not set # description (optional) - short project description # default_branch (optional) - 'master' by default -- cgit v1.2.1 From 8f01190eb5ec0f40d6f8874a3f3c79637000a709 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 21 Dec 2012 18:47:04 +0100 Subject: Remove all references tp the project code parameter from the API --- doc/api/issues.md | 8 ++++---- doc/api/merge_requests.md | 10 +++++----- doc/api/milestones.md | 8 ++++---- doc/api/notes.md | 18 +++++++++--------- doc/api/projects.md | 22 +++++++++++----------- doc/api/repositories.md | 10 +++++----- doc/api/snippets.md | 12 ++++++------ lib/api/issues.rb | 10 +++++----- lib/api/merge_requests.rb | 10 +++++----- lib/api/milestones.rb | 8 ++++---- lib/api/notes.rb | 12 ++++++------ lib/api/projects.rb | 44 ++++++++++++++++++++++---------------------- 12 files changed, 86 insertions(+), 86 deletions(-) diff --git a/doc/api/issues.md b/doc/api/issues.md index b5b5a4eadd4..0383b676073 100644 --- a/doc/api/issues.md +++ b/doc/api/issues.md @@ -78,7 +78,7 @@ GET /projects/:id/issues Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ## Single issue @@ -90,7 +90,7 @@ GET /projects/:id/issues/:issue_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `issue_id` (required) - The ID of a project issue ```json @@ -143,7 +143,7 @@ POST /projects/:id/issues Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `title` (required) - The title of an issue + `description` (optional) - The description of an issue + `assignee_id` (optional) - The ID of a user to assign issue @@ -162,7 +162,7 @@ PUT /projects/:id/issues/:issue_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `issue_id` (required) - The ID of a project's issue + `title` (optional) - The title of an issue + `description` (optional) - The description of an issue diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 86bd79ff43a..525c55d12c2 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -8,7 +8,7 @@ GET /projects/:id/merge_requests Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ```json [ @@ -50,7 +50,7 @@ GET /projects/:id/merge_request/:merge_request_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `merge_request_id` (required) - The ID of MR ```json @@ -92,7 +92,7 @@ POST /projects/:id/merge_requests Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `source_branch` (required) - The source branch + `target_branch` (required) - The target branch + `assignee_id` - Assignee user ID @@ -136,7 +136,7 @@ PUT /projects/:id/merge_request/:merge_request_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `merge_request_id` (required) - ID of MR + `source_branch` - The source branch + `target_branch` - The target branch @@ -182,7 +182,7 @@ POST /projects/:id/merge_request/:merge_request_id/comments Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `merge_request_id` (required) - ID of MR + `note` (required) - Text of comment diff --git a/doc/api/milestones.md b/doc/api/milestones.md index f68d8eb7d58..b997e83901b 100644 --- a/doc/api/milestones.md +++ b/doc/api/milestones.md @@ -8,7 +8,7 @@ GET /projects/:id/milestones Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ## Single milestone @@ -20,7 +20,7 @@ GET /projects/:id/milestones/:milestone_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `milestone_id` (required) - The ID of a project milestone ## New milestone @@ -33,7 +33,7 @@ POST /projects/:id/milestones Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `milestone_id` (required) - The ID of a project milestone + `title` (required) - The title of an milestone + `description` (optional) - The description of the milestone @@ -49,7 +49,7 @@ PUT /projects/:id/milestones/:milestone_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `milestone_id` (required) - The ID of a project milestone + `title` (optional) - The title of a milestone + `description` (optional) - The description of a milestone diff --git a/doc/api/notes.md b/doc/api/notes.md index dddb55edb93..bb33efb8c25 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -28,7 +28,7 @@ GET /projects/:id/notes Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ### List issue notes @@ -40,7 +40,7 @@ GET /projects/:id/issues/:issue_id/notes Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `issue_id` (required) - The ID of an issue ### List snippet notes @@ -53,7 +53,7 @@ GET /projects/:id/snippets/:snippet_id/notes Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of a snippet ## Single note @@ -68,7 +68,7 @@ GET /projects/:id/notes/:note_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `note_id` (required) - The ID of a wall note ### Single issue note @@ -81,7 +81,7 @@ GET /projects/:id/issues/:issue_id/:notes/:note_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `issue_id` (required) - The ID of a project issue + `note_id` (required) - The ID of an issue note @@ -95,7 +95,7 @@ GET /projects/:id/issues/:snippet_id/:notes/:note_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of a project snippet + `note_id` (required) - The ID of an snippet note @@ -111,7 +111,7 @@ POST /projects/:id/notes Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `body` (required) - The content of a note Will return created note with status `201 Created` on success, or `404 Not found` on fail. @@ -127,7 +127,7 @@ POST /projects/:id/issues/:issue_id/notes Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `issue_id` (required) - The ID of an issue + `body` (required) - The content of a note @@ -143,7 +143,7 @@ POST /projects/:id/snippets/:snippet_id/notes Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of an snippet + `body` (required) - The content of a note diff --git a/doc/api/projects.md b/doc/api/projects.md index 42c20ff6e5f..b38e60ee296 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -63,7 +63,7 @@ GET /projects/:id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ```json { @@ -121,7 +121,7 @@ GET /projects/:id/members Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `query` - Query string ## Get project team member @@ -134,7 +134,7 @@ GET /projects/:id/members/:user_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `user_id` (required) - The ID of a user ```json @@ -160,7 +160,7 @@ POST /projects/:id/members Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `user_id` (required) - The ID of a user to add + `access_level` (required) - Project access level @@ -176,7 +176,7 @@ PUT /projects/:id/members/:user_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `user_id` (required) - The ID of a team member + `access_level` (required) - Project access level @@ -192,7 +192,7 @@ DELETE /projects/:id/members/:user_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `user_id` (required) - The ID of a team member Status code `200` will be returned on success. @@ -207,7 +207,7 @@ GET /projects/:id/hooks Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project Will return hooks with status `200 OK` on success, or `404 Not found` on fail. @@ -221,7 +221,7 @@ GET /projects/:id/hooks/:hook_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `hook_id` (required) - The ID of a project hook Will return hook with status `200 OK` on success, or `404 Not found` on fail. @@ -236,7 +236,7 @@ POST /projects/:id/hooks Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `url` (required) - The hook URL Will return status `201 Created` on success, or `404 Not found` on fail. @@ -251,7 +251,7 @@ PUT /projects/:id/hooks/:hook_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `hook_id` (required) - The ID of a project hook + `url` (required) - The hook URL @@ -268,7 +268,7 @@ DELETE /projects/:id/hooks Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `hook_id` (required) - The ID of hook to delete Will return status `200 OK` on success, or `404 Not found` on fail. diff --git a/doc/api/repositories.md b/doc/api/repositories.md index 487ad9b2718..685797ad78d 100644 --- a/doc/api/repositories.md +++ b/doc/api/repositories.md @@ -8,7 +8,7 @@ GET /projects/:id/repository/branches Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ```json [ @@ -48,7 +48,7 @@ GET /projects/:id/repository/branches/:branch Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `branch` (required) - The name of the branch ```json @@ -87,7 +87,7 @@ GET /projects/:id/repository/tags Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ```json [ @@ -125,7 +125,7 @@ GET /projects/:id/repository/commits Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `ref_name` (optional) - The name of a repository branch or tag ```json @@ -159,7 +159,7 @@ GET /projects/:id/repository/commits/:sha/blob Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `sha` (required) - The commit or branch name + `filepath` (required) - The path the file diff --git a/doc/api/snippets.md b/doc/api/snippets.md index b9638ea8291..ceb8a63d06f 100644 --- a/doc/api/snippets.md +++ b/doc/api/snippets.md @@ -8,7 +8,7 @@ GET /projects/:id/snippets Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project ## Single snippet @@ -20,7 +20,7 @@ GET /projects/:id/snippets/:snippet_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of a project's snippet ```json @@ -52,7 +52,7 @@ GET /projects/:id/snippets/:snippet_id/raw Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of a project's snippet ## New snippet @@ -65,7 +65,7 @@ POST /projects/:id/snippets Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `title` (required) - The title of a snippet + `file_name` (required) - The name of a snippet file + `lifetime` (optional) - The expiration date of a snippet @@ -83,7 +83,7 @@ PUT /projects/:id/snippets/:snippet_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of a project's snippet + `title` (optional) - The title of a snippet + `file_name` (optional) - The name of a snippet file @@ -102,7 +102,7 @@ DELETE /projects/:id/snippets/:snippet_id Parameters: -+ `id` (required) - The ID or code name of a project ++ `id` (required) - The ID of a project + `snippet_id` (required) - The ID of a project's snippet Status code `200` will be returned on success. diff --git a/lib/api/issues.rb b/lib/api/issues.rb index 4ee2d11f15f..3be558816b5 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -17,7 +17,7 @@ module Gitlab # Get a list of project issues # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/issues get ":id/issues" do @@ -27,7 +27,7 @@ module Gitlab # Get a single project issue # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # issue_id (required) - The ID of a project issue # Example Request: # GET /projects/:id/issues/:issue_id @@ -39,7 +39,7 @@ module Gitlab # Create a new project issue # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # title (required) - The title of an issue # description (optional) - The description of an issue # assignee_id (optional) - The ID of a user to assign issue @@ -62,7 +62,7 @@ module Gitlab # Update an existing issue # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # issue_id (required) - The ID of a project issue # title (optional) - The title of an issue # description (optional) - The description of an issue @@ -88,7 +88,7 @@ module Gitlab # Delete a project issue (deprecated) # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # issue_id (required) - The ID of a project issue # Example Request: # DELETE /projects/:id/issues/:issue_id diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 1fa0c549b13..470cd1e1c2d 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -8,7 +8,7 @@ module Gitlab # List merge requests # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # # Example: # GET /projects/:id/merge_requests @@ -22,7 +22,7 @@ module Gitlab # Show MR # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # merge_request_id (required) - The ID of MR # # Example: @@ -40,7 +40,7 @@ module Gitlab # # Parameters: # - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # source_branch (required) - The source branch # target_branch (required) - The target branch # assignee_id - Assignee user ID @@ -67,7 +67,7 @@ module Gitlab # Update MR # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # merge_request_id (required) - ID of MR # source_branch - The source branch # target_branch - The target branch @@ -95,7 +95,7 @@ module Gitlab # Post comment to merge request # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # merge_request_id (required) - ID of MR # note (required) - Text of comment # Examples: diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb index f55dfd04cc5..6aca9d01b09 100644 --- a/lib/api/milestones.rb +++ b/lib/api/milestones.rb @@ -7,7 +7,7 @@ module Gitlab # Get a list of project milestones # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/milestones get ":id/milestones" do @@ -19,7 +19,7 @@ module Gitlab # Get a single project milestone # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # milestone_id (required) - The ID of a project milestone # Example Request: # GET /projects/:id/milestones/:milestone_id @@ -33,7 +33,7 @@ module Gitlab # Create a new project milestone # # Parameters: - # id (required) - The ID or code name of the project + # id (required) - The ID of the project # title (required) - The title of the milestone # description (optional) - The description of the milestone # due_date (optional) - The due date of the milestone @@ -54,7 +54,7 @@ module Gitlab # Update an existing project milestone # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # milestone_id (required) - The ID of a project milestone # title (optional) - The title of a milestone # description (optional) - The description of a milestone diff --git a/lib/api/notes.rb b/lib/api/notes.rb index a3e1858458d..4875ac4c03e 100644 --- a/lib/api/notes.rb +++ b/lib/api/notes.rb @@ -9,7 +9,7 @@ module Gitlab # Get a list of project wall notes # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/notes get ":id/notes" do @@ -20,7 +20,7 @@ module Gitlab # Get a single project wall note # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # note_id (required) - The ID of a note # Example Request: # GET /projects/:id/notes/:note_id @@ -32,7 +32,7 @@ module Gitlab # Create a new project wall note # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # body (required) - The content of a note # Example Request: # POST /projects/:id/notes @@ -54,7 +54,7 @@ module Gitlab # Get a list of project +noteable+ notes # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # noteable_id (required) - The ID of an issue or snippet # Example Request: # GET /projects/:id/issues/:noteable_id/notes @@ -67,7 +67,7 @@ module Gitlab # Get a single +noteable+ note # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # noteable_id (required) - The ID of an issue or snippet # note_id (required) - The ID of a note # Example Request: @@ -82,7 +82,7 @@ module Gitlab # Create a new +noteable+ note # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # noteable_id (required) - The ID of an issue or snippet # body (required) - The content of a note # Example Request: diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 2e140951484..64b65f16b7e 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -16,7 +16,7 @@ module Gitlab # Get a single project # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id get ":id" do @@ -55,7 +55,7 @@ module Gitlab # Get a project team members # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # query - Query string # Example Request: # GET /projects/:id/members @@ -71,7 +71,7 @@ module Gitlab # Get a project team members # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # user_id (required) - The ID of a user # Example Request: # GET /projects/:id/members/:user_id @@ -83,7 +83,7 @@ module Gitlab # Add a new project team member # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # user_id (required) - The ID of a user # access_level (required) - Project access level # Example Request: @@ -106,7 +106,7 @@ module Gitlab # Update project team member # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # user_id (required) - The ID of a team member # access_level (required) - Project access level # Example Request: @@ -126,7 +126,7 @@ module Gitlab # Remove a team member from project # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # user_id (required) - The ID of a team member # Example Request: # DELETE /projects/:id/members/:user_id @@ -139,7 +139,7 @@ module Gitlab # Get project hooks # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/hooks get ":id/hooks" do @@ -151,7 +151,7 @@ module Gitlab # Get a project hook # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # hook_id (required) - The ID of a project hook # Example Request: # GET /projects/:id/hooks/:hook_id @@ -164,7 +164,7 @@ module Gitlab # Add hook to project # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # url (required) - The hook URL # Example Request: # POST /projects/:id/hooks @@ -181,7 +181,7 @@ module Gitlab # Update an existing project hook # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # hook_id (required) - The ID of a project hook # url (required) - The hook URL # Example Request: @@ -202,7 +202,7 @@ module Gitlab # Delete project hook # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # hook_id (required) - The ID of hook to delete # Example Request: # DELETE /projects/:id/hooks @@ -215,7 +215,7 @@ module Gitlab # Get a project repository branches # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/repository/branches get ":id/repository/branches" do @@ -225,7 +225,7 @@ module Gitlab # Get a single branch # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # branch (required) - The name of the branch # Example Request: # GET /projects/:id/repository/branches/:branch @@ -237,7 +237,7 @@ module Gitlab # Get a project repository tags # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/repository/tags get ":id/repository/tags" do @@ -247,7 +247,7 @@ module Gitlab # Get a project repository commits # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # ref_name (optional) - The name of a repository branch or tag # Example Request: # GET /projects/:id/repository/commits @@ -265,7 +265,7 @@ module Gitlab # Get a project snippets # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # Example Request: # GET /projects/:id/snippets get ":id/snippets" do @@ -275,7 +275,7 @@ module Gitlab # Get a project snippet # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # snippet_id (required) - The ID of a project snippet # Example Request: # GET /projects/:id/snippets/:snippet_id @@ -287,7 +287,7 @@ module Gitlab # Create a new project snippet # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # title (required) - The title of a snippet # file_name (required) - The name of a snippet file # lifetime (optional) - The expiration date of a snippet @@ -313,7 +313,7 @@ module Gitlab # Update an existing project snippet # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # snippet_id (required) - The ID of a project snippet # title (optional) - The title of a snippet # file_name (optional) - The name of a snippet file @@ -339,7 +339,7 @@ module Gitlab # Delete a project snippet # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # snippet_id (required) - The ID of a project snippet # Example Request: # DELETE /projects/:id/snippets/:snippet_id @@ -353,7 +353,7 @@ module Gitlab # Get a raw project snippet # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # snippet_id (required) - The ID of a project snippet # Example Request: # GET /projects/:id/snippets/:snippet_id/raw @@ -366,7 +366,7 @@ module Gitlab # Get a raw file contents # # Parameters: - # id (required) - The ID or code name of a project + # id (required) - The ID of a project # sha (required) - The commit or branch name # filepath (required) - The path to the file to display # Example Request: -- cgit v1.2.1 From eaa99478a7612405bc93941ea69b93e7e776ca56 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 21 Dec 2012 18:55:39 +0100 Subject: Up API version to v3 --- app/views/layouts/_init_auto_complete.html.haml | 2 +- doc/api/README.md | 2 +- lib/api.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml index 800dfbe8859..8f8c7d8885e 100644 --- a/app/views/layouts/_init_auto_complete.html.haml +++ b/app/views/layouts/_init_auto_complete.html.haml @@ -1,6 +1,6 @@ :javascript $(function() { - GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.id}/members" if @project }"; + GitLab.GfmAutoComplete.Members.url = "#{ "/api/v3/projects/#{@project.id}/members" if @project }"; GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}"; GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source}; diff --git a/doc/api/README.md b/doc/api/README.md index ca346418f23..477429c9fa0 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -15,7 +15,7 @@ API requests should be prefixed with `api` and the API version. The API version Example of a valid API request: ``` -GET http://example.com/api/v2/projects?private_token=QVy1PB7sTxfy4pqfZM1U +GET http://example.com/api/v3/projects?private_token=QVy1PB7sTxfy4pqfZM1U ``` The API uses JSON to serialize data. You don't need to specify `.json` at the end of API URL. diff --git a/lib/api.rb b/lib/api.rb index d01d534cf6b..f58b82ff98e 100644 --- a/lib/api.rb +++ b/lib/api.rb @@ -2,7 +2,7 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file} module Gitlab class API < Grape::API - version 'v2', using: :path + version 'v3', using: :path rescue_from ActiveRecord::RecordNotFound do rack_response({'message' => '404 Not found'}.to_json, 404) -- cgit v1.2.1 From 86673a66b7ff2eebe1d88311425586be5c79c0ca Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 21 Dec 2012 23:22:52 +0200 Subject: Fix fark background highlight --- app/assets/fonts/korolev-medium-compressed.otf | Bin 28796 -> 28736 bytes app/assets/stylesheets/highlight/dark.scss | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/fonts/korolev-medium-compressed.otf b/app/assets/fonts/korolev-medium-compressed.otf index e3817cec857..a9cd3cbffff 100644 Binary files a/app/assets/fonts/korolev-medium-compressed.otf and b/app/assets/fonts/korolev-medium-compressed.otf differ diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index 178bd583aec..6018ff7074d 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -1,8 +1,8 @@ .black .highlight { + background-color: #333; pre { - background-color: #333; color: #eee; - float: left; + background: inherit; } .hll { display: block; background-color: darken($hover, 65%) } -- cgit v1.2.1 From a7b572d0ab4861110100b54abcc863a312dcefaa Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 11:59:05 +0200 Subject: Fixed #2333 --- app/controllers/groups_controller.rb | 2 +- app/roles/account.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 0aecd9c6a11..c82edb4c168 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -21,7 +21,7 @@ class GroupsController < ApplicationController # Get authored or assigned open merge requests def merge_requests - @merge_requests = current_user.cared_merge_requests + @merge_requests = current_user.cared_merge_requests.opened @merge_requests = @merge_requests.of_group(@group).recent.page(params[:page]).per(20) end diff --git a/app/roles/account.rb b/app/roles/account.rb index 72fa9ebf9d9..ede12b6056d 100644 --- a/app/roles/account.rb +++ b/app/roles/account.rb @@ -47,7 +47,7 @@ module Account end def cared_merge_requests - MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id).opened + MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id) end def project_ids -- cgit v1.2.1 From ed35ea703cc4430c4c30f58d1183607ccc625bf8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 12:01:54 +0200 Subject: Fix order of db setup in installation docs --- doc/install/databases.md | 11 ----------- doc/install/installation.md | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/doc/install/databases.md b/doc/install/databases.md index 92011647f11..6799a46eb63 100644 --- a/doc/install/databases.md +++ b/doc/install/databases.md @@ -55,14 +55,3 @@ GitLab supports the following databases: # Try connecting to the new database with the new user sudo -u gitlab -H psql -d gitlabhq_production - - -# Configure GitLab - - # Mysql - sudo -u gitlab cp config/database.yml.mysql config/database.yml - - # PostgreSQL - sudo -u gitlab cp config/database.yml.postgresql config/database.yml - -Make sure to update username/password in config/database.yml. diff --git a/doc/install/installation.md b/doc/install/installation.md index 159713dcba9..ef42770e019 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -199,12 +199,27 @@ do so with caution! **Important Note:** Make sure to edit both files to match your setup. +## Configure GitLab DB settings + + # Mysql + sudo -u gitlab cp config/database.yml.mysql config/database.yml + + # PostgreSQL + sudo -u gitlab cp config/database.yml.postgresql config/database.yml + +Make sure to update username/password in config/database.yml. + ## Install Gems cd /home/gitlab/gitlab sudo gem install charlock_holmes --version '0.6.9' - sudo -u gitlab -H bundle install --deployment --without development test + + # For mysql db + sudo -u gitlab -H bundle install --deployment --without development test postgres + + # Or For postgres db + sudo -u gitlab -H bundle install --deployment --without development test mysql ## Configure Git -- cgit v1.2.1 From cec866a7cee86a0f56a5c1f0b11d2c19b61947e8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 13:01:15 +0200 Subject: Improve wiki rendering. Fix pygemnt + markdown invalid html --- app/assets/stylesheets/gitlab_bootstrap/files.scss | 14 +++++++++----- lib/redcarpet/render/gitlab_html.rb | 13 ++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index e4924a49456..83954da525a 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -43,11 +43,15 @@ padding: 0 4px; } padding: 20px; - h1, h2 { - line-height: 46px; - } - h3, h4 { - line-height: 40px; + + h1 { font-size: 26px; line-height: 46px; } + h2 { font-size: 22px; line-height: 42px; } + h3 { font-size: 20px; line-height: 40px; } + h4 { font-size: 18px; line-height: 32px; } + h5 { font-size: 16px; line-height: 26px; } + + .white .highlight pre { + background: #f5f5f5; } } diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index bd590f92734..3c5ca1ce9da 100644 --- a/lib/redcarpet/render/gitlab_html.rb +++ b/lib/redcarpet/render/gitlab_html.rb @@ -11,14 +11,13 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML def block_code(code, language) options = { options: {encoding: 'utf-8'} } + options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language) - h.content_tag :div, class: h.user_color_scheme_class do - if Pygments::Lexer.find(language) - Pygments.highlight(code, options.merge(lexer: language.downcase)) - else - Pygments.highlight(code, options) - end.html_safe - end + <<-HTML +
    + #{Pygments.highlight(code, options)} +
    + HTML end def postprocess(full_document) -- cgit v1.2.1 From 2398af9ab03e79f807c5e989cd25aafe0799a61e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 14:18:40 +0200 Subject: Fixed wierd gitlab markdown issue --- lib/redcarpet/render/gitlab_html.rb | 13 ++++++++++--- spec/helpers/gitlab_markdown_helper_spec.rb | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index 3c5ca1ce9da..3a430e0bf9e 100644 --- a/lib/redcarpet/render/gitlab_html.rb +++ b/lib/redcarpet/render/gitlab_html.rb @@ -13,10 +13,17 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML options = { options: {encoding: 'utf-8'} } options.merge!(lexer: language.downcase) if Pygments::Lexer.find(language) + # New lines are placed to fix an rendering issue + # with code wrapped inside

    tag for next case: + # + # # Title kinda h1 + # + # ruby code here + # <<-HTML -
    - #{Pygments.highlight(code, options)} -
    + +
    #{Pygments.highlight(code, options)}
    + HTML end diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index 1eafc6663a2..f0b792fc1cb 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -331,9 +331,9 @@ describe GitlabMarkdownHelper do it "should leave code blocks untouched" do helper.stub(:user_color_scheme_class).and_return(:white) - helper.markdown("\n some code from $#{snippet.id}\n here too\n").should == "
    some code from $#{snippet.id}\nhere too\n
    " + helper.markdown("\n some code from $#{snippet.id}\n here too\n").should include("
    some code from $#{snippet.id}\nhere too\n
    ") - helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should == "
    some code from $#{snippet.id}\nhere too\n
    " + helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n").should include("
    some code from $#{snippet.id}\nhere too\n
    ") end it "should leave inline code untouched" do -- cgit v1.2.1 From 988e6ac2058881429ced53323e954c2e029de2c9 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 14:34:38 +0200 Subject: Fix #2220 --- lib/tasks/gitlab/backup.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index b7a64394ad0..44da6d671e0 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -116,7 +116,7 @@ namespace :gitlab do FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo) puts "Dumping repositories:" project = Project.all.map { |n| [n.path, n.path_to_repo] } - project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")] + project << ["gitolite-admin.git", File.join(Gitlab.config.git_base_path, "gitolite-admin.git")] project.each do |project| print "- Dumping repository #{project.first}... " if Kernel.system("cd #{project.second} > /dev/null 2>&1 && git bundle create #{backup_path_repo}/#{project.first}.bundle --all > /dev/null 2>&1") -- cgit v1.2.1 From cc42bf784e52f7e6eed8f46e0190dbc066372a19 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 22 Dec 2012 15:16:16 +0100 Subject: Fix sudo install command in installation guide Fixes #2334 --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index ef42770e019..720ac4c3084 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -36,7 +36,7 @@ The GitLab installation consists of setting up th following components: to install it first. # run as root - apt-get update && apt-get upgrade && apt-get install sudo vim + apt-get update && apt-get upgrade && apt-get install sudo Make sure your system is up-to-date: -- cgit v1.2.1 From c926a2b6eef8bde3180332e6e241e46573fcc34f Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 22 Dec 2012 15:33:22 +0100 Subject: Remove bundler calls from databases.md GitLab is not yet downloaded at this point in the installation guide. --- doc/install/databases.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/install/databases.md b/doc/install/databases.md index 6799a46eb63..4c6c084d0b9 100644 --- a/doc/install/databases.md +++ b/doc/install/databases.md @@ -11,9 +11,6 @@ GitLab supports the following databases: # Install the database packages sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev - # Install only the necessary gems - sudo -u gitlab -H bundle install --deployment --without development test postgres - # Login to MySQL $ mysql -u root -p @@ -37,9 +34,6 @@ GitLab supports the following databases: # Install the database packages sudo apt-get install -y postgresql-9.1 libpq-dev - # Install only the necessary gems - sudo -u gitlab -H bundle install --deployment --without development test mysql - # Login to PostgreSQL sudo -u postgres psql -d template1 -- cgit v1.2.1 From 640018ba55e9fabc049e111bc9e42ee1ca3aa07c Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 22 Dec 2012 15:52:42 +0100 Subject: Fix docs to download and compile Ruby in /tmp/ruby --- doc/install/installation.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/install/installation.md b/doc/install/installation.md index 720ac4c3084..a9187af0fa7 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -76,6 +76,7 @@ Make sure you have the right version of Python installed. Download and compile it: + mkdir /tmp/ruby && cd /tmp/ruby wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p327.tar.gz tar xfvz ruby-1.9.3-p327.tar.gz cd ruby-1.9.3-p327 -- cgit v1.2.1 From 1ba28aaef8a985f6e06b2a2673dcaf4723843241 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 19:52:28 +0200 Subject: Implement UsersProject project_access validation --- app/models/users_project.rb | 1 + spec/factories.rb | 1 + spec/helpers/gitlab_markdown_helper_spec.rb | 4 ++-- spec/models/system_hook_spec.rb | 4 ++-- spec/models/users_project_spec.rb | 1 + spec/requests/gitlab_flavored_markdown_spec.rb | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/models/users_project.rb b/app/models/users_project.rb index 6231088ff79..3d76a4df037 100644 --- a/app/models/users_project.rb +++ b/app/models/users_project.rb @@ -28,6 +28,7 @@ class UsersProject < ActiveRecord::Base validates :user, presence: true validates :user_id, uniqueness: { :scope => [:project_id], message: "already exists in project" } + validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true validates :project, presence: true delegate :name, :email, to: :user, prefix: true diff --git a/spec/factories.rb b/spec/factories.rb index a26a77dd860..abc0d374701 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -45,6 +45,7 @@ FactoryGirl.define do factory :users_project do user project + project_access { UsersProject::MASTER } end factory :issue do diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index f0b792fc1cb..b792e0c86f6 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -85,7 +85,7 @@ describe GitlabMarkdownHelper do let(:expected) { project_team_member_path(project, member) } before do - project.users << user + project.add_access(user, :admin) end it "should link using a simple name" do @@ -314,7 +314,7 @@ describe GitlabMarkdownHelper do end it "should handle references in lists" do - project.users << user + project.add_access(user, :admin) actual = "\n* dark: ##{issue.id}\n* light by @#{member.user.username}" diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb index 9d03b56cd8f..7ae483a4003 100644 --- a/spec/models/system_hook_spec.rb +++ b/spec/models/system_hook_spec.rb @@ -56,7 +56,7 @@ describe SystemHook do user = create(:user) project = create(:project) with_resque do - project.users << user + project.add_access(user, :admin) end WebMock.should have_requested(:post, @system_hook.url).with(body: /user_add_to_team/).once end @@ -64,7 +64,7 @@ describe SystemHook do it "project_destroy hook" do user = create(:user) project = create(:project) - project.users << user + project.add_access(user, :admin) with_resque do project.users_projects.clear end diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb index 1f896324f18..a9a1857eb69 100644 --- a/spec/models/users_project_spec.rb +++ b/spec/models/users_project_spec.rb @@ -29,6 +29,7 @@ describe UsersProject do it { should validate_uniqueness_of(:user_id).scoped_to(:project_id).with_message(/already exists/) } it { should validate_presence_of(:project) } + it { should ensure_inclusion_of(:project_access).in_array(UsersProject.access_roles.values) } end describe "Delegate methods" do diff --git a/spec/requests/gitlab_flavored_markdown_spec.rb b/spec/requests/gitlab_flavored_markdown_spec.rb index 98319f81657..7f61c6aaa73 100644 --- a/spec/requests/gitlab_flavored_markdown_spec.rb +++ b/spec/requests/gitlab_flavored_markdown_spec.rb @@ -6,7 +6,7 @@ describe "Gitlab Flavored Markdown" do let(:merge_request) { create(:merge_request, project: project) } let(:fred) do u = create(:user, name: "fred") - project.users << u + project.add_access(u, :admin) u end -- cgit v1.2.1 From 056fa05b869a8e12700bf56934e93ca76abb2db7 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 22 Dec 2012 20:06:18 +0100 Subject: Remove path parameter from projects API --- doc/api/projects.md | 4 ---- lib/api/entities.rb | 2 +- lib/api/projects.rb | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/api/projects.md b/doc/api/projects.md index b38e60ee296..411286750f8 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -12,7 +12,6 @@ GET /projects "id": 3, "name": "rails", "description": null, - "path": "rails", "default_branch": "master", "owner": { "id": 1, @@ -33,7 +32,6 @@ GET /projects "id": 5, "name": "gitlab", "description": null, - "path": "gitlab", "default_branch": "api", "owner": { "id": 1, @@ -70,7 +68,6 @@ Parameters: "id": 5, "name": "gitlab", "description": null, - "path": "gitlab", "default_branch": "api", "owner": { "id": 1, @@ -100,7 +97,6 @@ POST /projects Parameters: + `name` (required) - new project name -+ `path` (optional) - new project path, uses project name if not set + `description` (optional) - short project description + `default_branch` (optional) - 'master' by default + `issues_enabled` (optional) - enabled by default diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 92245a9f093..e5b2685abf5 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -18,7 +18,7 @@ module Gitlab end class Project < Grape::Entity - expose :id, :name, :description, :path, :default_branch + expose :id, :name, :description, :default_branch expose :owner, using: Entities::UserBasic expose :private_flag, as: :private expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 64b65f16b7e..fb01524da39 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -27,7 +27,6 @@ module Gitlab # # Parameters: # name (required) - name for new project - # path (optional) - path for new project, uses project name if not set # description (optional) - short project description # default_branch (optional) - 'master' by default # issues_enabled (optional) - enabled by default -- cgit v1.2.1 From 5d1044c335b033714744f286105d24980fb57f04 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 22 Dec 2012 20:36:33 +0100 Subject: Fix Commit#to_diff --- app/models/commit.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/commit.rb b/app/models/commit.rb index ee16bf084de..f11b7fe0202 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -159,6 +159,8 @@ class Commit while !lines.first.start_with?("diff --git") do lines.shift end + lines.pop if lines.last =~ /^[\d.]+$/ # Git version + lines.pop if lines.last == "-- " # end of diff lines.join("\n") end end -- cgit v1.2.1 From 68c43d59f09a66cca0da1b9a50c11421d52eac9a Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Sat, 22 Dec 2012 22:22:51 +0100 Subject: Add instructions to fix permissions for /home/git/.gitolite/ --- doc/install/installation.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/install/installation.md b/doc/install/installation.md index a9187af0fa7..b872ceaf2bd 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -137,6 +137,12 @@ GitLab assumes *full and unshared* control over this Gitolite installation. # ... and use it as the admin key for the Gitolite setup sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub" +Fix the directory permissions for the configuration directory: + + # Make sure the Gitolite config dir is owned by git + sudo chmod 750 /home/git/.gitolite/ + sudo chown -R git:git /home/git/.gitolite/ + Fix the directory permissions for the repositories: # Make sure the repositories dir is owned by git and it stays that way -- cgit v1.2.1