Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
7c1c0388
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c1c0388
编写于
4月 23, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://gitlab.com/gitlab-org/gitlab-ce
上级
3bb8c17c
3295a4db
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
2 deletion
+6
-2
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
config/initializers/devise.rb
config/initializers/devise.rb
+2
-1
doc/integration/omniauth.md
doc/integration/omniauth.md
+2
-0
未找到文件。
app/helpers/application_helper.rb
浏览文件 @
7c1c0388
...
...
@@ -75,7 +75,7 @@ module ApplicationHelper
else
gravatar_url
=
request
.
ssl?
||
gitlab_config
.
https
?
Gitlab
.
config
.
gravatar
.
ssl_url
:
Gitlab
.
config
.
gravatar
.
plain_url
user_email
.
strip!
sprintf
gravatar_url
,
hash:
Digest
::
MD5
.
hexdigest
(
user_email
.
downcase
),
size:
size
sprintf
gravatar_url
,
hash:
Digest
::
MD5
.
hexdigest
(
user_email
.
downcase
),
size:
size
,
email:
user_email
end
end
...
...
config/gitlab.yml.example
浏览文件 @
7c1c0388
...
...
@@ -122,6 +122,7 @@ production: &base
## Gravatar
gravatar:
enabled: true # Use user avatar image from Gravatar.com (default: true)
# gravatar urls: possible placeholders: %{hash} %{size} %{email}
# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
...
...
config/initializers/devise.rb
浏览文件 @
7c1c0388
...
...
@@ -223,6 +223,7 @@ Devise.setup do |config|
method:
Gitlab
.
config
.
ldap
[
'method'
],
bind_dn:
Gitlab
.
config
.
ldap
[
'bind_dn'
],
password:
Gitlab
.
config
.
ldap
[
'password'
],
filter:
Gitlab
.
config
.
ldap
[
'user_filter'
],
name_proc:
email_stripping_proc
end
...
...
@@ -244,4 +245,4 @@ Devise.setup do |config|
config
.
omniauth
provider
[
'name'
].
to_sym
,
*
provider_arguments
end
end
end
\ No newline at end of file
doc/integration/omniauth.md
浏览文件 @
7c1c0388
...
...
@@ -21,6 +21,7 @@ Before configuring individual OmniAuth providers there are a few global settings
```
2.
Find the section dealing with OmniAuth. The section will look similar to the following.
<br
/>
```
## OmniAuth settings
omniauth:
...
...
@@ -50,6 +51,7 @@ Before configuring individual OmniAuth providers there are a few global settings
# app_secret: 'YOUR APP SECRET',
# args: { scope: 'user:email' } }
```
3.
Change
`enabled`
to
`true`
.
4.
Consider the next two configuration options:
`allow_single_sign_on`
and
`block_auto_created_users`
.
*
`allow_single_sign_on`
defaults to
`false`
. If
`false`
users must be created manually or they will not be able to
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录