| |   |
| 24 | 24 | |
| 25 | 25 | 1. Do the normal rails app stuff (database.yml etc.) |
| 26 | 26 | |
| 27 | | 2. Rename the config/gitorious.sample.yml file to gitorious.yml, and update it with your changes. |
| 27 | 2. Rename the config/gitorious.sample.yml file to gitlab.yml, and update it with your changes. |
| 28 | 28 | |
| 29 | | 3a. If you want real project data, find a project, set the 'ready' status to true, create a bare git repository (git --bare init) in the directory GitoriousConfig['repository_base_path']/#{project.slug}/#{repository.name}.git, and push something to that repository (cd to a git repository with commits and do "git push path/to/the/bare/repository/you/just/created master"). |
| 29 | 3a. If you want real project data, find a project, set the 'ready' status to true, create a bare git repository (git --bare init) in the directory GitlabConfig['repository_base_path']/#{project.slug}/#{repository.name}.git, and push something to that repository (cd to a git repository with commits and do "git push path/to/the/bare/repository/you/just/created master"). |
| 30 | 30 | |
| 31 | 31 | 3b. OR run the script/task_performer and let it create the repository for you (remember to do step 2 first) |
| 32 | 32 | |
| toggle raw diff |
--- a/HACKING
+++ b/HACKING
@@ -24,9 +24,9 @@ Libraries/applications:
1. Do the normal rails app stuff (database.yml etc.)
-2. Rename the config/gitorious.sample.yml file to gitorious.yml, and update it with your changes.
+2. Rename the config/gitorious.sample.yml file to gitlab.yml, and update it with your changes.
-3a. If you want real project data, find a project, set the 'ready' status to true, create a bare git repository (git --bare init) in the directory GitoriousConfig['repository_base_path']/#{project.slug}/#{repository.name}.git, and push something to that repository (cd to a git repository with commits and do "git push path/to/the/bare/repository/you/just/created master").
+3a. If you want real project data, find a project, set the 'ready' status to true, create a bare git repository (git --bare init) in the directory GitlabConfig['repository_base_path']/#{project.slug}/#{repository.name}.git, and push something to that repository (cd to a git repository with commits and do "git push path/to/the/bare/repository/you/just/created master").
3b. OR run the script/task_performer and let it create the repository for you (remember to do step 2 first)
|
| |   |
| 46 | 46 | end |
| 47 | 47 | |
| 48 | 48 | def clone_url |
| 49 | | "git://#{GitoriousConfig['gitorious_host']}/#{gitdir}" |
| 49 | "git://#{GitlabConfig['gitlab_host']}/#{gitdir}" |
| 50 | 50 | end |
| 51 | 51 | |
| 52 | 52 | def http_clone_url |
| 53 | | "http://git.#{GitoriousConfig['gitorious_host']}/#{gitdir}" |
| 53 | "http://git.#{GitlabConfig['gitlab_host']}/#{gitdir}" |
| 54 | 54 | end |
| 55 | 55 | |
| 56 | 56 | def push_url |
| 57 | | "git@#{GitoriousConfig['gitorious_host']}:#{gitdir}" |
| 57 | "git@#{GitlabConfig['gitlab_host']}:#{gitdir}" |
| 58 | 58 | end |
| 59 | 59 | |
| 60 | 60 | def full_repository_path |
| … | … | |
| 121 | 121 | end |
| 122 | 122 | |
| 123 | 123 | def paginated_commits(tree_name, page, per_page = 30) |
| 124 | | per_page = GitoriousConfig["number_of_displayed_commits"] |
| 124 | per_page = GitlabConfig["number_of_displayed_commits"] |
| 125 | 125 | page = (page || 1).to_i |
| 126 | 126 | total = git.commit_count(tree_name) |
| 127 | 127 | offset = (page - 1) * per_page |
| … | … | |
| 236 | 236 | end |
| 237 | 237 | |
| 238 | 238 | def self.full_path_from_partial_path(path) |
| 239 | | File.expand_path(File.join(GitoriousConfig["repository_base_path"], path)) |
| 239 | File.expand_path(File.join(GitlabConfig["repository_base_path"], path)) |
| 240 | 240 | end |
| 241 | 241 | end |
| toggle raw diff |
--- a/app/models/git/repository.rb
+++ b/app/models/git/repository.rb
@@ -46,15 +46,15 @@ class Repository < ActiveRecord::Base
end
def clone_url
- "git://#{GitoriousConfig['gitorious_host']}/#{gitdir}"
+ "git://#{GitlabConfig['gitlab_host']}/#{gitdir}"
end
def http_clone_url
- "http://git.#{GitoriousConfig['gitorious_host']}/#{gitdir}"
+ "http://git.#{GitlabConfig['gitlab_host']}/#{gitdir}"
end
def push_url
- "git@#{GitoriousConfig['gitorious_host']}:#{gitdir}"
+ "git@#{GitlabConfig['gitlab_host']}:#{gitdir}"
end
def full_repository_path
@@ -121,7 +121,7 @@ class Repository < ActiveRecord::Base
end
def paginated_commits(tree_name, page, per_page = 30)
- per_page = GitoriousConfig["number_of_displayed_commits"]
+ per_page = GitlabConfig["number_of_displayed_commits"]
page = (page || 1).to_i
total = git.commit_count(tree_name)
offset = (page - 1) * per_page
@@ -236,6 +236,6 @@ class Repository < ActiveRecord::Base
end
def self.full_path_from_partial_path(path)
- File.expand_path(File.join(GitoriousConfig["repository_base_path"], path))
+ File.expand_path(File.join(GitlabConfig["repository_base_path"], path))
end
end |
| |   |
| 2 | 2 | def signup_notification(user) |
| 3 | 3 | setup_email(user) |
| 4 | 4 | @subject += 'Please activate your new account' |
| 5 | | @body[:url] = "http://#{GitoriousConfig['gitorious_host']}/users/activate/#{user.activation_code}" |
| 5 | @body[:url] = "http://#{GitlabConfig['gitlab_host']}/users/activate/#{user.activation_code}" |
| 6 | 6 | |
| 7 | 7 | end |
| 8 | 8 | |
| … | … | |
| 18 | 18 | @body[:cloner] = repository.user |
| 19 | 19 | @body[:project] = repository.project |
| 20 | 20 | @body[:repository] = repository |
| 21 | | @body[:url] = "http://#{GitoriousConfig['gitorious_host']}/p/#{repository.project.slug}/repos/#{repository.name}" |
| 21 | @body[:url] = "http://#{GitlabConfig['gitlab_host']}/p/#{repository.project.slug}/repos/#{repository.name}" |
| 22 | 22 | end |
| 23 | 23 | |
| 24 | 24 | def merge_request_notification(merge_request) |
| … | … | |
| 26 | 26 | @subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}} |
| 27 | 27 | @body[:merge_request] = merge_request |
| 28 | 28 | @body[:project] = merge_request.target_repository.project |
| 29 | | url = "http://#{GitoriousConfig['gitorious_host']}/p/#{merge_request.target_repository.project.slug}" |
| 29 | url = "http://#{GitlabConfig['gitlab_host']}/p/#{merge_request.target_repository.project.slug}" |
| 30 | 30 | url << "/repos/#{merge_request.target_repository.name}" |
| 31 | 31 | url << "/merge_requests/#{merge_request.id}" |
| 32 | 32 | @body[:url] = url |
| … | … | |
| 41 | 41 | protected |
| 42 | 42 | def setup_email(user) |
| 43 | 43 | @recipients = "#{user.email}" |
| 44 | | @from = "Gitorious <no-reply@#{GitoriousConfig['gitorious_host']}>" |
| 44 | @from = "Gitorious <no-reply@#{GitlabConfig['gitlab_host']}>" |
| 45 | 45 | @subject = "[Gitorious] " |
| 46 | 46 | @sent_on = Time.now |
| 47 | 47 | @body[:user] = user |
| toggle raw diff |
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -2,7 +2,7 @@ class Mailer < ActionMailer::Base
def signup_notification(user)
setup_email(user)
@subject += 'Please activate your new account'
- @body[:url] = "http://#{GitoriousConfig['gitorious_host']}/users/activate/#{user.activation_code}"
+ @body[:url] = "http://#{GitlabConfig['gitlab_host']}/users/activate/#{user.activation_code}"
end
@@ -18,7 +18,7 @@ class Mailer < ActionMailer::Base
@body[:cloner] = repository.user
@body[:project] = repository.project
@body[:repository] = repository
- @body[:url] = "http://#{GitoriousConfig['gitorious_host']}/p/#{repository.project.slug}/repos/#{repository.name}"
+ @body[:url] = "http://#{GitlabConfig['gitlab_host']}/p/#{repository.project.slug}/repos/#{repository.name}"
end
def merge_request_notification(merge_request)
@@ -26,7 +26,7 @@ class Mailer < ActionMailer::Base
@subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}}
@body[:merge_request] = merge_request
@body[:project] = merge_request.target_repository.project
- url = "http://#{GitoriousConfig['gitorious_host']}/p/#{merge_request.target_repository.project.slug}"
+ url = "http://#{GitlabConfig['gitlab_host']}/p/#{merge_request.target_repository.project.slug}"
url << "/repos/#{merge_request.target_repository.name}"
url << "/merge_requests/#{merge_request.id}"
@body[:url] = url
@@ -41,7 +41,7 @@ class Mailer < ActionMailer::Base
protected
def setup_email(user)
@recipients = "#{user.email}"
- @from = "Gitorious <no-reply@#{GitoriousConfig['gitorious_host']}>"
+ @from = "Gitorious <no-reply@#{GitlabConfig['gitlab_host']}>"
@subject = "[Gitorious] "
@sent_on = Time.now
@body[:user] = user |
| |   |
| 1 | <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_ARTICLES, |
| 2 | :subtab => PRJ_TAB_ARTICLES_EDIT, |
| 3 | :project => @project, |
| 4 | :pagetitle => @title } %> |
| 5 | |
| 6 | <%= div_formattedtext_open %> |
| 7 | |
| 8 | <%= error_messages_for :wiki %> |
| 9 | |
| 10 | <% form_for :wiki, :url => project_wiki_path(@project.slug, @wiki.slug), :html => {:method => :put, :name => 'editwiki', :id => 'input'} do |f| -%> |
| 11 | |
| 12 | <h2><%= @title %></h2> |
| 13 | |
| 14 | <p>The wiki title is automatically prefixed with the project title when the wiki is displayed.</p> |
| 15 | |
| 16 | <%= render :partial => "ac_form", :locals => { :f => f } %> |
| 17 | |
| 18 | <p> |
| 19 | <%= f.label :slug -%><br/> |
| 20 | <%= f.text_field :slug -%> |
| 21 | </p> |
| 22 | |
| 23 | <p> |
| 24 | <%= link_to "Cancel", project_wiki_path(@project.slug, @wiki.slug) %> |
| 25 | <a href="javascript:document.editwiki.submit();">Preview</a> |
| 26 | <a href="javascript:document.editwiki.submit();">Update</a> |
| 27 | </p> |
| 28 | |
| 29 | <% end -%> |
| 30 | |
| 31 | <br /> |
| 32 | <br /> |
| 33 | |
| 34 | <%= render_wiki %> |
| 35 | <%= div_formattedtext_close %> |
| 36 | |
| 37 | <%= render :partial => "projects/ac_project_footer" %> |
| toggle raw diff |
--- /dev/null
+++ b/app/views/articles/ac_project_edit.html.erb
@@ -0,0 +1,37 @@
+<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_ARTICLES,
+ :subtab => PRJ_TAB_ARTICLES_EDIT,
+ :project => @project,
+ :pagetitle => @title } %>
+
+<%= div_formattedtext_open %>
+
+<%= error_messages_for :wiki %>
+
+<% form_for :wiki, :url => project_wiki_path(@project.slug, @wiki.slug), :html => {:method => :put, :name => 'editwiki', :id => 'input'} do |f| -%>
+
+ <h2><%= @title %></h2>
+
+ <p>The wiki title is automatically prefixed with the project title when the wiki is displayed.</p>
+
+ <%= render :partial => "ac_form", :locals => { :f => f } %>
+
+ <p>
+ <%= f.label :slug -%><br/>
+ <%= f.text_field :slug -%>
+ </p>
+
+ <p>
+ <%= link_to "Cancel", project_wiki_path(@project.slug, @wiki.slug) %>
+ <a href="javascript:document.editwiki.submit();">Preview</a>
+ <a href="javascript:document.editwiki.submit();">Update</a>
+ </p>
+
+<% end -%>
+
+<br />
+<br />
+
+<%= render_wiki %>
+<%= div_formattedtext_close %>
+
+<%= render :partial => "projects/ac_project_footer" %>
\ No newline at end of file |
| |   |
| 3 | 3 | feed.updated((@comments.blank? ? Time.now : @comments.first.created_at)) |
| 4 | 4 | |
| 5 | 5 | @comments.each do |comment| |
| 6 | | item_url = "http://#{GitoriousConfig['gitorious_host']}" + project_repository_comments_path(@project,@repository) |
| 6 | item_url = "http://#{GitlabConfig['gitlab_host']}" + project_repository_comments_path(@project,@repository) |
| 7 | 7 | feed.entry(comment, :url => item_url) do |entry| |
| 8 | 8 | entry.title("#{comment.user.login}: #{truncate(comment.body, 30)}") |
| 9 | 9 | entry.content(comment.body) |
| toggle raw diff |
--- a/app/views/comments/index.atom.builder
+++ b/app/views/comments/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
feed.updated((@comments.blank? ? Time.now : @comments.first.created_at))
@comments.each do |comment|
- item_url = "http://#{GitoriousConfig['gitorious_host']}" + project_repository_comments_path(@project,@repository)
+ item_url = "http://#{GitlabConfig['gitlab_host']}" + project_repository_comments_path(@project,@repository)
feed.entry(comment, :url => item_url) do |entry|
entry.title("#{comment.user.login}: #{truncate(comment.body, 30)}")
entry.content(comment.body) |
| |   |
| 3 | 3 | feed.updated((@commits.blank? ? nil : @commits.first.committed_date)) |
| 4 | 4 | |
| 5 | 5 | @commits.each do |commit| |
| 6 | | item_url = "http://#{GitoriousConfig['gitorious_host']}" + project_repository_commit_path(@project, @repository, commit.id) |
| 6 | item_url = "http://#{GitlabConfig['gitlab_host']}" + project_repository_commit_path(@project, @repository, commit.id) |
| 7 | 7 | commit_stat_data = commit.stats.files.map do |file, stats| |
| 8 | 8 | [stats[:insertions].to_s.ljust(8, " "), stats[:deletions].to_s.ljust(8, " "), file].join |
| 9 | 9 | end |
| toggle raw diff |
--- a/app/views/logs/feed.atom.builder
+++ b/app/views/logs/feed.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
feed.updated((@commits.blank? ? nil : @commits.first.committed_date))
@commits.each do |commit|
- item_url = "http://#{GitoriousConfig['gitorious_host']}" + project_repository_commit_path(@project, @repository, commit.id)
+ item_url = "http://#{GitlabConfig['gitlab_host']}" + project_repository_commit_path(@project, @repository, commit.id)
commit_stat_data = commit.stats.files.map do |file, stats|
[stats[:insertions].to_s.ljust(8, " "), stats[:deletions].to_s.ljust(8, " "), file].join
end |
| |   |
| 1 | 1 | <table class='public' width='100%'> |
| 2 | | <tr> |
| 3 | | <th></th> |
| 4 | | <th width=<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>>Created</th> |
| 2 | <thead> |
| 3 | <th style='width: 1px;'></th> |
| 4 | <th width='<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>'>Created</th> |
| 5 | 5 | <% if list_type == ART_LIST_USER %> |
| 6 | | <th width=<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>>Project</th> |
| 6 | <th width='<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>'>Project</th> |
| 7 | 7 | <% end %> |
| 8 | | <th width=<%= STYLE_TABLE_COL_WIDTH_ARTICLE_TITLE %>>Title</th> |
| 9 | | <th>Type, Category</th> |
| 8 | <th>Title</th> |
| 9 | <th width='160'>Type, Category</th> |
| 10 | 10 | <% if list_type == ART_LIST_PROJECT %> |
| 11 | | <th>User</th> |
| 11 | <th width='<%= STYLE_TABLE_COL_WIDTH_USER_NAME %>'>User</th> |
| 12 | 12 | <% end %> |
| 13 | | <th>Status</th> |
| 14 | | <th>Comm.</th> |
| 15 | | <th>Views</th> |
| 16 | | <th colspan='3'></th> |
| 17 | | </tr> |
| 13 | <% if @is_member %> |
| 14 | <th width='80'>Status</th> |
| 15 | <th width='50'>Comm.</th> |
| 16 | <th width='50'>Views</th> |
| 17 | <th colspan='2'></th> |
| 18 | <% end %> |
| 19 | </thead> |
| 18 | 20 | |
| 19 | 21 | <% for article in articles %> |
| 20 | 22 | <tr> |
| 21 | 23 | <td style='width: 1px; background-color: <%= article_type_color(article.article_type) %>'></td> |
| 22 | | <td width=<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>><%= format_datetime_ddmmyyhhmm(article.created_at) %></td> |
| 24 | <td width='<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>'><%= format_datetime_ddmmyyhhmm(article.created_at) %></td> |
| 23 | 25 | <% if list_type == ART_LIST_USER %> |
| 24 | | <td width=<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>>PROJECT NAME</td> |
| 26 | <td width='<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>'>PROJECT NAME</td> |
| 25 | 27 | <% end %> |
| 26 | 28 | <td><%= link_to article.title, article_permalink_path(article) %></td> |
| 27 | | <td width=160><%= link_to article.article_type.to_s.capitalize, article_type_path(article.article_type) %>, <%= link_to article.category.name, article_category_path(article.category.slug) %></td> |
| 29 | <td><%= link_to article.article_type.to_s.capitalize, article_type_path(article.article_type) %>, <%= link_to article.category.name, article_category_path(article.category.slug) %></td> |
| 28 | 30 | <% if list_type == ART_LIST_PROJECT %> |
| 29 | | <td width=<%= STYLE_TABLE_COL_WIDTH_USER_NAME %>><%= link_to article.user.fullname, profile_path(article.user.slug) %></td> |
| 31 | <td><%= link_to article.user.fullname, profile_path(article.user.slug) %></td> |
| 30 | 32 | <% end %> |
| 31 | | <td width=80><%= article.status.to_s.capitalize %></td> |
| 32 | | <td align=center width=50><% #article_comment_count(article) %></td> |
| 33 | | <td align=center width=50><%= article.views %></td> |
| 34 | | <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Edit", edit_project_article_path(article.project.slug, article.id)) %></td> |
| 35 | | <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_article_path(article.project.slug, article.id), :action => "destroy") %></td> |
| 33 | <% if @is_member %> |
| 34 | <td><%= article.status.to_s.capitalize %></td> |
| 35 | <td align=center><%= 0 %></td> |
| 36 | <td align=center><%= article.views %></td> |
| 37 | <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Edit", edit_project_article_path(@project.slug, article.id)) %></td> |
| 38 | <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_article_path(@project.slug, article.id), :action => "destroy") %></td> |
| 39 | <% end %> |
| 36 | 40 | </tr> |
| 37 | 41 | <% end %> |
| 38 | 42 | |
| toggle raw diff |
--- a/app/views/shared/_ac_article_list.html.erb
+++ b/app/views/shared/_ac_article_list.html.erb
@@ -1,38 +1,42 @@
<table class='public' width='100%'>
-<tr>
- <th></th>
- <th width=<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>>Created</th>
+<thead>
+ <th style='width: 1px;'></th>
+ <th width='<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>'>Created</th>
<% if list_type == ART_LIST_USER %>
- <th width=<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>>Project</th>
+ <th width='<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>'>Project</th>
<% end %>
- <th width=<%= STYLE_TABLE_COL_WIDTH_ARTICLE_TITLE %>>Title</th>
- <th>Type, Category</th>
+ <th>Title</th>
+ <th width='160'>Type, Category</th>
<% if list_type == ART_LIST_PROJECT %>
- <th>User</th>
+ <th width='<%= STYLE_TABLE_COL_WIDTH_USER_NAME %>'>User</th>
<% end %>
- <th>Status</th>
- <th>Comm.</th>
- <th>Views</th>
- <th colspan='3'></th>
-</tr>
+<% if @is_member %>
+ <th width='80'>Status</th>
+ <th width='50'>Comm.</th>
+ <th width='50'>Views</th>
+ <th colspan='2'></th>
+<% end %>
+</thead>
<% for article in articles %>
<tr>
<td style='width: 1px; background-color: <%= article_type_color(article.article_type) %>'></td>
- <td width=<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>><%= format_datetime_ddmmyyhhmm(article.created_at) %></td>
+ <td width='<%= STYLE_TABLE_COL_WIDTH_DDMMYYHHMM %>'><%= format_datetime_ddmmyyhhmm(article.created_at) %></td>
<% if list_type == ART_LIST_USER %>
- <td width=<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>>PROJECT NAME</td>
+ <td width='<%= STYLE_TABLE_COL_WIDTH_PROJECT_NAME %>'>PROJECT NAME</td>
<% end %>
<td><%= link_to article.title, article_permalink_path(article) %></td>
- <td width=160><%= link_to article.article_type.to_s.capitalize, article_type_path(article.article_type) %>, <%= link_to article.category.name, article_category_path(article.category.slug) %></td>
+ <td><%= link_to article.article_type.to_s.capitalize, article_type_path(article.article_type) %>, <%= link_to article.category.name, article_category_path(article.category.slug) %></td>
<% if list_type == ART_LIST_PROJECT %>
- <td width=<%= STYLE_TABLE_COL_WIDTH_USER_NAME %>><%= link_to article.user.fullname, profile_path(article.user.slug) %></td>
+ <td><%= link_to article.user.fullname, profile_path(article.user.slug) %></td>
<% end %>
- <td width=80><%= article.status.to_s.capitalize %></td>
- <td align=center width=50><% #article_comment_count(article) %></td>
- <td align=center width=50><%= article.views %></td>
- <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Edit", edit_project_article_path(article.project.slug, article.id)) %></td>
- <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_article_path(article.project.slug, article.id), :action => "destroy") %></td>
+<% if @is_member %>
+ <td><%= article.status.to_s.capitalize %></td>
+ <td align=center><%= 0 %></td>
+ <td align=center><%= article.views %></td>
+ <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Edit", edit_project_article_path(@project.slug, article.id)) %></td>
+ <td width=<%= STYLE_TABLE_COL_WIDTH_ACTION_SHORT %>><%= link_to("Del.", project_article_path(@project.slug, article.id), :action => "destroy") %></td>
+<% end %>
</tr>
<% end %>
|
| |   |
| 15 | 15 | file of the repository you wish to push: |
| 16 | 16 | <pre> |
| 17 | 17 | [remote "origin"] |
| 18 | | url = git@<%= GitoriousConfig['gitorious_host'] -%>:<em>project</em>/<em>repository.git</em> |
| 18 | url = git@<%= GitlabConfig['gitlab_host'] -%>:<em>project</em>/<em>repository.git</em> |
| 19 | 19 | fetch = +refs/heads/*:refs/remotes/origin/* |
| 20 | 20 | [branch "master"] |
| 21 | 21 | remote = origin |
| … | … | |
| 24 | 24 | and then <code>git push origin master</code> to push the code to Gitorious. |
| 25 | 25 | </p> |
| 26 | 26 | <p> |
| 27 | | You can also just run "<code>git push git@<%= GitoriousConfig['gitorious_host'] -%>:tumbline/mainline.git</code>", or |
| 27 | You can also just run "<code>git push git@<%= GitlabConfig['gitlab_host'] -%>:tumbline/mainline.git</code>", or |
| 28 | 28 | you can setup a remote by doing the following (add --fetch to the add call to |
| 29 | 29 | get the config from above): |
| 30 | 30 | <pre> |
| 31 | | git remote add origin git@<%= GitoriousConfig['gitorious_host'] -%>:<em>project</em>/<em>repository.git</em> |
| 31 | git remote add origin git@<%= GitlabConfig['gitlab_host'] -%>:<em>project</em>/<em>repository.git</em> |
| 32 | 32 | # to push the master branch to the origin remote we added above: |
| 33 | 33 | git push origin master |
| 34 | 34 | # after that you can just do: |
| … | … | |
| 44 | 44 | can contact you about your projects if they need to. We do however take light |
| 45 | 45 | measures against crawlers by not displaying your email in completely plain text. <br /> |
| 46 | 46 | But just to be clear: we won't sell or use any information you give to |
| 47 | | <%= GitoriousConfig['gitorious_host'] -%> against you or anyone else for financial and/or personal gains. |
| 47 | <%= GitlabConfig['gitlab_host'] -%> against you or anyone else for financial and/or personal gains. |
| 48 | 48 | </p> |
| 49 | 49 | |
| 50 | 50 | <hr /> |
| toggle raw diff |
--- a/app/views/site/faq.html.erb
+++ b/app/views/site/faq.html.erb
@@ -15,7 +15,7 @@
file of the repository you wish to push:
<pre>
[remote "origin"]
- url = git@<%= GitoriousConfig['gitorious_host'] -%>:<em>project</em>/<em>repository.git</em>
+ url = git@<%= GitlabConfig['gitlab_host'] -%>:<em>project</em>/<em>repository.git</em>
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
@@ -24,11 +24,11 @@
and then <code>git push origin master</code> to push the code to Gitorious.
</p>
<p>
- You can also just run "<code>git push git@<%= GitoriousConfig['gitorious_host'] -%>:tumbline/mainline.git</code>", or
+ You can also just run "<code>git push git@<%= GitlabConfig['gitlab_host'] -%>:tumbline/mainline.git</code>", or
you can setup a remote by doing the following (add --fetch to the add call to
get the config from above):
<pre>
- git remote add origin git@<%= GitoriousConfig['gitorious_host'] -%>:<em>project</em>/<em>repository.git</em>
+ git remote add origin git@<%= GitlabConfig['gitlab_host'] -%>:<em>project</em>/<em>repository.git</em>
# to push the master branch to the origin remote we added above:
git push origin master
# after that you can just do:
@@ -44,7 +44,7 @@
can contact you about your projects if they need to. We do however take light
measures against crawlers by not displaying your email in completely plain text. <br />
But just to be clear: we won't sell or use any information you give to
- <%= GitoriousConfig['gitorious_host'] -%> against you or anyone else for financial and/or personal gains.
+ <%= GitlabConfig['gitlab_host'] -%> against you or anyone else for financial and/or personal gains.
</p>
<hr /> |
| |   |
| 1 | # The session secret key (`apg -m 64` is always useful for this kinda stuff) |
| 2 | cookie_secret: ssssht |
| 3 | |
| 4 | # The path where git repositories are stored. The actual (bare) repositories resides |
| 5 | # in repository_base_path/#{project.slug}/#{repository.name}.git/: |
| 6 | repository_base_path: "/path/to/gitorious/repositories" |
| 7 | |
| 8 | # Stuff that's in the html <head>. custom stats javascript code etc |
| 9 | extra_html_head_data: |
| 10 | |
| 11 | # System message that will appear on all pages if present |
| 12 | system_message: |
| 13 | |
| 14 | # Port the ./script/gitorious script should use: |
| 15 | gitlab_client_port: 3000 |
| 16 | |
| 17 | # Host the ./script/gitorious script should use: |
| 18 | gitlab_client_host: localhost |
| 19 | |
| 20 | # Host which is serving the gitorious app, eg "gitorious.org" |
| 21 | gitlab_host: gitorious.org |
| 22 | |
| 23 | # Number of commits to show on a page (Gitorious uses 30) |
| 24 | number_of_displayed_commits: 10 |
| toggle raw diff |
--- /dev/null
+++ b/config/gitlab.sample.yml
@@ -0,0 +1,24 @@
+# The session secret key (`apg -m 64` is always useful for this kinda stuff)
+cookie_secret: ssssht
+
+# The path where git repositories are stored. The actual (bare) repositories resides
+# in repository_base_path/#{project.slug}/#{repository.name}.git/:
+repository_base_path: "/path/to/gitorious/repositories"
+
+# Stuff that's in the html <head>. custom stats javascript code etc
+extra_html_head_data:
+
+# System message that will appear on all pages if present
+system_message:
+
+# Port the ./script/gitorious script should use:
+gitlab_client_port: 3000
+
+# Host the ./script/gitorious script should use:
+gitlab_client_host: localhost
+
+# Host which is serving the gitorious app, eg "gitorious.org"
+gitlab_host: gitorious.org
+
+# Number of commits to show on a page (Gitorious uses 30)
+number_of_displayed_commits: 10
\ No newline at end of file |
| |   |
| 1 | # The session secret key (`apg -m 64` is always useful for this kinda stuff) |
| 2 | cookie_secret: MoibTiddikvuegWimCicPeegdeesyaphfebJurwinHykhyikArsoroisAubyocFuSkedvighedRaubshyopWiwidHabCassIacGafAydzavyotutniUjudOtEpIgNoyk |
| 3 | |
| 4 | # The path where git repositories are stored. The actual (bare) repositories resides |
| 5 | # in repository_base_path/#{project.slug}/#{repository.name}.git/: |
| 6 | repository_base_path: "/home/mtkd/projects/repositories/" |
| 7 | |
| 8 | # Stuff that's in the html <head>. custom stats javascript code etc |
| 9 | extra_html_head_data: |
| 10 | |
| 11 | # System message that will appear on all pages if present |
| 12 | system_message: "" |
| 13 | |
| 14 | # Port the ./script/gitorious script should use: |
| 15 | gitlab_client_port: 3000 |
| 16 | |
| 17 | # Host the ./script/gitorious script should use: |
| 18 | gitlab_client_host: localhost |
| 19 | |
| 20 | # Host which is serving the gitorious app, eg "gitorious.org" |
| 21 | gitlab_host: gitlab.org |
| 22 | |
| 23 | # Number of commits to show on a page (Gitorious uses 30) |
| 24 | number_of_displayed_commits: 10 |
| 25 | |
| toggle raw diff |
--- /dev/null
+++ b/config/gitlab.yml
@@ -0,0 +1,25 @@
+# The session secret key (`apg -m 64` is always useful for this kinda stuff)
+cookie_secret: MoibTiddikvuegWimCicPeegdeesyaphfebJurwinHykhyikArsoroisAubyocFuSkedvighedRaubshyopWiwidHabCassIacGafAydzavyotutniUjudOtEpIgNoyk
+
+# The path where git repositories are stored. The actual (bare) repositories resides
+# in repository_base_path/#{project.slug}/#{repository.name}.git/:
+repository_base_path: "/home/mtkd/projects/repositories/"
+
+# Stuff that's in the html <head>. custom stats javascript code etc
+extra_html_head_data:
+
+# System message that will appear on all pages if present
+system_message: ""
+
+# Port the ./script/gitorious script should use:
+gitlab_client_port: 3000
+
+# Host the ./script/gitorious script should use:
+gitlab_client_host: localhost
+
+# Host which is serving the gitorious app, eg "gitorious.org"
+gitlab_host: gitlab.org
+
+# Number of commits to show on a page (Gitorious uses 30)
+number_of_displayed_commits: 10
+ |
| |   |
| 0 | | # The session secret key (`apg -m 64` is always useful for this kinda stuff) |
| 1 | | cookie_secret: ssssht |
| 2 | | |
| 3 | | # The path where git repositories are stored. The actual (bare) repositories resides |
| 4 | | # in repository_base_path/#{project.slug}/#{repository.name}.git/: |
| 5 | | repository_base_path: "/path/to/gitorious/repositories" |
| 6 | | |
| 7 | | # Stuff that's in the html <head>. custom stats javascript code etc |
| 8 | | extra_html_head_data: |
| 9 | | |
| 10 | | # System message that will appear on all pages if present |
| 11 | | system_message: |
| 12 | | |
| 13 | | # Port the ./script/gitorious script should use: |
| 14 | | gitorious_client_port: 3000 |
| 15 | | |
| 16 | | # Host the ./script/gitorious script should use: |
| 17 | | gitorious_client_host: localhost |
| 18 | | |
| 19 | | # Host which is serving the gitorious app, eg "gitorious.org" |
| 20 | | gitorious_host: gitorious.org |
| 21 | | |
| 22 | | # Number of commits to show on a page (Gitorious uses 30) |
| 23 | | number_of_displayed_commits: 10 |
| toggle raw diff |
--- a/config/gitorious.sample.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# The session secret key (`apg -m 64` is always useful for this kinda stuff)
-cookie_secret: ssssht
-
-# The path where git repositories are stored. The actual (bare) repositories resides
-# in repository_base_path/#{project.slug}/#{repository.name}.git/:
-repository_base_path: "/path/to/gitorious/repositories"
-
-# Stuff that's in the html <head>. custom stats javascript code etc
-extra_html_head_data:
-
-# System message that will appear on all pages if present
-system_message:
-
-# Port the ./script/gitorious script should use:
-gitorious_client_port: 3000
-
-# Host the ./script/gitorious script should use:
-gitorious_client_host: localhost
-
-# Host which is serving the gitorious app, eg "gitorious.org"
-gitorious_host: gitorious.org
-
-# Number of commits to show on a page (Gitorious uses 30)
-number_of_displayed_commits: 10
\ No newline at end of file |
| |   |
| 0 | | |
| 1 | | # |
| 2 | | APPNAME = "Gitlab" |
| 3 | | SITENAME = "Gitlab" |
| 4 | | DOMAINNAME = "www.gitlab.org" |
| 5 | | |
| 6 | | # enable/disable features |
| 7 | | ALLOW_FEATURE_PROJECTS = true |
| 8 | | ALLOW_FEATURE_ARCHIVE = true |
| 9 | | ALLOW_FEATURE_FORUM = true |
| 10 | | ALLOW_FEATURE_WIKI = true |
| 11 | | ALLOW_FEATURE_MEMBERS = true |
| 12 | | ALLOW_FEATURE_SEARCH = true |
| 13 | | ALLOW_FEATURE_ABOUT = true |
| 14 | | |
| 15 | | #style enumerations |
| 16 | | STYLE_WITHRIGHTCOLUMN = 1 |
| 17 | | STYLE_NORIGHTCOLUMN = 2 |
| 18 | | |
| 19 | | # Tabs for project page |
| 20 | | PRJ_TAB_WIKI = 1 |
| 21 | | PRJ_TAB_ACTIVITIES = 2 |
| 22 | | PRJ_TAB_REPOS = 3 |
| 23 | | PRJ_TAB_ROADMAP = 4 |
| 24 | | PRJ_TAB_TICKETS = 5 |
| 25 | | PRJ_TAB_ARTICLES = 6 |
| 26 | | PRJ_TAB_FORUM = 7 |
| 27 | | PRJ_TAB_LOG = 8 |
| 28 | | PRJ_TAB_CONFIG = 9 |
| 29 | | |
| 30 | | PRJ_TAB_SUBTAB_NONE = 0 |
| 31 | | |
| 32 | | # 'Subtabs' for projects/documenation |
| 33 | | #TODO could some of these be replaced with generics? |
| 34 | | PRJ_TAB_WIKI_NEW = 1 |
| 35 | | PRJ_TAB_WIKI_EDIT = 2 |
| 36 | | PRJ_TAB_WIKI_LIST = 3 |
| 37 | | |
| 38 | | # 'Subtabs' for projects/documenation |
| 39 | | PRJ_TAB_LOG_NEW = 1 |
| 40 | | PRJ_TAB_LOG_EDIT = 2 |
| 41 | | PRJ_TAB_LOG_LIST = 3 |
| 42 | | |
| 43 | | # 'Subtabs' for projects/repos |
| 44 | | PRJ_TAB_REPOS_SUMMARY = 1 |
| 45 | | PRJ_TAB_REPOS_LOGS = 2 |
| 46 | | PRJ_TAB_REPOS_TREE = 3 |
| 47 | | PRJ_TAB_REPOS_COMMIT = 4 |
| 48 | | PRJ_TAB_REPOS_MERGEREQUESTS = 5 |
| 49 | | |
| 50 | | # |
| 51 | | PRF_TAB_SUMMARY = 1 |
| 52 | | PRF_TAB_ARTICLES = 2 |
| 53 | | PRF_TAB_TICKETS = 3 |
| 54 | | PRF_TAB_WIKIS = 4 |
| 55 | | PRF_TAB_FORUM = 5 |
| 56 | | PRF_TAB_TIMELINE = 6 |
| 57 | | PRF_TAB_CONFIG = 7 |
| 58 | | |
| 59 | | # |
| 60 | | ART_LIST_USER = 1 |
| 61 | | ART_LIST_PROJECT = 2 |
| 62 | | |
| 63 | | # |
| 64 | | STYLE_TABLE_COL_WIDTH_ID = "30" |
| 65 | | STYLE_TABLE_COL_WIDTH_DATE = "74" |
| 66 | | STYLE_TABLE_COL_WIDTH_DDMMYYHHMM = "124" |
| 67 | | STYLE_TABLE_COL_WIDTH_DDBBYY = "82" |
| 68 | | STYLE_TABLE_COL_WIDTH_ACTION = "60" |
| 69 | | STYLE_TABLE_COL_WIDTH_ACTION_SHORT = "30" |
| 70 | | # |
| 71 | | STYLE_TABLE_COL_WIDTH_ARTICLE_TITLE = "260" |
| 72 | | # |
| 73 | | #FIXME this should be title now |
| 74 | | STYLE_TABLE_COL_WIDTH_PROJECT_NAME = "240" |
| 75 | | # |
| 76 | | STYLE_TABLE_COL_WIDTH_REPOSITORY_NAME = "160" |
| 77 | | # |
| 78 | | STYLE_TABLE_COL_WIDTH_USER_NAME = "120" |
| 79 | | |
| 80 | | |
| 81 | | |
| toggle raw diff |
--- a/config/initializers/gitlab_config.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-
-#
-APPNAME = "Gitlab"
-SITENAME = "Gitlab"
-DOMAINNAME = "www.gitlab.org"
-
-# enable/disable features
-ALLOW_FEATURE_PROJECTS = true
-ALLOW_FEATURE_ARCHIVE = true
-ALLOW_FEATURE_FORUM = true
-ALLOW_FEATURE_WIKI = true
-ALLOW_FEATURE_MEMBERS = true
-ALLOW_FEATURE_SEARCH = true
-ALLOW_FEATURE_ABOUT = true
-
-#style enumerations
-STYLE_WITHRIGHTCOLUMN = 1
-STYLE_NORIGHTCOLUMN = 2
-
-# Tabs for project page
-PRJ_TAB_WIKI = 1
-PRJ_TAB_ACTIVITIES = 2
-PRJ_TAB_REPOS = 3
-PRJ_TAB_ROADMAP = 4
-PRJ_TAB_TICKETS = 5
-PRJ_TAB_ARTICLES = 6
-PRJ_TAB_FORUM = 7
-PRJ_TAB_LOG = 8
-PRJ_TAB_CONFIG = 9
-
-PRJ_TAB_SUBTAB_NONE = 0
-
-# 'Subtabs' for projects/documenation
-#TODO could some of these be replaced with generics?
-PRJ_TAB_WIKI_NEW = 1
-PRJ_TAB_WIKI_EDIT = 2
-PRJ_TAB_WIKI_LIST = 3
-
-# 'Subtabs' for projects/documenation
-PRJ_TAB_LOG_NEW = 1
-PRJ_TAB_LOG_EDIT = 2
-PRJ_TAB_LOG_LIST = 3
-
-# 'Subtabs' for projects/repos
-PRJ_TAB_REPOS_SUMMARY = 1
-PRJ_TAB_REPOS_LOGS = 2
-PRJ_TAB_REPOS_TREE = 3
-PRJ_TAB_REPOS_COMMIT = 4
-PRJ_TAB_REPOS_MERGEREQUESTS = 5
-
-#
-PRF_TAB_SUMMARY = 1
-PRF_TAB_ARTICLES = 2
-PRF_TAB_TICKETS = 3
-PRF_TAB_WIKIS = 4
-PRF_TAB_FORUM = 5
-PRF_TAB_TIMELINE = 6
-PRF_TAB_CONFIG = 7
-
-#
-ART_LIST_USER = 1
-ART_LIST_PROJECT = 2
-
-#
-STYLE_TABLE_COL_WIDTH_ID = "30"
-STYLE_TABLE_COL_WIDTH_DATE = "74"
-STYLE_TABLE_COL_WIDTH_DDMMYYHHMM = "124"
-STYLE_TABLE_COL_WIDTH_DDBBYY = "82"
-STYLE_TABLE_COL_WIDTH_ACTION = "60"
-STYLE_TABLE_COL_WIDTH_ACTION_SHORT = "30"
-#
-STYLE_TABLE_COL_WIDTH_ARTICLE_TITLE = "260"
-#
-#FIXME this should be title now
-STYLE_TABLE_COL_WIDTH_PROJECT_NAME = "240"
-#
-STYLE_TABLE_COL_WIDTH_REPOSITORY_NAME = "160"
-#
-STYLE_TABLE_COL_WIDTH_USER_NAME = "120"
-
-
- |