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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
05ca0a31
Commit
05ca0a31
authored
Oct 18, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refactor/gitlab_config_helper' of /home/git/repositories/gitlab/gitlabhq
parents
164f9d87
2cd3d421
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/helpers/profile_helper.rb
app/helpers/profile_helper.rb
+1
-1
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+1
-1
app/views/devise/shared/_links.erb
app/views/devise/shared/_links.erb
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+1
-1
app/views/projects/wikis/git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+1
-1
No files found.
app/helpers/profile_helper.rb
View file @
05ca0a31
...
...
@@ -14,6 +14,6 @@ module ProfileHelper
end
def
show_profile_remove_tab?
Gitlab
.
config
.
gitlab
.
signup_enabled
&&
!
current_user
.
ldap_user?
gitlab_config
.
signup_enabled
&&
!
current_user
.
ldap_user?
end
end
app/views/devise/sessions/new.html.haml
View file @
05ca0a31
...
...
@@ -18,7 +18,7 @@
=
render
'devise/sessions/oauth_providers'
if
devise_mapping
.
omniauthable?
-
if
Gitlab
.
config
.
gitlab
.
signup_enabled
-
if
gitlab_config
.
signup_enabled
%hr
%div
Don't have an account?
...
...
app/views/devise/shared/_links.erb
View file @
05ca0a31
...
...
@@ -2,7 +2,7 @@
<%=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
class:
"btn"
%>
<br
/>
<%
end
-%>
<%-
if
devise_mapping
.
registerable?
&&
controller_name
!=
'registrations'
&&
Gitlab
.
config
.
gitlab
.
signup_enabled
%>
<%-
if
devise_mapping
.
registerable?
&&
controller_name
!=
'registrations'
&&
gitlab_config
.
signup_enabled
%>
<%=
link_to
"Sign up"
,
new_registration_path
(
resource_name
)
%>
<br
/>
<%
end
-%>
...
...
app/views/projects/new.html.haml
View file @
05ca0a31
...
...
@@ -51,7 +51,7 @@
=
f
.
label
:public
do
%span
Public project
.controls
=
f
.
check_box
:public
,
{
checked:
Gitlab
.
config
.
gitlab
.
default_projects_features
.
public
},
true
,
false
=
f
.
check_box
:public
,
{
checked:
gitlab_config
.
default_projects_features
.
public
},
true
,
false
%span
.help-inline
Make project visible to everyone
.form-actions
...
...
app/views/projects/wikis/git_access.html.haml
View file @
05ca0a31
...
...
@@ -11,7 +11,7 @@
.form-horizontal
.input-prepend.project_clone_holder
%button
{
class:
"btn active"
,
:"data-clone"
=>
@gollum_wiki
.
ssh_url_to_repo
}
SSH
%button
{
class:
"btn"
,
:"data-clone"
=>
@gollum_wiki
.
http_url_to_repo
}=
Gitlab
.
config
.
gitlab
.
protocol
.
upcase
%button
{
class:
"btn"
,
:"data-clone"
=>
@gollum_wiki
.
http_url_to_repo
}=
gitlab_config
.
protocol
.
upcase
=
text_field_tag
:project_clone
,
@gollum_wiki
.
url_to_repo
,
class:
"one_click_select input-xxlarge"
,
readonly:
true
.git-empty
%fieldset
...
...
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