diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/install/requirements.md | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/import.rake | 8 |
7 files changed, 12 insertions, 14 deletions
@@ -63,7 +63,7 @@ gem "stamp" gem 'enumerize' # Pagination -gem "kaminari", "~> 0.14.1" +gem "kaminari", "~> 0.15.1" # HAML gem "haml-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 959a52f7eb5..a501aefcae2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,7 +259,7 @@ GEM json (1.8.1) jwt (0.1.8) multi_json (>= 1.5) - kaminari (0.14.1) + kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.1) @@ -281,7 +281,7 @@ GEM minitest (4.7.5) modernizr (2.6.2) sprockets (~> 2.0) - multi_json (1.8.2) + multi_json (1.8.4) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.11) @@ -600,7 +600,7 @@ DEPENDENCIES jquery-rails (= 2.1.3) jquery-turbolinks jquery-ui-rails (= 2.0.2) - kaminari (~> 0.14.1) + kaminari (~> 0.15.1) launchy letter_opener minitest (~> 4.7.0) diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 770fccaa11b..cb46b5b36e8 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -118,8 +118,7 @@ class Projects::IssuesController < Projects::ApplicationController def issues_filtered params[:scope] = 'all' if params[:scope].blank? params[:state] = 'opened' if params[:state].blank? - params[:project_id] = @project.id - @issues = FilteringService.new.execute(Issue, current_user, params) + @issues = FilteringService.new.execute(Issue, current_user, params.merge(project_id: @project.id)) end # Since iids are implemented only in 6.1 diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 40564c7f889..0792dbf041f 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -20,9 +20,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController params[:sort] ||= 'newest' params[:scope] = 'all' if params[:scope].blank? params[:state] = 'opened' if params[:state].blank? - params[:project_id] = @project.id - @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params) + @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params.merge(project_id: @project.id)) @merge_requests = @merge_requests.page(params[:page]).per(20) @sort = params[:sort].humanize diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 67cb5ccd72d..63ebaadaa80 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -90,6 +90,6 @@ $.get("#{branch_to_project_merge_requests_path(@source_project)}", {target_project_id: target_project.val(),ref: $(this).val() }); }); $('.assign-to-me-link').on('click', function(e){ - $('#merge_request_assignee_id').val("#{current_user.id}").trigger("select2:updated"); + $('#merge_request_assignee_id').val("#{current_user.id}").trigger("change"); e.preventDefault(); }); diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 678c109b266..7d85e8d1fbe 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -55,7 +55,7 @@ it might require some work since GitLab uses several Gems that have native exten - 512MB is too little memory, GitLab will be very slow and you will need 250MB of swap - 768MB is the minimal memory size but we advise against this -- 1GB supports up to 100 users +- 1GB supports up to 100 users if you do not have individual repo's over 250MB - **2GB** is the **recommended** memory size and supports up to 1,000 users - 4GB supports up to 10,000 users diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index 83e941adcb1..0d1d4ffff27 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -2,12 +2,12 @@ namespace :gitlab do namespace :import do # How to use: # - # 1. copy your bare repos under git repos_path - # 2. run bundle exec rake gitlab:import:repos RAILS_ENV=production + # 1. copy the bare repos under the repos_path (commonly /home/git/repositories) + # 2. run: bundle exec rake gitlab:import:repos RAILS_ENV=production # # Notes: - # * project owner will be a first admin - # * existing projects will be skipped + # * The project owner will set to the first administator of the system + # * Existing projects will be skipped # desc "GITLAB | Import bare repositories from gitlab_shell -> repos_path into GitLab project instance" task repos: :environment do |