Commit edc2e0a6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3990 from bbodenmiller/patch-gitlab-cap

changed Gitlab to GitLab in user facing locations
parents 6cf29166 de29a424
......@@ -66,7 +66,7 @@ python2 is supported version? ... yes
Checking Environment ... Finished
Checking Gitlab Shell ...
Checking GitLab Shell ...
GitLab Shell version? ... OK (1.2.0)
Repo base directory exists? ... yes
......@@ -76,7 +76,7 @@ Repo base access is drwxrws---? ... yes
post-receive hook up-to-date? ... yes
post-receive hooks in repos are links: ... yes
Checking Gitlab Shell ... Finished
Checking GitLab Shell ... Finished
Checking Sidekiq ...
......
......@@ -4,6 +4,6 @@ Feature: Project Search code
And I own project "Shop"
Given I visit project source page
Scenario: Search for term "Welcome to Gitlab"
When I search for term "Welcome to Gitlab"
Then I should see files from repository containing "Welcome to Gitlab"
Scenario: Search for term "Welcome to GitLab"
When I search for term "Welcome to GitLab"
Then I should see files from repository containing "Welcome to GitLab"
......@@ -3,14 +3,14 @@ class ProjectSearchCode < Spinach::FeatureSteps
include SharedProject
include SharedPaths
When 'I search for term "Welcome to Gitlab"' do
fill_in "search", with: "Welcome to Gitlab"
When 'I search for term "Welcome to GitLab"' do
fill_in "search", with: "Welcome to GitLab"
click_button "Go"
click_link 'Repository Code'
end
Then 'I should see files from repository containing "Welcome to Gitlab"' do
page.should have_content "Welcome to Gitlab"
Then 'I should see files from repository containing "Welcome to GitLab"' do
page.should have_content "Welcome to GitLab"
page.should have_content "GitLab is a free project and repository management application"
end
......
......@@ -24,7 +24,7 @@ SIDEKIQ_PID="$PID_PATH/sidekiq.pid"
STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop"
START_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:start"
NAME="gitlab"
DESC="Gitlab service"
DESC="GitLab service"
check_pid(){
if [ -f $WEB_SERVER_PID ]; then
......
......@@ -362,10 +362,10 @@ namespace :gitlab do
namespace :gitlab_shell do
desc "GITLAB | Check the configuration of Gitlab Shell"
desc "GITLAB | Check the configuration of GitLab Shell"
task check: :environment do
warn_user_is_not_gitlab
start_checking "Gitlab Shell"
start_checking "GitLab Shell"
check_gitlab_shell
check_repo_base_exists
......@@ -375,7 +375,7 @@ namespace :gitlab do
check_post_receive_hook_is_up_to_date
check_repos_post_receive_hooks_is_link
finished_checking "Gitlab Shell"
finished_checking "GitLab Shell"
end
......@@ -410,12 +410,12 @@ namespace :gitlab do
puts "no".red
puts "#{repo_base_path} is missing".red
try_fixing_it(
"This should have been created when setting up Gitlab Shell.",
"This should have been created when setting up GitLab Shell.",
"Make sure it's set correctly in config/gitlab.yml",
"Make sure Gitlab Shell is installed correctly."
"Make sure GitLab Shell is installed correctly."
)
for_more_information(
see_installation_guide_section "Gitlab Shell"
see_installation_guide_section "GitLab Shell"
)
fix_and_rerun
end
......@@ -460,7 +460,7 @@ namespace :gitlab do
"find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s"
)
for_more_information(
see_installation_guide_section "Gitlab Shell"
see_installation_guide_section "GitLab Shell"
)
fix_and_rerun
end
......@@ -486,7 +486,7 @@ namespace :gitlab do
"sudo chown -R #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group} #{repo_base_path}"
)
for_more_information(
see_installation_guide_section "Gitlab Shell"
see_installation_guide_section "GitLab Shell"
)
fix_and_rerun
end
......@@ -535,7 +535,7 @@ namespace :gitlab do
File.realpath(project_hook_file) == File.realpath(gitlab_shell_hook_file)
puts "ok".green
else
puts "not a link to Gitlab Shell's hook".red
puts "not a link to GitLab Shell's hook".red
try_fixing_it(
"sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
)
......
require 'spec_helper'
describe "Gitlab Flavored Markdown" do
describe "GitLab Flavored Markdown" do
let(:project) { create(:project_with_code) }
let(:issue) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, project: project) }
......
......@@ -370,7 +370,7 @@ describe GitlabMarkdownHelper do
@wiki.stub(:content).and_return('wiki content')
end
it "should use Gitlab Flavored Markdown for markdown files" do
it "should use GitLab Flavored Markdown for markdown files" do
@wiki.stub(:format).and_return(:markdown)
helper.should_receive(:markdown).with('wiki content')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment