Commit fd688f89 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 4e96b175 50b6a6d1
No related merge requests found
...@@ -154,7 +154,8 @@ production: &base ...@@ -154,7 +154,8 @@ production: &base
# - { name: 'twitter', app_id: 'YOUR APP ID', # - { name: 'twitter', app_id: 'YOUR APP ID',
# app_secret: 'YOUR APP SECRET'} # app_secret: 'YOUR APP SECRET'}
# - { name: 'github', app_id: 'YOUR APP ID', # - { name: 'github', app_id: 'YOUR APP ID',
# app_secret: 'YOUR APP SECRET' } # app_secret: 'YOUR APP SECRET',
# args: { scope: 'user:email' } }
......
...@@ -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
If you have troubles installing GitLab following the [official installation guide](installation.md) If you have troubles installing GitLab following the [official installation guide](installation.md)
or want to share your experience installing GitLab on a not officially supported or want to share your experience installing GitLab on a not officially supported
platform, please follow the the [contribution guide](/CONTRIBUTING.md). platform, please follow the the [contribution guide](/CONTRIBUTING.md).
# Supported webbrowsers
- Chrome (Latest stable version)
- Firefox (Latest released version)
- Safari 7+ (Know problem: required fields in html5 do not work)
- Opera (Latest released version)
- IE 10+
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment