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
Kazuhiko Shiozaki
gitlab-ce
Commits
05cca934
Commit
05cca934
authored
Jul 29, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use URL helpers
parent
a784b996
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
app/models/group.rb
app/models/group.rb
+2
-2
app/models/project.rb
app/models/project.rb
+1
-1
app/models/user.rb
app/models/user.rb
+2
-1
No files found.
app/models/group.rb
View file @
05cca934
...
@@ -17,7 +17,7 @@ require 'carrierwave/orm/activerecord'
...
@@ -17,7 +17,7 @@ require 'carrierwave/orm/activerecord'
require
'file_size_validator'
require
'file_size_validator'
class
Group
<
Namespace
class
Group
<
Namespace
include
Gitlab
::
ConfigHelper
include
Rails
.
application
.
routes
.
url_helpers
include
Referable
include
Referable
has_many
:group_members
,
dependent: :destroy
,
as: :source
,
class_name:
'GroupMember'
has_many
:group_members
,
dependent: :destroy
,
as: :source
,
class_name:
'GroupMember'
...
@@ -64,7 +64,7 @@ class Group < Namespace
...
@@ -64,7 +64,7 @@ class Group < Namespace
end
end
def
web_url
def
web_url
[
gitlab_config
.
url
,
"groups"
,
self
.
path
].
join
(
'/'
)
group_url
(
self
)
end
end
def
owners
def
owners
...
...
app/models/project.rb
View file @
05cca934
...
@@ -316,7 +316,7 @@ class Project < ActiveRecord::Base
...
@@ -316,7 +316,7 @@ class Project < ActiveRecord::Base
end
end
def
web_url
def
web_url
[
gitlab_config
.
url
,
path_with_namespace
].
join
(
'/'
)
namespace_project_url
(
self
.
namespace
,
self
)
end
end
def
web_url_without_protocol
def
web_url_without_protocol
...
...
app/models/user.rb
View file @
05cca934
...
@@ -67,6 +67,7 @@ class User < ActiveRecord::Base
...
@@ -67,6 +67,7 @@ class User < ActiveRecord::Base
include
Gitlab
::
ConfigHelper
include
Gitlab
::
ConfigHelper
include
Gitlab
::
CurrentSettings
include
Gitlab
::
CurrentSettings
include
Rails
.
application
.
routes
.
url_helpers
include
Referable
include
Referable
include
Sortable
include
Sortable
include
TokenAuthenticatable
include
TokenAuthenticatable
...
@@ -638,7 +639,7 @@ class User < ActiveRecord::Base
...
@@ -638,7 +639,7 @@ class User < ActiveRecord::Base
end
end
def
web_url
def
web_url
[
gitlab_config
.
url
,
"u"
,
self
.
username
].
join
(
'/'
)
user_url
(
self
)
end
end
def
all_emails
def
all_emails
...
...
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