Commit fd688f89163c4c35e560e8888040f7b96f9f6d1e
Exists in
spb-stable
and in
3 other branches
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Showing
2 changed files
with
10 additions
and
1 deletions
Show diff stats
config/gitlab.yml.example
@@ -154,7 +154,8 @@ production: &base | @@ -154,7 +154,8 @@ production: &base | ||
154 | # - { name: 'twitter', app_id: 'YOUR APP ID', | 154 | # - { name: 'twitter', app_id: 'YOUR APP ID', |
155 | # app_secret: 'YOUR APP SECRET'} | 155 | # app_secret: 'YOUR APP SECRET'} |
156 | # - { name: 'github', app_id: 'YOUR APP ID', | 156 | # - { name: 'github', app_id: 'YOUR APP ID', |
157 | - # app_secret: 'YOUR APP SECRET' } | 157 | + # app_secret: 'YOUR APP SECRET', |
158 | + # args: { scope: 'user:email' } } | ||
158 | 159 | ||
159 | 160 | ||
160 | 161 |
doc/install/requirements.md
@@ -76,3 +76,11 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim | @@ -76,3 +76,11 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim | ||
76 | If you have troubles installing GitLab following the [official installation guide](installation.md) | 76 | If you have troubles installing GitLab following the [official installation guide](installation.md) |
77 | or want to share your experience installing GitLab on a not officially supported | 77 | or want to share your experience installing GitLab on a not officially supported |
78 | platform, please follow the the [contribution guide](/CONTRIBUTING.md). | 78 | platform, please follow the the [contribution guide](/CONTRIBUTING.md). |
79 | + | ||
80 | +# Supported webbrowsers | ||
81 | + | ||
82 | +- Chrome (Latest stable version) | ||
83 | +- Firefox (Latest released version) | ||
84 | +- Safari 7+ (Know problem: required fields in html5 do not work) | ||
85 | +- Opera (Latest released version) | ||
86 | +- IE 10+ |