Download as
Browse Code »

Commit de29a424e6d1a5349a2738e9f02b04fe168f3676

Authored by Ben Bodenmiller
1 parent 6cf29166
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

changed Gitlab to GitLab

Showing 7 changed files with 21 additions and 21 deletions   Show diff stats
doc/raketasks/maintenance.md
  Diff comments   View file @de29a42
@@ -66,7 +66,7 @@ python2 is supported version? ... yes @@ -66,7 +66,7 @@ python2 is supported version? ... yes
66 66
67 Checking Environment ... Finished 67 Checking Environment ... Finished
68 68
69 -Checking Gitlab Shell ... 69 +Checking GitLab Shell ...
70 70
71 GitLab Shell version? ... OK (1.2.0) 71 GitLab Shell version? ... OK (1.2.0)
72 Repo base directory exists? ... yes 72 Repo base directory exists? ... yes
@@ -76,7 +76,7 @@ Repo base access is drwxrws---? ... yes @@ -76,7 +76,7 @@ Repo base access is drwxrws---? ... yes
76 post-receive hook up-to-date? ... yes 76 post-receive hook up-to-date? ... yes
77 post-receive hooks in repos are links: ... yes 77 post-receive hooks in repos are links: ... yes
78 78
79 -Checking Gitlab Shell ... Finished 79 +Checking GitLab Shell ... Finished
80 80
81 Checking Sidekiq ... 81 Checking Sidekiq ...
82 82
features/project/source/search_code.feature
  Diff comments   View file @de29a42
@@ -4,6 +4,6 @@ Feature: Project Search code @@ -4,6 +4,6 @@ Feature: Project Search code
4 And I own project "Shop" 4 And I own project "Shop"
5 Given I visit project source page 5 Given I visit project source page
6 6
7 - Scenario: Search for term "Welcome to Gitlab"  
8 - When I search for term "Welcome to Gitlab"  
9 - Then I should see files from repository containing "Welcome to Gitlab" 7 + Scenario: Search for term "Welcome to GitLab"
  8 + When I search for term "Welcome to GitLab"
  9 + Then I should see files from repository containing "Welcome to GitLab"
features/steps/project/project_search_code.rb
  Diff comments   View file @de29a42
@@ -3,14 +3,14 @@ class ProjectSearchCode < Spinach::FeatureSteps @@ -3,14 +3,14 @@ class ProjectSearchCode < Spinach::FeatureSteps
3 include SharedProject 3 include SharedProject
4 include SharedPaths 4 include SharedPaths
5 5
6 - When 'I search for term "Welcome to Gitlab"' do  
7 - fill_in "search", with: "Welcome to Gitlab" 6 + When 'I search for term "Welcome to GitLab"' do
  7 + fill_in "search", with: "Welcome to GitLab"
8 click_button "Go" 8 click_button "Go"
9 click_link 'Repository Code' 9 click_link 'Repository Code'
10 end 10 end
11 11
12 - Then 'I should see files from repository containing "Welcome to Gitlab"' do  
13 - page.should have_content "Welcome to Gitlab" 12 + Then 'I should see files from repository containing "Welcome to GitLab"' do
  13 + page.should have_content "Welcome to GitLab"
14 page.should have_content "GitLab is a free project and repository management application" 14 page.should have_content "GitLab is a free project and repository management application"
15 end 15 end
16 16
lib/support/init.d/gitlab
  Diff comments   View file @de29a42
