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
Jérome Perrin
gitlab-ce
Commits
3d369a5b
Commit
3d369a5b
authored
Feb 10, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove settings from gitlab.yml.example which we already have in UI
parent
367dee33
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
18 deletions
+2
-18
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+2
-1
config/gitlab.yml.example
config/gitlab.yml.example
+0
-17
No files found.
app/views/admin/application_settings/_form.html.haml
View file @
3d369a5b
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
.form-group
.form-group
=
f
.
label
:sign_in_text
,
class:
'control-label'
=
f
.
label
:sign_in_text
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
text_area
:sign_in_text
,
class:
'form-control'
=
f
.
text_area
:sign_in_text
,
class:
'form-control'
,
rows:
4
.help-block
Markdown enabled
.form-actions
.form-actions
=
f
.
submit
'Save'
,
class:
'btn btn-primary'
=
f
.
submit
'Save'
,
class:
'btn btn-primary'
config/gitlab.yml.example
View file @
3d369a5b
...
@@ -46,8 +46,6 @@ production: &base
...
@@ -46,8 +46,6 @@ production: &base
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
# Email server smtp settings are in config/initializers/smtp_settings.rb.sample
## User settings
default_projects_limit: 10
# default_can_create_group: false # default: true
# default_can_create_group: false # default: true
# username_changing_enabled: false # default: true - User can change her username/namespace
# username_changing_enabled: false # default: true - User can change her username/namespace
## Default theme
## Default theme
...
@@ -58,16 +56,6 @@ production: &base
...
@@ -58,16 +56,6 @@ production: &base
## COLOR = 5
## COLOR = 5
# default_theme: 2 # default: 2
# default_theme: 2 # default: 2
## Users can create accounts
# This also allows normal users to sign up for accounts themselves
# default: true - By default users can sign up themselves
# signup_enabled: true
## Standard login settings
# The standard login can be disabled to force login via LDAP
# default: true - If set to false the standard login form won't be shown on the sign-in page
# signin_enabled: false
# Restrict setting visibility levels for non-admin users.
# Restrict setting visibility levels for non-admin users.
# The default is to allow all levels.
# The default is to allow all levels.
# restricted_visibility_levels: [ "public" ]
# restricted_visibility_levels: [ "public" ]
...
@@ -296,11 +284,6 @@ production: &base
...
@@ -296,11 +284,6 @@ production: &base
# piwik_url: '_your_piwik_url'
# piwik_url: '_your_piwik_url'
# piwik_site_id: '_your_piwik_site_id'
# piwik_site_id: '_your_piwik_site_id'
## Text under sign-in page (Markdown enabled)
# sign_in_text: |
# ![Company Logo](http://www.companydomain.com/logo.png)
# [Learn more about CompanyName](http://www.companydomain.com/)
rack_attack:
rack_attack:
git_basic_auth:
git_basic_auth:
# Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers
# Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers
...
...
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