BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
aeab4e62
Unverified
Commit
aeab4e62
authored
Mar 07, 2018
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Project#full_name instead of name_with_namespace
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
001a28d0
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
notify.rb
app/mailers/notify.rb
+1
-1
create_service.rb
app/services/projects/create_service.rb
+1
-1
emails_on_push_worker.rb
app/workers/emails_on_push_worker.rb
+1
-1
project.rb
features/steps/shared/project.rb
+3
-3
importer.rb
lib/gitlab/bitbucket_import/importer.rb
+1
-1
build.rb
lib/gitlab/data_builder/build.rb
+1
-1
issue_new.rb
lib/gitlab/slash_commands/presenters/issue_new.rb
+1
-1
issue_show.rb
lib/gitlab/slash_commands/presenters/issue_show.rb
+1
-1
helpers.rb
lib/system_check/helpers.rb
+1
-1
No files found.
app/mailers/notify.rb
View file @
aeab4e62
...
...
@@ -117,7 +117,7 @@ class Notify < BaseMailer
if
Gitlab
::
IncomingEmail
.
enabled?
&&
@sent_notification
address
=
Mail
::
Address
.
new
(
Gitlab
::
IncomingEmail
.
reply_address
(
reply_key
))
address
.
display_name
=
@project
.
name_with_namespac
e
address
.
display_name
=
@project
.
full_nam
e
headers
[
'Reply-To'
]
=
address
...
...
app/services/projects/create_service.rb
View file @
aeab4e62
...
...
@@ -85,7 +85,7 @@ module Projects
end
def
after_create_actions
log_info
(
"
#{
@project
.
owner
.
name
}
created a new project
\"
#{
@project
.
name_with_namespac
e
}
\"
"
)
log_info
(
"
#{
@project
.
owner
.
name
}
created a new project
\"
#{
@project
.
full_nam
e
}
\"
"
)
unless
@project
.
gitlab_project_import?
@project
.
write_repository_config
...
...
app/workers/emails_on_push_worker.rb
View file @
aeab4e62
...
...
@@ -66,7 +66,7 @@ class EmailsOnPushWorker
# These are input errors and won't be corrected even if Sidekiq retries
rescue
Net
::
SMTPFatalError
,
Net
::
SMTPSyntaxError
=>
e
logger
.
info
(
"Failed to send e-mail for project '
#{
project
.
name_with_namespac
e
}
' to
#{
recipient
}
:
#{
e
}
"
)
logger
.
info
(
"Failed to send e-mail for project '
#{
project
.
full_nam
e
}
' to
#{
recipient
}
:
#{
e
}
"
)
end
end
ensure
...
...
features/steps/shared/project.rb
View file @
aeab4e62
...
...
@@ -82,7 +82,7 @@ module SharedProject
step
'I should see project "Shop" activity feed'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
expect
(
page
).
to
have_content
"
#{
@user
.
name
}
pushed new branch fix at
#{
project
.
name_with_namespac
e
}
"
expect
(
page
).
to
have_content
"
#{
@user
.
name
}
pushed new branch fix at
#{
project
.
full_nam
e
}
"
end
step
'I should see project settings'
do
...
...
@@ -113,12 +113,12 @@ module SharedProject
step
'I should not see project "Archive"'
do
project
=
Project
.
find_by
(
name:
"Archive"
)
expect
(
page
).
not_to
have_content
project
.
name_with_namespac
e
expect
(
page
).
not_to
have_content
project
.
full_nam
e
end
step
'I should see project "Archive"'
do
project
=
Project
.
find_by
(
name:
"Archive"
)
expect
(
page
).
to
have_content
project
.
name_with_namespac
e
expect
(
page
).
to
have_content
project
.
full_nam
e
end
# ----------------------------------------
...
...
lib/gitlab/bitbucket_import/importer.rb
View file @
aeab4e62
...
...
@@ -135,7 +135,7 @@ module Gitlab
if
label
.
valid?
@labels
[
label_params
[
:title
]]
=
label
else
raise
"Failed to create label
\"
#{
label_params
[
:title
]
}
\"
for project
\"
#{
project
.
name_with_namespac
e
}
\"
"
raise
"Failed to create label
\"
#{
label_params
[
:title
]
}
\"
for project
\"
#{
project
.
full_nam
e
}
\"
"
end
end
end
...
...
lib/gitlab/data_builder/build.rb
View file @
aeab4e62
...
...
@@ -31,7 +31,7 @@ module Gitlab
# TODO: do we still need it?
project_id:
project
.
id
,
project_name:
project
.
name_with_namespac
e
,
project_name:
project
.
full_nam
e
,
user:
{
id:
user
.
try
(
:id
),
...
...
lib/gitlab/slash_commands/presenters/issue_new.rb
View file @
aeab4e62
...
...
@@ -38,7 +38,7 @@ module Gitlab
end
def
project_link
"[
#{
project
.
name_with_namespac
e
}
](
#{
project
.
web_url
}
)"
"[
#{
project
.
full_nam
e
}
](
#{
project
.
web_url
}
)"
end
def
author_profile_link
...
...
lib/gitlab/slash_commands/presenters/issue_show.rb
View file @
aeab4e62
...
...
@@ -53,7 +53,7 @@ module Gitlab
end
def
pretext
"Issue *
#{
@resource
.
to_reference
}
* from
#{
project
.
name_with_namespac
e
}
"
"Issue *
#{
@resource
.
to_reference
}
* from
#{
project
.
full_nam
e
}
"
end
end
end
...
...
lib/system_check/helpers.rb
View file @
aeab4e62
...
...
@@ -50,7 +50,7 @@ module SystemCheck
if
should_sanitize?
"
#{
project
.
namespace_id
.
to_s
.
color
(
:yellow
)
}
/
#{
project
.
id
.
to_s
.
color
(
:yellow
)
}
... "
else
"
#{
project
.
name_with_namespac
e
.
color
(
:yellow
)
}
... "
"
#{
project
.
full_nam
e
.
color
(
:yellow
)
}
... "
end
end
...
...
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