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

config/gitlab.yml.example

@@ -154,7 +154,8 @@ production: &base
       # - { name: 'twitter', app_id: 'YOUR APP ID',
       #     app_secret: 'YOUR APP SECRET'}
       # - { name: 'github', app_id: 'YOUR APP ID',
-      #     app_secret: 'YOUR APP SECRET' }
+      #     app_secret: 'YOUR APP SECRET',
+      #     args: { scope: 'user:email' } }
 
 
 

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
 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
 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+