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

CHANGELOG

@@ -17,6 +17,10 @@ v 7.3.0
   - Add blob permalink link (Ciro Santilli)
   - Create annotated tags through UI and API (Sean Edge)
 
+v 7.2.1
+  - Delete orphaned labels during label migration (James Brooks)
+  - Security: prevent XSS with stricter MIME types for raw repo files
+
 v 7.2.0
   - Explore page
   - Add project stars (Ciro Santilli)

app/assets/javascripts/shortcuts_navigation.coffee

@@ -3,7 +3,7 @@
 class @ShortcutsNavigation extends Shortcuts
   constructor: ->
     super()
-    Mousetrap.bind('g a', -> ShortcutsNavigation.findAndollowLink('.shortcuts-activity'))
+    Mousetrap.bind('g p', -> ShortcutsNavigation.findAndollowLink('.shortcuts-project'))
     Mousetrap.bind('g f', -> ShortcutsNavigation.findAndollowLink('.shortcuts-tree'))
     Mousetrap.bind('g c', -> ShortcutsNavigation.findAndollowLink('.shortcuts-commits'))
     Mousetrap.bind('g n', -> ShortcutsNavigation.findAndollowLink('.shortcuts-network'))

app/views/help/_shortcuts.html.haml

@@ -78,9 +78,9 @@
               %tr
                 %td.shortcut 
                   .key g
-                  .key a
+                  .key p
                 %td
-                  Go to the activity feed
+                  Go to the project's activity feed
               %tr
                 %td.shortcut 
                   .key g

app/views/layouts/nav/_project.html.haml

 %ul.project-navigation
   = nav_link(path: 'projects#show', html_options: {class: "home"}) do
-    = link_to project_path(@project), title: 'Project', class: 'shortcuts-activity' do
+    = link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
       Project
   - if project_nav_tab? :files
     = nav_link(controller: %w(tree blob blame edit_tree new_tree)) do

doc/release/monthly.md

@@ -107,11 +107,13 @@ List any major changes here, so the user is aware of them before starting to upg
 Check if any of these changed since last release:
 
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/lib/support/nginx/gitlab>
+- <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/lib/support/nginx/gitlab-ssl>
 - <https://gitlab.com/gitlab-org/gitlab-shell/commits/master/config.yml.example>
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/gitlab.yml.example>
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/unicorn.rb.example>
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/database.yml.mysql>
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/database.yml.postgresql>
+- <https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/rack_attack.rb.example>
 
 #### 8. Need to update init script?
 

features/project/shortcuts.feature

@@ -44,3 +44,9 @@ Feature: Project shortcuts
   Scenario: Navigate to wiki tab
     Given I press "g" and "w"
     Then the active main tab should be Wiki
+
+  @javascript
+  Scenario: Navigate to project feed
+    Given I visit my project's files page
+    Given I press "g" and "p"
+    Then the active main tab should be Home

lib/support/nginx/gitlab-ssl

@@ -65,7 +65,7 @@ server {
   ssl_certificate /etc/nginx/ssl/gitlab.crt;
   ssl_certificate_key /etc/nginx/ssl/gitlab.key;
 
-  ssl_ciphers 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4';
+  ssl_ciphers 'AES256+EECDH:AES256+EDH';
 
   ssl_protocols  TLSv1 TLSv1.1 TLSv1.2;
   ssl_session_cache  builtin:1000  shared:SSL:10m;