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

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

app/models/project_import_data.rb

@@ -6,7 +6,8 @@ class ProjectImportData < ActiveRecord::Base
                  key: Gitlab::Application.secrets.db_key_base,
                  marshal: true,
                  encode: true,
-                 mode: :per_attribute_iv_and_salt
+                 mode: :per_attribute_iv_and_salt,
+                 algorithm: 'aes-256-cbc'
   serialize :data, JSON

app/models/user.rb

@@ -20,6 +20,11 @@ class User < ActiveRecord::Base
   default_value_for :hide_no_password, false
   default_value_for :theme_id, gitlab_config.default_theme
+  attr_encrypted :otp_secret,
+    key:       Gitlab::Application.config.secret_key_base,
+    mode:      :per_attribute_iv_and_salt,
+    algorithm: 'aes-256-cbc'
+
   devise :two_factor_authenticatable,
          otp_secret_encryption_key: Gitlab::Application.config.secret_key_base
   alias_attribute :two_factor_enabled, :otp_required_for_login
@@ -27,7 +32,7 @@ class User < ActiveRecord::Base
   devise :two_factor_backupable, otp_number_of_backup_codes: 10
   serialize :otp_backup_codes, JSON
-  devise :lockable, :async, :recoverable, :rememberable, :trackable,
+  devise :lockable, :recoverable, :rememberable, :trackable,
     :validatable, :omniauthable, :confirmable, :registerable
   attr_accessor :force_random_password

app/views/layouts/_head.html.haml

@@ -30,6 +30,9 @@
   = javascript_include_tag "application"
+  - if page_specific_javascripts
+    = javascript_include_tag page_specific_javascripts, {"data-turbolinks-track" => true}
+
   = csrf_meta_tags
   = include_gon

app/views/projects/graphs/_head.html.haml

+- page_specific_javascripts asset_path("graphs/application.js")
 %ul.nav-links
   = nav_link(action: :show) do
     = link_to 'Contributors', namespace_project_graph_path

app/views/projects/merge_requests/dropdowns/_branch.html.haml

 %ul
   - branches.each do |branch|
     %li
-      %a{ href: '#', class: "#{('is-active' if selected == branch)}", data: { id: branch } }
+      %a{ href: '#', class: "#{('is-active' if selected == branch)}", title: branch, data: { id: branch } }
         = branch

app/views/users/show.html.haml

 - page_title       @user.name
 - page_description @user.bio
+- page_specific_javascripts asset_path("users/application.js")
 - header_title     @user.name, user_path(@user)
 - @no_container = true

config/application.rb

@@ -81,6 +81,8 @@ module Gitlab
     config.assets.precompile << "print.css"
     config.assets.precompile << "notify.css"
     config.assets.precompile << "mailers/*.css"
+    config.assets.precompile << "graphs/application.js"
+    config.assets.precompile << "users/application.js"
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

config/initializers/devise_async.rb

-Devise::Async.backend = :sidekiq

doc/administration/high_availability/nfs.md

@@ -2,8 +2,8 @@
 ## Required NFS Server features
-**File locking**: GitLab **requires** file locking which is only supported
-natively in NFS version 4. NFSv3 also supports locking as long as
+**File locking**: GitLab **requires** advisory file locking, which is only
+supported natively in NFS version 4. NFSv3 also supports locking as long as
 Linux Kernel 2.6.5+ is used. We recommend using version 4 and do not
 specifically test NFSv3.

doc/administration/troubleshooting/sidekiq.md

@@ -150,6 +150,14 @@ To output a backtrace from all threads at once:
 apply all thread bt
 ```
+Once you're done debugging with `gdb`, be sure to detach from the process and
+exit:
+
+```
+detach
+exit
+```
+
 ## Check for blocking queries
 Sometimes the speed at which Sidekiq processes jobs can be so fast that it can

spec/controllers/sessions_controller_spec.rb

@@ -12,7 +12,7 @@ describe SessionsController do
           post(:create, user: { login: 'invalid', password: 'invalid' })
           expect(response)
-            .to set_flash.now[:alert].to /Invalid login or password/
+            .to set_flash.now[:alert].to /Invalid Login or password/
         end
       end

spec/features/login_spec.rb

@@ -127,7 +127,7 @@ feature 'Login', feature: true do
       user = create(:user, password: 'not-the-default')
       login_with(user)
-      expect(page).to have_content('Invalid login or password.')
+      expect(page).to have_content('Invalid Login or password.')
     end
   end

spec/javascripts/stat_graph_contributors_graph_spec.js → spec/javascripts/graphs/stat_graph_contributors_graph_spec.js

-//= require stat_graph_contributors_graph
+//= require graphs/stat_graph_contributors_graph
 describe("ContributorsGraph", function () {
   describe("#set_x_domain", function () {

spec/javascripts/stat_graph_contributors_util_spec.js → spec/javascripts/graphs/stat_graph_contributors_util_spec.js

-//= require stat_graph_contributors_util
+//= require graphs/stat_graph_contributors_util
 describe("ContributorsStatGraphUtil", function () {

spec/javascripts/stat_graph_spec.js → spec/javascripts/graphs/stat_graph_spec.js

-//= require stat_graph
+//= require graphs/stat_graph
 describe("StatGraph", function () {

spec/models/ci/variable_spec.rb

@@ -23,7 +23,7 @@ describe Ci::Variable, models: true do
     end
     it 'fails to decrypt if iv is incorrect' do
-      subject.encrypted_value_iv = nil
+      subject.encrypted_value_iv = SecureRandom.hex
       subject.instance_variable_set(:@value, nil)
       expect { subject.value }.
         to raise_error(OpenSSL::Cipher::CipherError, 'bad decrypt')

spec/models/project_spec.rb

@@ -784,6 +784,15 @@ describe Project, models: true do
     end
   end
+  describe '#container_registry_path_with_namespace' do
+    let(:project) { create(:empty_project, path: 'PROJECT') }
+
+    subject { project.container_registry_path_with_namespace }
+
+    it { is_expected.not_to eq(project.path_with_namespace) }
+    it { is_expected.to eq(project.path_with_namespace.downcase) }
+  end
+
   describe '#container_registry_repository' do
     let(:project) { create(:empty_project) }