Download as
Browse Code »

Commit 518181697041c5111bb42ca2bfdc119e258d425e

Authored by Dmitriy Zaporozhets
2 parents e49ec464 d938486c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' into 6-0-dev

Showing 12 changed files with 43 additions and 28 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @5181816
... ... @@ -24,7 +24,7 @@ v 5.4.0
24 24 - Fixed nav for empty repos
25 25 - GitLab Markdown help page
26 26 - Misspelling fixes
27   - - Added suppoort of unicorn and fog gems
  27 + - Added support of unicorn and fog gems
28 28 - Added client list to API doc
29 29  
30 30 v 5.3.0
... ...
app/assets/javascripts/api.js.coffee
  Diff comments   View file @5181816
... ... @@ -50,5 +50,5 @@
50 50 callback(users)
51 51  
52 52 buildUrl: (url) ->
53   - url = gon.relative_url_root + url if gon.relative_url_root.present?
  53 + url = gon.relative_url_root + url if gon.relative_url_root?
54 54 return url.replace(':version', gon.api_version)
... ...
app/models/key.rb
  Diff comments   View file @5181816
... ... @@ -24,7 +24,7 @@ class Key < ActiveRecord::Base
24 24 before_validation :strip_white_space
25 25  
26 26 validates :title, presence: true, length: { within: 0..255 }
27   - validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\Assh-.*\Z/ }, uniqueness: true
  27 + validates :key, presence: true, length: { within: 0..5000 }, format: { with: /\A(ssh|ecdsa)-.*\Z/ }, uniqueness: true
28 28 validate :fingerprintable_key
29 29  
30 30 delegate :name, :email, to: :user, prefix: true
... ...
app/models/project.rb
  Diff comments   View file @5181816
... ... @@ -88,7 +88,7 @@ class Project < ActiveRecord::Base
88 88 validates_uniqueness_of :path, scope: :namespace_id
89 89  
90 90 validates :import_url,
91   - format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
  91 + format: { with: URI::regexp(%w(git http https)), message: "should be a valid url" },
92 92 if: :import?
93 93  
94 94 validate :check_limit
... ...
app/views/projects/issues/_issue.html.haml
  Diff comments   View file @5181816
... ... @@ -18,7 +18,7 @@
18 18 %span
19 19 %i.icon-comments
20 20 = issue.notes.count
21   - - if issue.milestone_id?
  21 + - if issue.milestone
22 22 %span
23 23 %i.icon-time
24 24 = issue.milestone.title
... ...
db/migrate/20130611210815_increase_snippet_text_column_size.rb 0 → 100644
  Diff comments   View file @5181816
... ... @@ -0,0 +1,9 @@
  1 +class IncreaseSnippetTextColumnSize < ActiveRecord::Migration
  2 + def up
  3 + # MYSQL LARGETEXT for snippet
  4 + change_column :snippets, :content, :text, :limit => 4294967295
  5 + end
  6 +
  7 + def down
  8 + end
  9 +end
... ...
doc/api/projects.md
  Diff comments   View file @5181816
... ... @@ -53,6 +53,7 @@ GET /projects
53 53 "merge_requests_enabled": true,
54 54 "wall_enabled": true,
55 55 "wiki_enabled": true,
  56 + "snippets_enabled": true,
56 57 "created_at": "2012-05-30T12:49:20Z",
57 58 "last_activity_at": "2012-05-23T08:05:02Z"
58 59 }
... ... @@ -95,6 +96,7 @@ Parameters:
95 96 "merge_requests_enabled": true,
96 97 "wall_enabled": true,
97 98 "wiki_enabled": true,
  99 + "snippets_enabled": true,
98 100 "created_at": "2012-05-30T12:49:20Z",
99 101 "last_activity_at": "2012-05-23T08:05:02Z"
100 102 }
... ... @@ -182,10 +184,11 @@ Parameters:
182 184 + `name` (required) - new project name
183 185 + `description` (optional) - short project description
184 186 + `default_branch` (optional) - 'master' by default
185   -+ `issues_enabled` (optional) - enabled by default
186   -+ `wall_enabled` (optional) - enabled by default
187   -+ `merge_requests_enabled` (optional) - enabled by default
188   -+ `wiki_enabled` (optional) - enabled by default
  187 ++ `issues_enabled` (optional)
  188 ++ `wall_enabled` (optional)
  189 ++ `merge_requests_enabled` (optional)
  190 ++ `wiki_enabled` (optional)
  191 ++ `snippets_enabled` (optional)
