Capitlization of /gitlab/i normalized. #1367
This commit is contained in:
parent
6e5cd8e081
commit
09a86bd4d6
|
@ -1,13 +1,13 @@
|
||||||
@import "bootstrap";
|
@import "bootstrap";
|
||||||
@import "bootstrap-responsive";
|
@import "bootstrap-responsive";
|
||||||
|
|
||||||
/** GITLAB colors **/
|
/** GitLab colors **/
|
||||||
$link_color:#3A89A3;
|
$link_color:#3A89A3;
|
||||||
$blue_link: #2fa0bb;
|
$blue_link: #2fa0bb;
|
||||||
$style_color: #474d57;
|
$style_color: #474d57;
|
||||||
$hover: #fdf5d9;
|
$hover: #fdf5d9;
|
||||||
|
|
||||||
/** GITLAB Fonts **/
|
/** GitLab Fonts **/
|
||||||
@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); }
|
@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); }
|
||||||
|
|
||||||
/** MIXINS **/
|
/** MIXINS **/
|
||||||
|
@ -106,9 +106,9 @@ $hover: #fdf5d9;
|
||||||
@import "themes/ui_modern.scss";
|
@import "themes/ui_modern.scss";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gitlab bootstrap.
|
* GitLab bootstrap.
|
||||||
* Overrides some styles of twitter bootstrap.
|
* Overrides some styles of twitter bootstrap.
|
||||||
* Also give some common classes for gitlab app
|
* Also give some common classes for GitLab app
|
||||||
*/
|
*/
|
||||||
@import "gitlab_bootstrap/common.scss";
|
@import "gitlab_bootstrap/common.scss";
|
||||||
@import "gitlab_bootstrap/typography.scss";
|
@import "gitlab_bootstrap/typography.scss";
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module GitlabMarkdownHelper
|
module GitlabMarkdownHelper
|
||||||
# Replaces references (i.e. @abc, #123, !456, ...) in the text with links to
|
# Replaces references (i.e. @abc, #123, !456, ...) in the text with links to
|
||||||
# the appropriate items in Gitlab.
|
# the appropriate items in GitLab.
|
||||||
#
|
#
|
||||||
# text - the source text
|
# text - the source text
|
||||||
# html_options - extra options for the reference links as given to link_to
|
# html_options - extra options for the reference links as given to link_to
|
||||||
|
|
|
@ -111,18 +111,18 @@ class Notify < ActionMailer::Base
|
||||||
# Examples
|
# Examples
|
||||||
#
|
#
|
||||||
# >> subject('Lorem ipsum')
|
# >> subject('Lorem ipsum')
|
||||||
# => "gitlab | Lorem ipsum"
|
# => "GitLab | Lorem ipsum"
|
||||||
#
|
#
|
||||||
# # Automatically inserts Project name when @project is set
|
# # Automatically inserts Project name when @project is set
|
||||||
# >> @project = Project.last
|
# >> @project = Project.last
|
||||||
# => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
|
# => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
|
||||||
# >> subject('Lorem ipsum')
|
# >> subject('Lorem ipsum')
|
||||||
# => "gitlab | Lorem ipsum | Ruby on Rails"
|
# => "GitLab | Lorem ipsum | Ruby on Rails"
|
||||||
#
|
#
|
||||||
# # Accepts multiple arguments
|
# # Accepts multiple arguments
|
||||||
# >> subject('Lorem ipsum', 'Dolor sit amet')
|
# >> subject('Lorem ipsum', 'Dolor sit amet')
|
||||||
# => "gitlab | Lorem ipsum | Dolor sit amet"
|
# => "GitLab | Lorem ipsum | Dolor sit amet"
|
||||||
def subject(*extra)
|
def subject(*extra)
|
||||||
"gitlab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "")
|
"GitLab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
%h1 Git Error
|
%h1 Git Error
|
||||||
%hr
|
%hr
|
||||||
%h2 Gitlab was unable to access your Gitolite system.
|
%h2 GitLab was unable to access your Gitolite system.
|
||||||
|
|
||||||
.git_error_tips
|
.git_error_tips
|
||||||
%h4 Tips for Administrator:
|
%h4 Tips for Administrator:
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
%h5= link_to "API", help_api_path
|
%h5= link_to "API", help_api_path
|
||||||
|
|
||||||
%li
|
%li
|
||||||
%h5= link_to "Gitlab Markdown", help_markdown_path
|
%h5= link_to "GitLab Markdown", help_markdown_path
|
||||||
|
|
||||||
%li
|
%li
|
||||||
%h5= link_to "SSH keys", help_ssh_path
|
%h5= link_to "SSH keys", help_ssh_path
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
%h3.page_title Gitlab Flavored Markdown
|
%h3.page_title GitLab Flavored Markdown
|
||||||
.back_link
|
.back_link
|
||||||
= link_to help_path do
|
= link_to help_path do
|
||||||
← to index
|
← to index
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
.row
|
.row
|
||||||
.span8
|
.span8
|
||||||
%p
|
%p
|
||||||
For Gitlab we developed something we call "Gitlab Flavored Markdown" (GFM).
|
For GitLab we developed something we call "GitLab Flavored Markdown" (GFM).
|
||||||
It extends the standard Markdown in a few significant ways adds some useful functionality.
|
It extends the standard Markdown in a few significant ways adds some useful functionality.
|
||||||
|
|
||||||
%p You can use GFM in:
|
%p You can use GFM in:
|
||||||
|
@ -62,7 +62,7 @@
|
||||||
%p becomes
|
%p becomes
|
||||||
= markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```}
|
= markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```}
|
||||||
|
|
||||||
%h4 Special Gitlab references
|
%h4 Special GitLab references
|
||||||
|
|
||||||
%p
|
%p
|
||||||
GFM recognizes special references.
|
GFM recognizes special references.
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
%p.slead
|
%p.slead
|
||||||
SSH key allows you to establish a secure connection between your computer and Gitlab
|
SSH key allows you to establish a secure connection between your computer and GitLab
|
||||||
|
|
||||||
%p.slead
|
%p.slead
|
||||||
To generate a new SSH key just open your terminal and use code below.
|
To generate a new SSH key just open your terminal and use code below.
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
\# Generating public/private rsa key pair...
|
\# Generating public/private rsa key pair...
|
||||||
|
|
||||||
%p.slead
|
%p.slead
|
||||||
Next just use code below to dump your public key and add to GITLAB SSH Keys
|
Next just use code below to dump your public key and add to GitLab SSH Keys
|
||||||
|
|
||||||
%pre.dark
|
%pre.dark
|
||||||
cat ~/.ssh/id_rsa.pub
|
cat ~/.ssh/id_rsa.pub
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
%p.slead
|
%p.slead
|
||||||
Your Gitlab instance can perform HTTP POST request on next event: create_project, delete_project, create_user, delete_user, change_team_member.
|
Your GitLab instance can perform HTTP POST request on next event: create_project, delete_project, create_user, delete_user, change_team_member.
|
||||||
%br
|
%br
|
||||||
System Hooks can be used for logging or change information in LDAP server.
|
System Hooks can be used for logging or change information in LDAP server.
|
||||||
%br
|
%br
|
||||||
|
|
|
@ -5,11 +5,11 @@
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
%p.slead
|
%p.slead
|
||||||
Every Gitlab project can trigger a web server whenever the repo is pushed to.
|
Every GitLab project can trigger a web server whenever the repo is pushed to.
|
||||||
%br
|
%br
|
||||||
Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
|
Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
|
||||||
%br
|
%br
|
||||||
GITLAB will send POST request with commits information on every push.
|
GitLab will send POST request with commits information on every push.
|
||||||
%h5 Hooks request example:
|
%h5 Hooks request example:
|
||||||
= render "hooks/data_ex"
|
= render "hooks/data_ex"
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
git commit -am "My feature is ready"
|
git commit -am "My feature is ready"
|
||||||
|
|
||||||
%li
|
%li
|
||||||
%p Push your branch to gitlabhq
|
%p Push your branch to GitLab
|
||||||
.bash
|
.bash
|
||||||
%pre.dark
|
%pre.dark
|
||||||
git push origin $feature_name
|
git push origin $feature_name
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
:timestamp => "2012-01-03T23:36:29+02:00",
|
:timestamp => "2012-01-03T23:36:29+02:00",
|
||||||
:url => "http://localhost/diaspora/commits/da1560886d...",
|
:url => "http://localhost/diaspora/commits/da1560886d...",
|
||||||
:author => {
|
:author => {
|
||||||
:name => "gitlab dev user",
|
:name => "GitLab dev user",
|
||||||
:email => "gitlabdev@dv6700.(none)"
|
:email => "gitlabdev@dv6700.(none)"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
= f.label :description, "Details"
|
= f.label :description, "Details"
|
||||||
.input
|
.input
|
||||||
= f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14
|
= f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14
|
||||||
%p.hint Issues are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
%p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
||||||
|
|
||||||
|
|
||||||
.actions
|
.actions
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
%p.slead
|
%p.slead
|
||||||
SSH key allows you to establish a secure connection between your computer and Gitlab
|
SSH key allows you to establish a secure connection between your computer and GitLab
|
||||||
|
|
||||||
|
|
||||||
%table#keys-table
|
%table#keys-table
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
%head
|
%head
|
||||||
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
|
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
|
||||||
%title
|
%title
|
||||||
gitlabhq
|
GitLab
|
||||||
:css
|
:css
|
||||||
.header h1 {color: #BBBBBB !important; font: bold 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;}
|
.header h1 {color: #BBBBBB !important; font: bold 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;}
|
||||||
.header p {color: #c6c6c6; font: normal 12px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 18px;}
|
.header p {color: #c6c6c6; font: normal 12px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 18px;}
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
\
|
\
|
||||||
%td{align: "left", style: "padding: 18px 0 10px;", width: "580"}
|
%td{align: "left", style: "padding: 18px 0 10px;", width: "580"}
|
||||||
%h1{style: "color: #BBBBBB; font: normal 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;"}
|
%h1{style: "color: #BBBBBB; font: normal 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;"}
|
||||||
gitlab
|
GITLAB
|
||||||
- if @project
|
- if @project
|
||||||
| #{@project.name}
|
| #{@project.name}
|
||||||
%table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"}
|
%table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"}
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
= f.label :description, "Description", class: "control-label"
|
= f.label :description, "Description", class: "control-label"
|
||||||
.controls
|
.controls
|
||||||
= f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
|
= f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
|
||||||
%p.hint Milestones are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
%p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
||||||
.span6
|
.span6
|
||||||
.control-group
|
.control-group
|
||||||
= f.label :due_date, "Due Date", class: "control-label"
|
= f.label :due_date, "Due Date", class: "control-label"
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
= f.text_area :note, size: 255, class: 'note-text'
|
= f.text_area :note, size: 255, class: 'note-text'
|
||||||
#preview-note.preview_note.hide
|
#preview-note.preview_note.hide
|
||||||
.hint
|
.hint
|
||||||
.right Comments are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
.right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
||||||
.row.note_advanced_opts.hide
|
.row.note_advanced_opts.hide
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
|
%h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
|
||||||
Hi #{@user['name']}!
|
Hi #{@user['name']}!
|
||||||
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
|
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
|
||||||
Administrator created account for you. Now you are a member of company gitlab application.
|
Administrator created account for you. Now you are a member of company GitLab application.
|
||||||
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
||||||
%tr
|
%tr
|
||||||
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
.middle_box_content
|
.middle_box_content
|
||||||
.input
|
.input
|
||||||
%span.cgray
|
%span.cgray
|
||||||
Wiki content is parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
||||||
To link to a (new) page you can just type
|
To link to a (new) page you can just type
|
||||||
%code [Link Title](page-slug)
|
%code [Link Title](page-slug)
|
||||||
\.
|
\.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Gitlab API
|
# GitLab API
|
||||||
|
|
||||||
All API requests require authentication. You need to pass a `private_token` parameter to authenticate. You can find or reset your private token in your profile.
|
All API requests require authentication. You need to pass a `private_token` parameter to authenticate. You can find or reset your private token in your profile.
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ If no, or an invalid, `private_token` is provided then an error message will be
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
API requests should be prefixed with `api` and the API version. The API version is equal to the Gitlab major version number, which is defined in `lib/api.rb`.
|
API requests should be prefixed with `api` and the API version. The API version is equal to the GitLab major version number, which is defined in `lib/api.rb`.
|
||||||
|
|
||||||
Example of a valid API request:
|
Example of a valid API request:
|
||||||
|
|
||||||
|
|
|
@ -167,7 +167,7 @@ and ensure you have followed all of the above steps carefully.
|
||||||
# Login to MySQL
|
# Login to MySQL
|
||||||
$ mysql -u root -p
|
$ mysql -u root -p
|
||||||
|
|
||||||
# Create the gitlabhq production database
|
# Create the GitLab production database
|
||||||
mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;
|
mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`;
|
||||||
|
|
||||||
# Create the MySQL User change $password to a real password
|
# Create the MySQL User change $password to a real password
|
||||||
|
|
|
@ -170,7 +170,7 @@ module Gitlab
|
||||||
def push
|
def push
|
||||||
Dir.chdir(File.join(@local_dir, "gitolite"))
|
Dir.chdir(File.join(@local_dir, "gitolite"))
|
||||||
`git add -A`
|
`git add -A`
|
||||||
`git commit -am "Gitlab"`
|
`git commit -am "GitLab"`
|
||||||
`git push`
|
`git push`
|
||||||
Dir.chdir(Rails.root)
|
Dir.chdir(Rails.root)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
module Gitlab
|
module Gitlab
|
||||||
# Custom parser for Gitlab-flavored Markdown
|
# Custom parser for GitLab-flavored Markdown
|
||||||
#
|
#
|
||||||
# It replaces references in the text with links to the appropriate items in Gitlab.
|
# It replaces references in the text with links to the appropriate items in Gitlab.
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# This file was placed here by Gitlab. It makes sure that your pushed commits
|
# This file was placed here by GitLab. It makes sure that your pushed commits
|
||||||
# will be processed properly.
|
# will be processed properly.
|
||||||
|
|
||||||
while read oldrev newrev ref
|
while read oldrev newrev ref
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
namespace :gitlab do
|
namespace :gitlab do
|
||||||
namespace :gitolite do
|
namespace :gitolite do
|
||||||
desc "GITLAB | Write GITLAB hook for gitolite"
|
desc "GITLAB | Write GitLab hook for gitolite"
|
||||||
task :write_hooks => :environment do
|
task :write_hooks => :environment do
|
||||||
gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
|
gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
|
||||||
gitlab_hooks_path = Rails.root.join("lib", "hooks")
|
gitlab_hooks_path = Rails.root.join("lib", "hooks")
|
||||||
|
|
Loading…
Reference in a new issue