Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/assets/javascripts/calendar.js.coffee

@@ -25,6 +25,7 @@ class @Calendar
         30
       ]
       legendCellPadding: 3
+      cellSize: $('.user-calendar').width() / 80
       onClick: (date, count) ->
         formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
         $.ajax

app/assets/javascripts/stat_graph_contributors_graph.js.coffee

@@ -50,7 +50,7 @@ class @ContributorsGraph
 
 class @ContributorsMasterGraph extends ContributorsGraph
   constructor: (@data) ->
-    @width = $('.container').width() - 345
+    @width = $('.content').width() - 70
     @height = 200
     @x = null
     @y = null
@@ -123,7 +123,7 @@ class @ContributorsMasterGraph extends ContributorsGraph
 
 class @ContributorsAuthorGraph extends ContributorsGraph
   constructor: (@data) ->
-    @width = $('.container').width()/2 - 225
+    @width = $('.content').width()/2 - 100
     @height = 200
     @x = null
     @y = null

app/views/projects/_md_preview.html.haml

@@ -2,10 +2,10 @@
   .md-header.clearfix
     %ul.nav.nav-tabs
       %li.active
-        = link_to '#md-write-holder', class: 'js-md-write-button' do
+        = link_to '#md-write-holder', class: 'js-md-write-button', tabindex: '-1' do
           Write
       %li
-        = link_to '#md-preview-holder', class: 'js-md-preview-button' do
+        = link_to '#md-preview-holder', class: 'js-md-preview-button', tabindex: '-1' do
           Preview
 
     - if defined?(referenced_users) && referenced_users

docker/README.md

@@ -94,7 +94,12 @@ sudo docker build --tag gitlab-data docker/data/
 sudo docker build --tag gitlab-app:7.10.1 docker/app/
 ```
 
-After this run the images as described in the previous section.
+After this run the images:
+
+```bash
+sudo docker run --name gitlab-data gitlab-data /bin/true
+sudo docker run --detach --name gitlab-app --publish 8080:80 --publish 2222:22 --volumes-from gitlab-data gitlab-app:7.10.1
+```
 
 We assume using a data volume container, this will simplify migrations and backups.
 This empty container will exist to persist as volumes the 3 directories used by GitLab, so remember not to delete it.