Commit 51818169 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' into 6-0-dev

parents e49ec464 d938486c
...@@ -24,7 +24,7 @@ v 5.4.0 ...@@ -24,7 +24,7 @@ v 5.4.0
- Fixed nav for empty repos - Fixed nav for empty repos
- GitLab Markdown help page - GitLab Markdown help page
- Misspelling fixes - Misspelling fixes
- Added suppoort of unicorn and fog gems - Added support of unicorn and fog gems
- Added client list to API doc - Added client list to API doc
v 5.3.0 v 5.3.0
......
...@@ -50,5 +50,5 @@ ...@@ -50,5 +50,5 @@
callback(users) callback(users)
buildUrl: (url) -> buildUrl: (url) ->
url = gon.relative_url_root + url if gon.relative_url_root.present? url = gon.relative_url_root + url if gon.relative_url_root?
return url.replace(':version', gon.api_version) return url.replace(':version', gon.api_version)
...@@ -24,7 +24,7 @@ class Key < ActiveRecord::Base ...@@ -24,7 +24,7 @@ class Key < ActiveRecord::Base
before_validation :strip_white_space before_validation :strip_white_space
validates :title, presence: true, length: { within: 0..255 } validates :title, presence: true, length: { within: 0..255 }
validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\Assh-.*\Z/ }, uniqueness: true validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\A(ssh|ecdsa)-.*\Z/ }, uniqueness: true
validate :fingerprintable_key validate :fingerprintable_key
delegate :name, :email, to: :user, prefix: true delegate :name, :email, to: :user, prefix: true
......
...@@ -88,7 +88,7 @@ class Project < ActiveRecord::Base ...@@ -88,7 +88,7 @@ class Project < ActiveRecord::Base
validates_uniqueness_of :path, scope: :namespace_id validates_uniqueness_of :path, scope: :namespace_id
validates :import_url, validates :import_url,
format: { with: URI::regexp(%w(http https)), message: "should be a valid url" }, format: { with: URI::regexp(%w(git http https)), message: "should be a valid url" },
if: :import? if: :import?
validate :check_limit validate :check_limit
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%span %span
%i.icon-comments %i.icon-comments
= issue.notes.count = issue.notes.count
- if issue.milestone_id? - if issue.milestone
%span %span
%i.icon-time %i.icon-time
= issue.milestone.title = issue.milestone.title
......
class IncreaseSnippetTextColumnSize < ActiveRecord::Migration
def up
# MYSQL LARGETEXT for snippet
change_column :snippets, :content, :text, :limit => 4294967295
end
def down
end
end
...@@ -53,6 +53,7 @@ GET /projects ...@@ -53,6 +53,7 @@ GET /projects
"merge_requests_enabled": true, "merge_requests_enabled": true,
"wall_enabled": true, "wall_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": true,
"created_at": "2012-05-30T12:49:20Z", "created_at": "2012-05-30T12:49:20Z",
"last_activity_at": "2012-05-23T08:05:02Z" "last_activity_at": "2012-05-23T08:05:02Z"
} }
...@@ -95,6 +96,7 @@ Parameters: ...@@ -95,6 +96,7 @@ Parameters:
"merge_requests_enabled": true, "merge_requests_enabled": true,
"wall_enabled": true, "wall_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": true,
"created_at": "2012-05-30T12:49:20Z", "created_at": "2012-05-30T12:49:20Z",
"last_activity_at": "2012-05-23T08:05:02Z" "last_activity_at": "2012-05-23T08:05:02Z"
} }
...@@ -182,10 +184,11 @@ Parameters: ...@@ -182,10 +184,11 @@ Parameters:
+ `name` (required) - new project name + `name` (required) - new project name
+ `description` (optional) - short project description + `description` (optional) - short project description
+ `default_branch` (optional) - 'master' by default + `default_branch` (optional) - 'master' by default
+ `issues_enabled` (optional) - enabled by default + `issues_enabled` (optional)
+ `wall_enabled` (optional) - enabled by default + `wall_enabled` (optional)
+ `merge_requests_enabled` (optional) - enabled by default + `merge_requests_enabled` (optional)
+ `wiki_enabled` (optional) - enabled by default + `wiki_enabled` (optional)
+ `snippets_enabled` (optional)
**Project access levels** **Project access levels**
...@@ -213,10 +216,11 @@ Parameters: ...@@ -213,10 +216,11 @@ Parameters:
+ `name` (required) - new project name + `name` (required) - new project name
+ `description` (optional) - short project description + `description` (optional) - short project description
+ `default_branch` (optional) - 'master' by default + `default_branch` (optional) - 'master' by default
+ `issues_enabled` (optional) - enabled by default + `issues_enabled` (optional)
+ `wall_enabled` (optional) - enabled by default + `wall_enabled` (optional)
+ `merge_requests_enabled` (optional) - enabled by default + `merge_requests_enabled` (optional)
+ `wiki_enabled` (optional) - enabled by default + `wiki_enabled` (optional)
+ `snippets_enabled` (optional)
...@@ -477,4 +481,4 @@ DELETE /projects/:id/fork ...@@ -477,4 +481,4 @@ DELETE /projects/:id/fork
Parameter: Parameter:
+ `id` (required) - The ID of the project + `id` (required) - The ID of the project
\ No newline at end of file
...@@ -36,7 +36,7 @@ module API ...@@ -36,7 +36,7 @@ module API
expose :owner, using: Entities::UserBasic expose :owner, using: Entities::UserBasic
expose :name, :name_with_namespace expose :name, :name_with_namespace
expose :path, :path_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 :namespace
expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? } expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? }
end end
......
...@@ -61,10 +61,11 @@ module API ...@@ -61,10 +61,11 @@ module API
# name (required) - name for new project # name (required) - name for new project
# description (optional) - short project description # description (optional) - short project description
# default_branch (optional) - 'master' by default # default_branch (optional) - 'master' by default
# issues_enabled (optional) - enabled by default # issues_enabled (optional)
# wall_enabled (optional) - enabled by default # wall_enabled (optional)
# merge_requests_enabled (optional) - enabled by default # merge_requests_enabled (optional)
# wiki_enabled (optional) - enabled by default # wiki_enabled (optional)
# snippets_enabled (optional)
# namespace_id (optional) - defaults to user namespace # namespace_id (optional) - defaults to user namespace
# Example Request # Example Request
# POST /projects # POST /projects
...@@ -77,6 +78,7 @@ module API ...@@ -77,6 +78,7 @@ module API
:wall_enabled, :wall_enabled,
:merge_requests_enabled, :merge_requests_enabled,
:wiki_enabled, :wiki_enabled,
:snippets_enabled,
:namespace_id] :namespace_id]
@project = ::Projects::CreateContext.new(current_user, attrs).execute @project = ::Projects::CreateContext.new(current_user, attrs).execute
if @project.saved? if @project.saved?
...@@ -96,10 +98,11 @@ module API ...@@ -96,10 +98,11 @@ module API
# name (required) - name for new project # name (required) - name for new project
# description (optional) - short project description # description (optional) - short project description
# default_branch (optional) - 'master' by default # default_branch (optional) - 'master' by default
# issues_enabled (optional) - enabled by default # issues_enabled (optional)
# wall_enabled (optional) - enabled by default # wall_enabled (optional)
# merge_requests_enabled (optional) - enabled by default # merge_requests_enabled (optional)
# wiki_enabled (optional) - enabled by default # wiki_enabled (optional)
# snippets_enabled (optional)
# Example Request # Example Request
# POST /projects/user/:user_id # POST /projects/user/:user_id
post "user/:user_id" do post "user/:user_id" do
...@@ -111,7 +114,8 @@ module API ...@@ -111,7 +114,8 @@ module API
:issues_enabled, :issues_enabled,
:wall_enabled, :wall_enabled,
:merge_requests_enabled, :merge_requests_enabled,
:wiki_enabled] :wiki_enabled,
:snippets_enabled]
@project = ::Projects::CreateContext.new(user, attrs).execute @project = ::Projects::CreateContext.new(user, attrs).execute
if @project.saved? if @project.saved?
present @project, with: Entities::Project present @project, with: Entities::Project
......
...@@ -26,7 +26,7 @@ module Backup ...@@ -26,7 +26,7 @@ module Backup
system("mysql #{mysql_args} #{config['database']} < #{db_file_name}") system("mysql #{mysql_args} #{config['database']} < #{db_file_name}")
when "postgresql" then when "postgresql" then
pg_env pg_env
system("pg_restore #{config['database']} #{db_file_name}") system("psql #{config['database']} -f #{db_file_name}")
end end
end end
......
...@@ -3,7 +3,7 @@ module Grack ...@@ -3,7 +3,7 @@ module Grack
def project_by_path(path) def project_by_path(path)
if m = /^\/([\w\.\/-]+)\.git/.match(path).to_a if m = /^\/([\w\.\/-]+)\.git/.match(path).to_a
path_with_namespace = m.last path_with_namespace = m.last
path_with_namespace.gsub!(/.wiki$/, '') path_with_namespace.gsub!(/\.wiki$/, '')
Project.find_with_namespace(path_with_namespace) Project.find_with_namespace(path_with_namespace)
end end
......
...@@ -29,8 +29,6 @@ namespace :gitlab do ...@@ -29,8 +29,6 @@ namespace :gitlab do
# Skip if group or user # Skip if group or user
next if namespaces.include?(name) next if namespaces.include?(name)
next if name == 'gitolite-admin'
puts "Processing #{repo_path}".yellow puts "Processing #{repo_path}".yellow
project = Project.find_with_namespace(path) project = Project.find_with_namespace(path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment