Merge branch 'master' into PLT-11-email

api/file.go

@@ -24,6 +24,7 @@ import (
 	"io"
 	"io/ioutil"
 	"math"
+	"mime"
 	"net/http"
 	"net/url"
 	"os"
@@ -424,7 +425,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Cache-Control", "max-age=2592000, public")
 	w.Header().Set("Content-Length", strconv.Itoa(len(f)))
-	w.Header().Set("Content-Type", "") // need to provide proper Content-Type in the future
+	w.Header().Set("Content-Type", mime.TypeByExtension(filepath.Ext(filename)))
 	w.Write(f)
 }
 

doc/developer/code-contribution.md

@@ -36,14 +36,19 @@ git checkout -b <branch name>
   For pull requests made by contributors not yet added to the approved contributor list, a reviewer may respond: 
   
   ```
-  Thanks @[username] for the pull request! 
+Thanks @[GITHUB_USERNAME] for the pull request! 
-  
+
-  Before we can review, we need to add you to the list of [approved contributors](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true).  
+Before we can review, we need to add you to the list of approved contributors for the Mattermost project.
-  Please help complete the Mattermost [contribution license agreement](http://www.mattermost.org/mattermost-contributor-agreement/), which is a standard procedure for many open source projects. More information is in the above link. 
+
-  
+**Please help complete the Mattermost [contribution license agreement](http://www.mattermost.org/mattermost-contributor-agreement/)?**
-  Please let us know if you have any questions. 
+
-  
+This is a standard procedure for many open source projects. You can view a list of past contributors who have completed the form [here](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). 
-  We are very happy to have you join our growing community!
+
+After completing the form, it should be processed within 24 hours and reviewers for your pull request will be able to proceed. 
+
+Please let us know if you have any questions. 
+
+We are very happy to have you join our growing community!
 ``` 
 
 

web/react/components/new_channel_modal.jsx

@@ -150,7 +150,7 @@ export default class NewChannelModal extends React.Component {
                                         tabIndex='2'
                                     />
                                     <p className='input__help'>
-                                        {'This is the purpose of your channel and helps others decide whether to join.'}
+                                        {'Description helps others decide whether to join this channel.'}
                                     </p>
                                     {serverError}
                                 </div>