Skip to content

Commit

Permalink
Capitlization of /gitlab/i normalized. #1367
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexDenisov committed Sep 6, 2012
1 parent 6e5cd8e commit 09a86bd
Show file tree
Hide file tree
Showing 24 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions app/assets/stylesheets/main.scss
@@ -1,13 +1,13 @@
@import "bootstrap";
@import "bootstrap-responsive";

/** GITLAB colors **/
/** GitLab colors **/
$link_color:#3A89A3;
$blue_link: #2fa0bb;
$style_color: #474d57;
$hover: #fdf5d9;

/** GITLAB Fonts **/
/** GitLab Fonts **/
@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); }

/** MIXINS **/
Expand Down Expand Up @@ -106,9 +106,9 @@ $hover: #fdf5d9;
@import "themes/ui_modern.scss";

/**
* Gitlab bootstrap.
* GitLab 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/typography.scss";
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/gitlab_markdown_helper.rb
@@ -1,6 +1,6 @@
module GitlabMarkdownHelper
# 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
# html_options - extra options for the reference links as given to link_to
Expand Down
8 changes: 4 additions & 4 deletions app/mailers/notify.rb
Expand Up @@ -111,18 +111,18 @@ def recipient(recipient_id)
# Examples
#
# >> subject('Lorem ipsum')
# => "gitlab | Lorem ipsum"
# => "GitLab | Lorem ipsum"
#
# # Automatically inserts Project name when @project is set
# >> @project = Project.last
# => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
# >> subject('Lorem ipsum')
# => "gitlab | Lorem ipsum | Ruby on Rails"
# => "GitLab | Lorem ipsum | Ruby on Rails"
#
# # Accepts multiple arguments
# >> subject('Lorem ipsum', 'Dolor sit amet')
# => "gitlab | Lorem ipsum | Dolor sit amet"
# => "GitLab | Lorem ipsum | Dolor sit amet"
def subject(*extra)
"gitlab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "")
"GitLab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "")
end
end
2 changes: 1 addition & 1 deletion app/views/errors/gitolite.html.haml
@@ -1,6 +1,6 @@
%h1 Git Error
%hr
%h2 Gitlab was unable to access your Gitolite system.
%h2 GitLab was unable to access your Gitolite system.

.git_error_tips
%h4 Tips for Administrator:
Expand Down
2 changes: 1 addition & 1 deletion app/views/help/index.html.haml
Expand Up @@ -30,7 +30,7 @@
%h5= link_to "API", help_api_path

%li
%h5= link_to "Gitlab Markdown", help_markdown_path
%h5= link_to "GitLab Markdown", help_markdown_path

%li
%h5= link_to "SSH keys", help_ssh_path
6 changes: 3 additions & 3 deletions app/views/help/markdown.html.haml
@@ -1,4 +1,4 @@
%h3.page_title Gitlab Flavored Markdown
%h3.page_title GitLab Flavored Markdown
.back_link
= link_to help_path do
&larr; to index
Expand All @@ -7,7 +7,7 @@
.row
.span8
%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.

%p You can use GFM in:
Expand Down Expand Up @@ -62,7 +62,7 @@
%p becomes
= markdown %Q{```ruby\nrequire 'redcarpet'\nmarkdown = Redcarpet.new("Hello World!")\nputs markdown.to_html\n```}

%h4 Special Gitlab references
%h4 Special GitLab references

%p
GFM recognizes special references.
Expand Down
4 changes: 2 additions & 2 deletions app/views/help/ssh.html.haml
Expand Up @@ -5,7 +5,7 @@
%hr

%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
To generate a new SSH key just open your terminal and use code below.
Expand All @@ -17,7 +17,7 @@
\# Generating public/private rsa key pair...

%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
cat ~/.ssh/id_rsa.pub
Expand Down
2 changes: 1 addition & 1 deletion app/views/help/system_hooks.html.haml
Expand Up @@ -5,7 +5,7 @@
%hr

%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
System Hooks can be used for logging or change information in LDAP server.
%br
Expand Down
4 changes: 2 additions & 2 deletions app/views/help/web_hooks.html.haml
Expand Up @@ -5,11 +5,11 @@
%hr

%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
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
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:
= render "hooks/data_ex"

2 changes: 1 addition & 1 deletion app/views/help/workflow.html.haml
Expand Up @@ -24,7 +24,7 @@
git commit -am "My feature is ready"

%li
%p Push your branch to gitlabhq
%p Push your branch to GitLab
.bash
%pre.dark
git push origin $feature_name
Expand Down
2 changes: 1 addition & 1 deletion app/views/hooks/_data_ex.html.erb
Expand Up @@ -32,7 +32,7 @@
:timestamp => "2012-01-03T23:36:29+02:00",
:url => "http://localhost/diaspora/commits/da1560886d...",
:author => {
:name => "gitlab dev user",
:name => "GitLab dev user",
:email => "gitlabdev@dv6700.(none)"
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/issues/_form.html.haml
Expand Up @@ -38,7 +38,7 @@
= f.label :description, "Details"
.input
= 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
Expand Down
2 changes: 1 addition & 1 deletion app/views/keys/index.html.haml
Expand Up @@ -4,7 +4,7 @@

%hr
%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
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/notify.html.haml
Expand Up @@ -2,7 +2,7 @@
%head
%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
%title
gitlabhq
GitLab
:css
.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;}
Expand All @@ -21,7 +21,7 @@
%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;"}
gitlab
GITLAB
- if @project
| #{@project.name}
%table{align: "center", bgcolor: "#fff", border: "0", cellpadding: "0", cellspacing: "0", style: "font-family: Helvetica, Arial, sans-serif; background: #fff;", width: "600"}
Expand Down
2 changes: 1 addition & 1 deletion app/views/milestones/_form.html.haml
Expand Up @@ -22,7 +22,7 @@
= f.label :description, "Description", class: "control-label"
.controls
= 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
.control-group
= f.label :due_date, "Due Date", class: "control-label"
Expand Down
2 changes: 1 addition & 1 deletion app/views/notes/_form.html.haml
Expand Up @@ -11,7 +11,7 @@
= f.text_area :note, size: 255, class: 'note-text'
#preview-note.preview_note.hide
.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

.row.note_advanced_opts.hide
Expand Down
2 changes: 1 addition & 1 deletion app/views/notify/new_user_email.html.haml
Expand Up @@ -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; "}
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; "}
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"}
%tr
%td{style: "font-size: 1px; line-height: 1px;", width: "21"}
Expand Down
2 changes: 1 addition & 1 deletion app/views/wikis/_form.html.haml
Expand Up @@ -14,7 +14,7 @@
.middle_box_content
.input
%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
%code [Link Title](page-slug)
\.
Expand Down
4 changes: 2 additions & 2 deletions doc/api/README.md
@@ -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.

Expand All @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion doc/installation.md
Expand Up @@ -167,7 +167,7 @@ and ensure you have followed all of the above steps carefully.
# Login to MySQL
$ 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`;

# Create the MySQL User change $password to a real password
Expand Down
2 changes: 1 addition & 1 deletion lib/gitlab/backend/gitolite.rb
Expand Up @@ -170,7 +170,7 @@ def pull
def push
Dir.chdir(File.join(@local_dir, "gitolite"))
`git add -A`
`git commit -am "Gitlab"`
`git commit -am "GitLab"`
`git push`
Dir.chdir(Rails.root)

Expand Down
2 changes: 1 addition & 1 deletion lib/gitlab/markdown.rb
@@ -1,5 +1,5 @@
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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/hooks/post-receive
@@ -1,6 +1,6 @@
#!/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.

while read oldrev newrev ref
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/gitlab/write_hook.rake
@@ -1,6 +1,6 @@
namespace :gitlab do
namespace :gitolite do
desc "GITLAB | Write GITLAB hook for gitolite"
desc "GITLAB | Write GitLab hook for gitolite"
task :write_hooks => :environment do
gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
gitlab_hooks_path = Rails.root.join("lib", "hooks")
Expand Down

0 comments on commit 09a86bd

Please sign in to comment.