Merge branch 'master' into 6-0-dev

CHANGELOG

@@ -24,7 +24,7 @@ v 5.4.0
   - Fixed nav for empty repos
   - GitLab Markdown help page
   - Misspelling fixes
-  - Added suppoort of unicorn and fog gems
+  - Added support of unicorn and fog gems
   - Added client list to API doc
 
 v 5.3.0

app/assets/javascripts/api.js.coffee

@@ -50,5 +50,5 @@
       callback(users)
 
   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)

app/models/key.rb

@@ -24,7 +24,7 @@ class Key < ActiveRecord::Base
   before_validation :strip_white_space
 
   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
 
   delegate :name, :email, to: :user, prefix: true

app/models/project.rb

@@ -88,7 +88,7 @@ class Project < ActiveRecord::Base
   validates_uniqueness_of :path, scope: :namespace_id
 
   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?
 
   validate :check_limit

app/views/projects/issues/_issue.html.haml

@@ -18,7 +18,7 @@
       %span
         %i.icon-comments
         = issue.notes.count
-    - if issue.milestone_id?
+    - if issue.milestone
       %span
         %i.icon-time
         = issue.milestone.title

db/migrate/20130611210815_increase_snippet_text_column_size.rb

+class IncreaseSnippetTextColumnSize < ActiveRecord::Migration
+  def up
+    # MYSQL LARGETEXT for snippet
+    change_column :snippets, :content, :text, :limit => 4294967295
+  end
+
+  def down
+  end
+end

doc/api/projects.md

@@ -53,6 +53,7 @@ GET /projects
     "merge_requests_enabled": true,
     "wall_enabled": true,
     "wiki_enabled": true,
+    "snippets_enabled": true,
     "created_at": "2012-05-30T12:49:20Z",
     "last_activity_at": "2012-05-23T08:05:02Z"
   }
@@ -95,6 +96,7 @@ Parameters:
   "merge_requests_enabled": true,
   "wall_enabled": true,
   "wiki_enabled": true,
+  "snippets_enabled": true,
   "created_at": "2012-05-30T12:49:20Z",
   "last_activity_at": "2012-05-23T08:05:02Z"
 }
@@ -182,10 +184,11 @@ Parameters:
 + `name` (required) - new project name
 + `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)
 
 **Project access levels**
 
@@ -213,10 +216,11 @@ Parameters:
 + `name` (required) - new project name
 + `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)
 
 
 

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

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

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
 

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

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)