189 192  
190 193 **Project access levels**
191 194  
... ... @@ -213,10 +216,11 @@ Parameters:
213 216 + `name` (required) - new project name
214 217 + `description` (optional) - short project description
215 218 + `default_branch` (optional) - 'master' by default
216   -+ `issues_enabled` (optional) - enabled by default
217   -+ `wall_enabled` (optional) - enabled by default
218   -+ `merge_requests_enabled` (optional) - enabled by default
219   -+ `wiki_enabled` (optional) - enabled by default
  219 ++ `issues_enabled` (optional)
  220 ++ `wall_enabled` (optional)
  221 ++ `merge_requests_enabled` (optional)
  222 ++ `wiki_enabled` (optional)
  223 ++ `snippets_enabled` (optional)
220 224  
221 225  
222 226  
... ... @@ -477,4 +481,4 @@ DELETE /projects/:id/fork
477 481  
478 482 Parameter:
479 483  
480   -+ `id` (required) - The ID of the project
481 484 \ No newline at end of file
  485 ++ `id` (required) - The ID of the project
... ...
lib/api/entities.rb
  Diff comments   View file @5181816
... ... @@ -36,7 +36,7 @@ module API
36 36 expose :owner, using: Entities::UserBasic
37 37 expose :name, :name_with_namespace
38 38 expose :path, :path_with_namespace
39   - expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at, :last_activity_at
  39 + expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
40 40 expose :namespace
41 41 expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? }
42 42 end
... ...
lib/api/projects.rb
  Diff comments   View file @5181816
... ... @@ -61,10 +61,11 @@ module API
61 61 # name (required) - name for new project
62 62 # description (optional) - short project description
63 63 # default_branch (optional) - 'master' by default
64   - # issues_enabled (optional) - enabled by default
65   - # wall_enabled (optional) - enabled by default
66   - # merge_requests_enabled (optional) - enabled by default
67   - # wiki_enabled (optional) - enabled by default
  64 + # issues_enabled (optional)
  65 + # wall_enabled (optional)
  66 + # merge_requests_enabled (optional)
  67 + # wiki_enabled (optional)
  68 + # snippets_enabled (optional)
68 69 # namespace_id (optional) - defaults to user namespace
69 70 # Example Request
70 71 # POST /projects
... ... @@ -77,6 +78,7 @@ module API
77 78 :wall_enabled,
78 79 :merge_requests_enabled,
79 80 :wiki_enabled,
  81 + :snippets_enabled,
80 82 :namespace_id]
81 83 @project = ::Projects::CreateContext.new(current_user, attrs).execute
82 84 if @project.saved?
... ... @@ -96,10 +98,11 @@ module API
96 98 # name (required) - name for new project
97 99 # description (optional) - short project description
98 100 # default_branch (optional) - 'master' by default
99   - # issues_enabled (optional) - enabled by default
100   - # wall_enabled (optional) - enabled by default
101   - # merge_requests_enabled (optional) - enabled by default
102   - # wiki_enabled (optional) - enabled by default
  101 + # issues_enabled (optional)
  102 + # wall_enabled (optional)
  103 + # merge_requests_enabled (optional)
  104 + # wiki_enabled (optional)
  105 + # snippets_enabled (optional)
103 106 # Example Request
104 107 # POST /projects/user/:user_id
105 108 post "user/:user_id" do
... ... @@ -111,7 +114,8 @@ module API
111 114 :issues_enabled,
112 115 :wall_enabled,
113 116 :merge_requests_enabled,
114   - :wiki_enabled]
  117 + :wiki_enabled,
  118 + :snippets_enabled]
115 119 @project = ::Projects::CreateContext.new(user, attrs).execute
116 120 if @project.saved?
117 121 present @project, with: Entities::Project
... ...
lib/backup/database.rb
  Diff comments   View file @5181816
... ... @@ -26,7 +26,7 @@ module Backup
26 26 system("mysql #{mysql_args} #{config['database']} < #{db_file_name}")
27 27 when "postgresql" then
28 28 pg_env
29   - system("pg_restore #{config['database']} #{db_file_name}")
  29 + system("psql #{config['database']} -f #{db_file_name}")
30 30 end
31 31 end
32 32  
... ...
lib/gitlab/backend/grack_helpers.rb
  Diff comments   View file @5181816
... ... @@ -3,7 +3,7 @@ module Grack
3 3 def project_by_path(path)
4 4 if m = /^\/([\w\.\/-]+)\.git/.match(path).to_a
5 5 path_with_namespace = m.last
6   - path_with_namespace.gsub!(/.wiki$/, '')
  6 + path_with_namespace.gsub!(/\.wiki$/, '')
7 7  
8 8 Project.find_with_namespace(path_with_namespace)
9 9 end
... ...
lib/tasks/gitlab/import.rake
  Diff comments   View file @5181816
... ... @@ -29,8 +29,6 @@ namespace :gitlab do
29 29 # Skip if group or user
30 30 next if namespaces.include?(name)
31 31  
32   - next if name == 'gitolite-admin'
33   -
34 32 puts "Processing #{repo_path}".yellow
35 33  
36 34 project = Project.find_with_namespace(path)
... ...