diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/projects.rb | 22 | ||||
| -rw-r--r-- | lib/backup/database.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/backend/grack_helpers.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/import.rake | 2 |
5 files changed, 16 insertions, 14 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7fcc7eba9d2..f31050b008d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -36,7 +36,7 @@ module API expose :owner, using: Entities::UserBasic expose :name, :name_with_namespace expose :path, :path_with_namespace - expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at, :last_activity_at + expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at expose :namespace expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? } end diff --git a/lib/api/projects.rb b/lib/api/projects.rb index d5709f5cb59..eb8a814be5d 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -61,10 +61,11 @@ module API # name (required) - name for new project # description (optional) - short project description # default_branch (optional) - 'master' by default - # issues_enabled (optional) - enabled by default - # wall_enabled (optional) - enabled by default - # merge_requests_enabled (optional) - enabled by default - # wiki_enabled (optional) - enabled by default + # issues_enabled (optional) + # wall_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) # namespace_id (optional) - defaults to user namespace # Example Request # POST /projects @@ -77,6 +78,7 @@ module API :wall_enabled, :merge_requests_enabled, :wiki_enabled, + :snippets_enabled, :namespace_id] @project = ::Projects::CreateContext.new(current_user, attrs).execute if @project.saved? @@ -96,10 +98,11 @@ module API # name (required) - name for new project # description (optional) - short project description # default_branch (optional) - 'master' by default - # issues_enabled (optional) - enabled by default - # wall_enabled (optional) - enabled by default - # merge_requests_enabled (optional) - enabled by default - # wiki_enabled (optional) - enabled by default + # issues_enabled (optional) + # wall_enabled (optional) + # merge_requests_enabled (optional) + # wiki_enabled (optional) + # snippets_enabled (optional) # Example Request # POST /projects/user/:user_id post "user/:user_id" do @@ -111,7 +114,8 @@ module API :issues_enabled, :wall_enabled, :merge_requests_enabled, - :wiki_enabled] + :wiki_enabled, + :snippets_enabled] @project = ::Projects::CreateContext.new(user, attrs).execute if @project.saved? present @project, with: Entities::Project diff --git a/lib/backup/database.rb b/lib/backup/database.rb index 2c43ed4f6e0..c4fb2e2e159 100644 --- a/lib/backup/database.rb +++ b/lib/backup/database.rb @@ -26,7 +26,7 @@ module Backup system("mysql #{mysql_args} #{config['database']} < #{db_file_name}") when "postgresql" then pg_env - system("pg_restore #{config['database']} #{db_file_name}") + system("psql #{config['database']} -f #{db_file_name}") end end diff --git a/lib/gitlab/backend/grack_helpers.rb b/lib/gitlab/backend/grack_helpers.rb index 88b2d167312..5ac9e9f325b 100644 --- a/lib/gitlab/backend/grack_helpers.rb +++ b/lib/gitlab/backend/grack_helpers.rb @@ -3,7 +3,7 @@ module Grack def project_by_path(path) if m = /^\/([\w\.\/-]+)\.git/.match(path).to_a path_with_namespace = m.last - path_with_namespace.gsub!(/.wiki$/, '') + path_with_namespace.gsub!(/\.wiki$/, '') Project.find_with_namespace(path_with_namespace) end diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index c11284e3d78..2fd7d017db8 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -29,8 +29,6 @@ namespace :gitlab do # Skip if group or user next if namespaces.include?(name) - next if name == 'gitolite-admin' - puts "Processing #{repo_path}".yellow project = Project.find_with_namespace(path) |