@@ -24,7 +24,7 @@ SIDEKIQ_PID="$PID_PATH/sidekiq.pid" @@ -24,7 +24,7 @@ SIDEKIQ_PID="$PID_PATH/sidekiq.pid"
24 STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop" 24 STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop"
25 START_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:start" 25 START_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:start"
26 NAME="gitlab" 26 NAME="gitlab"
27 -DESC="Gitlab service" 27 +DESC="GitLab service"
28 28
29 check_pid(){ 29 check_pid(){
30 if [ -f $WEB_SERVER_PID ]; then 30 if [ -f $WEB_SERVER_PID ]; then
lib/tasks/gitlab/check.rake
  Diff comments   View file @de29a42
@@ -362,10 +362,10 @@ namespace :gitlab do @@ -362,10 +362,10 @@ namespace :gitlab do
362 362
363 363
364 namespace :gitlab_shell do 364 namespace :gitlab_shell do
365 - desc "GITLAB | Check the configuration of Gitlab Shell" 365 + desc "GITLAB | Check the configuration of GitLab Shell"
366 task check: :environment do 366 task check: :environment do
367 warn_user_is_not_gitlab 367 warn_user_is_not_gitlab
368 - start_checking "Gitlab Shell" 368 + start_checking "GitLab Shell"
369 369
370 check_gitlab_shell 370 check_gitlab_shell
371 check_repo_base_exists 371 check_repo_base_exists
@@ -375,7 +375,7 @@ namespace :gitlab do @@ -375,7 +375,7 @@ namespace :gitlab do
375 check_post_receive_hook_is_up_to_date 375 check_post_receive_hook_is_up_to_date
376 check_repos_post_receive_hooks_is_link 376 check_repos_post_receive_hooks_is_link
377 377
378 - finished_checking "Gitlab Shell" 378 + finished_checking "GitLab Shell"
379 end 379 end
380 380
381 381
@@ -410,12 +410,12 @@ namespace :gitlab do @@ -410,12 +410,12 @@ namespace :gitlab do
410 puts "no".red 410 puts "no".red
411 puts "#{repo_base_path} is missing".red 411 puts "#{repo_base_path} is missing".red
412 try_fixing_it( 412 try_fixing_it(
413 - "This should have been created when setting up Gitlab Shell.", 413 + "This should have been created when setting up GitLab Shell.",
414 "Make sure it's set correctly in config/gitlab.yml", 414 "Make sure it's set correctly in config/gitlab.yml",
415 - "Make sure Gitlab Shell is installed correctly." 415 + "Make sure GitLab Shell is installed correctly."
416 ) 416 )
417 for_more_information( 417 for_more_information(
418 - see_installation_guide_section "Gitlab Shell" 418 + see_installation_guide_section "GitLab Shell"
419 ) 419 )
420 fix_and_rerun 420 fix_and_rerun
421 end 421 end
@@ -460,7 +460,7 @@ namespace :gitlab do @@ -460,7 +460,7 @@ namespace :gitlab do
460 "find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s" 460 "find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s"
461 ) 461 )
462 for_more_information( 462 for_more_information(
463 - see_installation_guide_section "Gitlab Shell" 463 + see_installation_guide_section "GitLab Shell"
464 ) 464 )
465 fix_and_rerun 465 fix_and_rerun
466 end 466 end
@@ -486,7 +486,7 @@ namespace :gitlab do @@ -486,7 +486,7 @@ namespace :gitlab do
486 "sudo chown -R #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group} #{repo_base_path}" 486 "sudo chown -R #{gitlab_shell_ssh_user}:#{gitlab_shell_owner_group} #{repo_base_path}"
487 ) 487 )
488 for_more_information( 488 for_more_information(
489 - see_installation_guide_section "Gitlab Shell" 489 + see_installation_guide_section "GitLab Shell"
490 ) 490 )
491 fix_and_rerun 491 fix_and_rerun
492 end 492 end
@@ -535,7 +535,7 @@ namespace :gitlab do @@ -535,7 +535,7 @@ namespace :gitlab do
535 File.realpath(project_hook_file) == File.realpath(gitlab_shell_hook_file) 535 File.realpath(project_hook_file) == File.realpath(gitlab_shell_hook_file)
536 puts "ok".green 536 puts "ok".green
537 else 537 else
538 - puts "not a link to Gitlab Shell's hook".red 538 + puts "not a link to GitLab Shell's hook".red
539 try_fixing_it( 539 try_fixing_it(
540 "sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}" 540 "sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
541 ) 541 )
spec/features/gitlab_flavored_markdown_spec.rb
  Diff comments   View file @de29a42
1 require 'spec_helper' 1 require 'spec_helper'
2 2
3 -describe "Gitlab Flavored Markdown" do 3 +describe "GitLab Flavored Markdown" do
4 let(:project) { create(:project_with_code) } 4 let(:project) { create(:project_with_code) }
5 let(:issue) { create(:issue, project: project) } 5 let(:issue) { create(:issue, project: project) }
6 let(:merge_request) { create(:merge_request, project: project) } 6 let(:merge_request) { create(:merge_request, project: project) }
spec/helpers/gitlab_markdown_helper_spec.rb
  Diff comments   View file @de29a42
@@ -370,7 +370,7 @@ describe GitlabMarkdownHelper do @@ -370,7 +370,7 @@ describe GitlabMarkdownHelper do
370 @wiki.stub(:content).and_return('wiki content') 370 @wiki.stub(:content).and_return('wiki content')
371 end 371 end
372 372
373 - it "should use Gitlab Flavored Markdown for markdown files" do 373 + it "should use GitLab Flavored Markdown for markdown files" do
374 @wiki.stub(:format).and_return(:markdown) 374 @wiki.stub(:format).and_return(:markdown)
375 375
376 helper.should_receive(:markdown).with('wiki content') 376 helper.should_receive(:markdown).with('wiki content')