Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
edc2e0a6
Commit
edc2e0a6
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3990 from bbodenmiller/patch-gitlab-cap
changed Gitlab to GitLab in user facing locations
parents
6cf29166
de29a424
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
21 deletions
+21
-21
doc/raketasks/maintenance.md
doc/raketasks/maintenance.md
+2
-2
features/project/source/search_code.feature
features/project/source/search_code.feature
+3
-3
features/steps/project/project_search_code.rb
features/steps/project/project_search_code.rb
+4
-4
lib/support/init.d/gitlab
lib/support/init.d/gitlab
+1
-1
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/check.rake
+9
-9
spec/features/gitlab_flavored_markdown_spec.rb
spec/features/gitlab_flavored_markdown_spec.rb
+1
-1
spec/helpers/gitlab_markdown_helper_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
+1
-1
No files found.
doc/raketasks/maintenance.md
View file @
edc2e0a6
...
...
@@ -66,7 +66,7 @@ python2 is supported version? ... yes
Checking Environment ... Finished
Checking Git
l
ab Shell ...
Checking Git
L
ab 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 Git
l
ab Shell ... Finished
Checking Git
L
ab Shell ... Finished
Checking Sidekiq ...
...
...
This diff is collapsed.
Click to expand it.
features/project/source/search_code.feature
View file @
edc2e0a6
...
...
@@ -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 Git
l
ab"
When
I search for term
"Welcome to Git
l
ab"
Then
I should see files from repository containing
"Welcome to Git
l
ab"
Scenario
:
Search for term "Welcome to Git
L
ab"
When
I search for term
"Welcome to Git
L
ab"
Then
I should see files from repository containing
"Welcome to Git
L
ab"
This diff is collapsed.
Click to expand it.
features/steps/project/project_search_code.rb
View file @
edc2e0a6
...
...
@@ -3,14 +3,14 @@ class ProjectSearchCode < Spinach::FeatureSteps
include
SharedProject
include
SharedPaths
When
'I search for term "Welcome to Git
l
ab"'
do
fill_in
"search"
,
with:
"Welcome to Git
l
ab"
When
'I search for term "Welcome to Git
L
ab"'
do
fill_in
"search"
,
with:
"Welcome to Git
L
ab"
click_button
"Go"
click_link
'Repository Code'
end
Then
'I should see files from repository containing "Welcome to Git
l
ab"'
do
page
.
should
have_content
"Welcome to Git
l
ab"
Then
'I should see files from repository containing "Welcome to Git
L
ab"'
do
page
.
should
have_content
"Welcome to Git
L
ab"
page
.
should
have_content
"GitLab is a free project and repository management application"
end
...
...
This diff is collapsed.
Click to expand it.
lib/support/init.d/gitlab
View file @
edc2e0a6
...
...
@@ -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
=
"Git
l
ab service"
DESC
=
"Git
L
ab service"
check_pid
(){
if
[
-f
$WEB_SERVER_PID
]
;
then
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/gitlab/check.rake
View file @
edc2e0a6
...
...
@@ -362,10 +362,10 @@ namespace :gitlab do
namespace
:gitlab_shell
do
desc
"GITLAB | Check the configuration of Git
l
ab Shell"
desc
"GITLAB | Check the configuration of Git
L
ab Shell"
task
check: :environment
do
warn_user_is_not_gitlab
start_checking
"Git
l
ab Shell"
start_checking
"Git
L
ab 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
"Git
l
ab Shell"
finished_checking
"Git
L
ab 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 Git
l
ab Shell."
,
"This should have been created when setting up Git
L
ab Shell."
,
"Make sure it's set correctly in config/gitlab.yml"
,
"Make sure Git
l
ab Shell is installed correctly."
"Make sure Git
L
ab Shell is installed correctly."
)
for_more_information
(
see_installation_guide_section
"Git
l
ab Shell"
see_installation_guide_section
"Git
L
ab 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
"Git
l
ab Shell"
see_installation_guide_section
"Git
L
ab 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
"Git
l
ab Shell"
see_installation_guide_section
"Git
L
ab 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 Git
l
ab Shell's hook"
.
red
puts
"not a link to Git
L
ab Shell's hook"
.
red
try_fixing_it
(
"sudo -u
#{
gitlab_shell_ssh_user
}
ln -sf
#{
gitlab_shell_hook_file
}
#{
project_hook_file
}
"
)
...
...
This diff is collapsed.
Click to expand it.
spec/features/gitlab_flavored_markdown_spec.rb
View file @
edc2e0a6
require
'spec_helper'
describe
"Git
l
ab Flavored Markdown"
do
describe
"Git
L
ab Flavored Markdown"
do
let
(
:project
)
{
create
(
:project_with_code
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
project:
project
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/helpers/gitlab_markdown_helper_spec.rb
View file @
edc2e0a6
...
...
@@ -370,7 +370,7 @@ describe GitlabMarkdownHelper do
@wiki
.
stub
(
:content
).
and_return
(
'wiki content'
)
end
it
"should use Git
l
ab Flavored Markdown for markdown files"
do
it
"should use Git
L
ab Flavored Markdown for markdown files"
do
@wiki
.
stub
(
:format
).
and_return
(
:markdown
)
helper
.
should_receive
(
:markdown
).
with
(
'wiki content'
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment