Commit 09a86bd4d6dcf89f5e5393145900593bb22f1080
1 parent
6e5cd8e0
Exists in
master
and in
4 other branches
Capitlization of /gitlab/i normalized. #1367
Showing
24 changed files
with
36 additions
and
36 deletions
Show diff stats
app/assets/stylesheets/main.scss
1 | @import "bootstrap"; | 1 | @import "bootstrap"; |
2 | @import "bootstrap-responsive"; | 2 | @import "bootstrap-responsive"; |
3 | 3 | ||
4 | -/** GITLAB colors **/ | 4 | +/** GitLab colors **/ |
5 | $link_color:#3A89A3; | 5 | $link_color:#3A89A3; |
6 | $blue_link: #2fa0bb; | 6 | $blue_link: #2fa0bb; |
7 | $style_color: #474d57; | 7 | $style_color: #474d57; |
8 | $hover: #fdf5d9; | 8 | $hover: #fdf5d9; |
9 | 9 | ||
10 | -/** GITLAB Fonts **/ | 10 | +/** GitLab Fonts **/ |
11 | @font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); } | 11 | @font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); } |
12 | 12 | ||
13 | /** MIXINS **/ | 13 | /** MIXINS **/ |
@@ -106,9 +106,9 @@ $hover: #fdf5d9; | @@ -106,9 +106,9 @@ $hover: #fdf5d9; | ||
106 | @import "themes/ui_modern.scss"; | 106 | @import "themes/ui_modern.scss"; |
107 | 107 | ||
108 | /** | 108 | /** |
109 | - * Gitlab bootstrap. | 109 | + * GitLab bootstrap. |
110 | * Overrides some styles of twitter bootstrap. | 110 | * Overrides some styles of twitter bootstrap. |
111 | - * Also give some common classes for gitlab app | 111 | + * Also give some common classes for GitLab app |
112 | */ | 112 | */ |
113 | @import "gitlab_bootstrap/common.scss"; | 113 | @import "gitlab_bootstrap/common.scss"; |
114 | @import "gitlab_bootstrap/typography.scss"; | 114 | @import "gitlab_bootstrap/typography.scss"; |
app/helpers/gitlab_markdown_helper.rb
1 | module GitlabMarkdownHelper | 1 | module GitlabMarkdownHelper |
2 | # Replaces references (i.e. @abc, #123, !456, ...) in the text with links to | 2 | # Replaces references (i.e. @abc, #123, !456, ...) in the text with links to |
3 | - # the appropriate items in Gitlab. | 3 | + # the appropriate items in GitLab. |
4 | # | 4 | # |
5 | # text - the source text | 5 | # text - the source text |
6 | # html_options - extra options for the reference links as given to link_to | 6 | # html_options - extra options for the reference links as given to link_to |
app/mailers/notify.rb
@@ -111,18 +111,18 @@ class Notify < ActionMailer::Base | @@ -111,18 +111,18 @@ class Notify < ActionMailer::Base | ||
111 | # Examples | 111 | # Examples |
112 | # | 112 | # |
113 | # >> subject('Lorem ipsum') | 113 | # >> subject('Lorem ipsum') |
114 | - # => "gitlab | Lorem ipsum" | 114 | + # => "GitLab | Lorem ipsum" |
115 | # | 115 | # |
116 | # # Automatically inserts Project name when @project is set | 116 | # # Automatically inserts Project name when @project is set |
117 | # >> @project = Project.last | 117 | # >> @project = Project.last |
118 | # => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...> | 118 | # => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...> |
119 | # >> subject('Lorem ipsum') | 119 | # >> subject('Lorem ipsum') |
120 | - # => "gitlab | Lorem ipsum | Ruby on Rails" | 120 | + # => "GitLab | Lorem ipsum | Ruby on Rails" |
121 | # | 121 | # |
122 | # # Accepts multiple arguments | 122 | # # Accepts multiple arguments |
123 | # >> subject('Lorem ipsum', 'Dolor sit amet') | 123 | # >> subject('Lorem ipsum', 'Dolor sit amet') |
124 | - # => "gitlab | Lorem ipsum | Dolor sit amet" | 124 | + # => "GitLab | Lorem ipsum | Dolor sit amet" |
125 | def subject(*extra) | 125 | def subject(*extra) |
126 | - "gitlab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "") | 126 | + "GitLab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "") |
127 | end | 127 | end |
128 | end | 128 | end |
app/views/errors/gitolite.html.haml
app/views/help/index.html.haml
@@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
30 | %h5= link_to "API", help_api_path | 30 | %h5= link_to "API", help_api_path |
31 | 31 | ||
32 | %li | 32 | %li |
33 | - %h5= link_to "Gitlab Markdown", help_markdown_path | 33 | + %h5= link_to "GitLab Markdown", help_markdown_path |
34 | 34 | ||
35 | %li | 35 | %li |
36 | %h5= link_to "SSH keys", help_ssh_path | 36 | %h5= link_to "SSH keys", help_ssh_path |
app/views/help/markdown.html.haml
1 | -%h3.page_title Gitlab Flavored Markdown | 1 | +%h3.page_title GitLab Flavored Markdown |
2 | .back_link | 2 | .back_link |
3 | = link_to help_path do | 3 | = link_to help_path do |
4 | ← to index | 4 | ← to index |
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | .row | 7 | .row |
8 | .span8 | 8 | .span8 |
9 | %p | 9 | %p |
10 | - For Gitlab we developed something we call "Gitlab Flavored Markdown" (GFM). | 10 | + For GitLab we developed something we call "GitLab Flavored Markdown" (GFM). |
11 | It extends the standard Markdown in a few significant ways adds some useful functionality. | 11 | It extends the standard Markdown in a few significant ways adds some useful functionality. |
12 | 12 | ||
13 | %p You can use GFM in: | 13 | %p You can use GFM in: |
@@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
62 | %p becomes | 62 | %p becomes |
63 | = markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```} | 63 | = markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```} |
64 | 64 | ||
65 | - %h4 Special Gitlab references | 65 | + %h4 Special GitLab references |
66 | 66 | ||
67 | %p | 67 | %p |
68 | GFM recognizes special references. | 68 | GFM recognizes special references. |
app/views/help/ssh.html.haml
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | %hr | 5 | %hr |
6 | 6 | ||
7 | %p.slead | 7 | %p.slead |
8 | - SSH key allows you to establish a secure connection between your computer and Gitlab | 8 | + SSH key allows you to establish a secure connection between your computer and GitLab |
9 | 9 | ||
10 | %p.slead | 10 | %p.slead |
11 | To generate a new SSH key just open your terminal and use code below. | 11 | To generate a new SSH key just open your terminal and use code below. |
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | \# Generating public/private rsa key pair... | 17 | \# Generating public/private rsa key pair... |
18 | 18 | ||
19 | %p.slead | 19 | %p.slead |
20 | - Next just use code below to dump your public key and add to GITLAB SSH Keys | 20 | + Next just use code below to dump your public key and add to GitLab SSH Keys |
21 | 21 | ||
22 | %pre.dark | 22 | %pre.dark |
23 | cat ~/.ssh/id_rsa.pub | 23 | cat ~/.ssh/id_rsa.pub |
app/views/help/system_hooks.html.haml
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | %hr | 5 | %hr |
6 | 6 | ||
7 | %p.slead | 7 | %p.slead |
8 | - Your Gitlab instance can perform HTTP POST request on next event: create_project, delete_project, create_user, delete_user, change_team_member. | 8 | + Your GitLab instance can perform HTTP POST request on next event: create_project, delete_project, create_user, delete_user, change_team_member. |
9 | %br | 9 | %br |
10 | System Hooks can be used for logging or change information in LDAP server. | 10 | System Hooks can be used for logging or change information in LDAP server. |
11 | %br | 11 | %br |
app/views/help/web_hooks.html.haml
@@ -5,11 +5,11 @@ | @@ -5,11 +5,11 @@ | ||
5 | %hr | 5 | %hr |
6 | 6 | ||
7 | %p.slead | 7 | %p.slead |
8 | - Every Gitlab project can trigger a web server whenever the repo is pushed to. | 8 | + Every GitLab project can trigger a web server whenever the repo is pushed to. |
9 | %br | 9 | %br |
10 | 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. | 10 | 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. |
11 | %br | 11 | %br |
12 | - GITLAB will send POST request with commits information on every push. | 12 | + GitLab will send POST request with commits information on every push. |
13 | %h5 Hooks request example: | 13 | %h5 Hooks request example: |
14 | = render "hooks/data_ex" | 14 | = render "hooks/data_ex" |
15 | 15 |
app/views/help/workflow.html.haml
@@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
24 | git commit -am "My feature is ready" | 24 | git commit -am "My feature is ready" |
25 | 25 | ||
26 | %li | 26 | %li |
27 | - %p Push your branch to gitlabhq | 27 | + %p Push your branch to GitLab |
28 | .bash | 28 | .bash |
29 | %pre.dark | 29 | %pre.dark |
30 | git push origin $feature_name | 30 | git push origin $feature_name |
app/views/hooks/_data_ex.html.erb
@@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
32 | :timestamp => "2012-01-03T23:36:29+02:00", | 32 | :timestamp => "2012-01-03T23:36:29+02:00", |
33 | :url => "http://localhost/diaspora/commits/da1560886d...", | 33 | :url => "http://localhost/diaspora/commits/da1560886d...", |
34 | :author => { | 34 | :author => { |
35 | - :name => "gitlab dev user", | 35 | + :name => "GitLab dev user", |
36 | :email => "gitlabdev@dv6700.(none)" | 36 | :email => "gitlabdev@dv6700.(none)" |
37 | } | 37 | } |
38 | } | 38 | } |
app/views/issues/_form.html.haml
@@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
38 | = f.label :description, "Details" | 38 | = f.label :description, "Details" |
39 | .input | 39 | .input |
40 | = f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14 | 40 | = f.text_area :description, maxlength: 2000, class: "xxlarge", rows: 14 |
41 | - %p.hint Issues are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}. | 41 | + %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. |
42 | 42 | ||
43 | 43 | ||
44 | .actions | 44 | .actions |
app/views/keys/index.html.haml
app/views/layouts/notify.html.haml
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | %head | 2 | %head |
3 | %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"} | 3 | %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"} |
4 | %title | 4 | %title |
5 | - gitlabhq | 5 | + GitLab |
6 | :css | 6 | :css |
7 | .header h1 {color: #BBBBBB !important; font: bold 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;} | 7 | .header h1 {color: #BBBBBB !important; font: bold 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;} |
8 | .header p {color: #c6c6c6; font: normal 12px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 18px;} | 8 | .header p {color: #c6c6c6; font: normal 12px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 18px;} |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | \ | 21 | \ |
22 | %td{align: "left", style: "padding: 18px 0 10px;", width: "580"} | 22 | %td{align: "left", style: "padding: 18px 0 10px;", width: "580"} |
23 | %h1{style: "color: #BBBBBB; font: normal 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;"} | 23 | %h1{style: "color: #BBBBBB; font: normal 32px Helvetica, Arial, sans-serif; margin: 0; padding: 0; line-height: 40px;"} |
24 | - gitlab | 24 | + GITLAB |
25 | - if @project | 25 | - if @project |
26 | | #{@project.name} | 26 | | #{@project.name} |
27 | %table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"} | 27 | %table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"} |
app/views/milestones/_form.html.haml
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | = f.label :description, "Description", class: "control-label" | 22 | = f.label :description, "Description", class: "control-label" |
23 | .controls | 23 | .controls |
24 | = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10 | 24 | = f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10 |
25 | - %p.hint Milestones are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}. | 25 | + %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. |
26 | .span6 | 26 | .span6 |
27 | .control-group | 27 | .control-group |
28 | = f.label :due_date, "Due Date", class: "control-label" | 28 | = f.label :due_date, "Due Date", class: "control-label" |
app/views/notes/_form.html.haml
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | = f.text_area :note, size: 255, class: 'note-text' | 11 | = f.text_area :note, size: 255, class: 'note-text' |
12 | #preview-note.preview_note.hide | 12 | #preview-note.preview_note.hide |
13 | .hint | 13 | .hint |
14 | - .right Comments are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}. | 14 | + .right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. |
15 | .clearfix | 15 | .clearfix |
16 | 16 | ||
17 | .row.note_advanced_opts.hide | 17 | .row.note_advanced_opts.hide |
app/views/notify/new_user_email.html.haml
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} | 6 | %h2{style: "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} |
7 | Hi #{@user['name']}! | 7 | Hi #{@user['name']}! |
8 | %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} | 8 | %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} |
9 | - Administrator created account for you. Now you are a member of company gitlab application. | 9 | + Administrator created account for you. Now you are a member of company GitLab application. |
10 | %td{style: "font-size: 1px; line-height: 1px;", width: "21"} | 10 | %td{style: "font-size: 1px; line-height: 1px;", width: "21"} |
11 | %tr | 11 | %tr |
12 | %td{style: "font-size: 1px; line-height: 1px;", width: "21"} | 12 | %td{style: "font-size: 1px; line-height: 1px;", width: "21"} |
app/views/wikis/_form.html.haml
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | .middle_box_content | 14 | .middle_box_content |
15 | .input | 15 | .input |
16 | %span.cgray | 16 | %span.cgray |
17 | - Wiki content is parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}. | 17 | + Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. |
18 | To link to a (new) page you can just type | 18 | To link to a (new) page you can just type |
19 | %code [Link Title](page-slug) | 19 | %code [Link Title](page-slug) |
20 | \. | 20 | \. |
doc/api/README.md
1 | -# Gitlab API | 1 | +# GitLab API |
2 | 2 | ||
3 | 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. | 3 | 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. |
4 | 4 | ||
@@ -10,7 +10,7 @@ If no, or an invalid, `private_token` is provided then an error message will be | @@ -10,7 +10,7 @@ If no, or an invalid, `private_token` is provided then an error message will be | ||
10 | } | 10 | } |
11 | ``` | 11 | ``` |
12 | 12 | ||
13 | -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`. | 13 | +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`. |
14 | 14 | ||
15 | Example of a valid API request: | 15 | Example of a valid API request: |
16 | 16 |
doc/installation.md
@@ -167,7 +167,7 @@ and ensure you have followed all of the above steps carefully. | @@ -167,7 +167,7 @@ and ensure you have followed all of the above steps carefully. | ||
167 | # Login to MySQL | 167 | # Login to MySQL |
168 | $ mysql -u root -p | 168 | $ mysql -u root -p |
169 | 169 | ||
170 | - # Create the gitlabhq production database | 170 | + # Create the GitLab production database |
171 | mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; | 171 | mysql> CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; |
172 | 172 | ||
173 | # Create the MySQL User change $password to a real password | 173 | # Create the MySQL User change $password to a real password |
lib/gitlab/backend/gitolite.rb
@@ -170,7 +170,7 @@ module Gitlab | @@ -170,7 +170,7 @@ module Gitlab | ||
170 | def push | 170 | def push |
171 | Dir.chdir(File.join(@local_dir, "gitolite")) | 171 | Dir.chdir(File.join(@local_dir, "gitolite")) |
172 | `git add -A` | 172 | `git add -A` |
173 | - `git commit -am "Gitlab"` | 173 | + `git commit -am "GitLab"` |
174 | `git push` | 174 | `git push` |
175 | Dir.chdir(Rails.root) | 175 | Dir.chdir(Rails.root) |
176 | 176 |
lib/gitlab/markdown.rb
1 | module Gitlab | 1 | module Gitlab |
2 | - # Custom parser for Gitlab-flavored Markdown | 2 | + # Custom parser for GitLab-flavored Markdown |
3 | # | 3 | # |
4 | # It replaces references in the text with links to the appropriate items in Gitlab. | 4 | # It replaces references in the text with links to the appropriate items in Gitlab. |
5 | # | 5 | # |
lib/hooks/post-receive
1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
2 | 2 | ||
3 | -# This file was placed here by Gitlab. It makes sure that your pushed commits | 3 | +# This file was placed here by GitLab. It makes sure that your pushed commits |
4 | # will be processed properly. | 4 | # will be processed properly. |
5 | 5 | ||
6 | while read oldrev newrev ref | 6 | while read oldrev newrev ref |
lib/tasks/gitlab/write_hook.rake
1 | namespace :gitlab do | 1 | namespace :gitlab do |
2 | namespace :gitolite do | 2 | namespace :gitolite do |
3 | - desc "GITLAB | Write GITLAB hook for gitolite" | 3 | + desc "GITLAB | Write GitLab hook for gitolite" |
4 | task :write_hooks => :environment do | 4 | task :write_hooks => :environment do |
5 | gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") | 5 | gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common") |
6 | gitlab_hooks_path = Rails.root.join("lib", "hooks") | 6 | gitlab_hooks_path = Rails.root.join("lib", "hooks") |