Add latest changes from gitlab-org/gitlab@master

7 files changed, 23 insertions, 18 deletions

diff --git a/app/assets/javascripts/access_tokens/components/expires_at_field.vue b/app/assets/javascripts/access_tokens/components/expires_at_field.vue
index 561b2617c5f..147de529eea 100644
--- a/app/assets/javascripts/access_tokens/components/expires_at_field.vue
+++ b/app/assets/javascripts/access_tokens/components/expires_at_field.vue
@@ -21,17 +21,17 @@ export default {
       required: false,
       default: () => ({}),
     },
+    minDate: {
+      type: Date,
+      required: false,
+      default: () => new Date(),
+    },
     maxDate: {
       type: Date,
       required: false,
       default: () => null,
     },
   },
-  data() {
-    return {
-      minDate: new Date(),
-    };
-  },
 };
 </script>
 
diff --git a/app/assets/javascripts/access_tokens/index.js b/app/assets/javascripts/access_tokens/index.js
index c59bd445539..fb5c5521ce9 100644
--- a/app/assets/javascripts/access_tokens/index.js
+++ b/app/assets/javascripts/access_tokens/index.js
@@ -17,7 +17,7 @@ export const initExpiresAtField = () => {
   }
 
   const { expiresAt: inputAttrs } = parseRailsFormFields(el);
-  const { maxDate } = el.dataset;
+  const { minDate, maxDate } = el.dataset;
 
   return new Vue({
     el,
@@ -25,6 +25,7 @@ export const initExpiresAtField = () => {
       return h(ExpiresAtField, {
         props: {
           inputAttrs,
+          minDate: minDate ? new Date(minDate) : undefined,
           maxDate: maxDate ? new Date(maxDate) : undefined,
         },
       });
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 194ccb6b73e..f719c17c708 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -8,7 +8,7 @@ $gutter-inner-width: 250px;
 $sidebar-transition-duration: 0.3s;
 $sidebar-breakpoint: 1024px;
 $default-transition-duration: 0.15s;
-$contextual-sidebar-width: 220px;
+$contextual-sidebar-width: 256px;
 $contextual-sidebar-collapsed-width: 48px;
 $toggle-sidebar-height: 48px;
 
diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index b2a5906bb01..b5e43b78451 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -989,7 +989,7 @@ input {
 .context-header {
   position: relative;
   margin-right: 2px;
-  width: 220px;
+  width: 256px;
 }
 .context-header > a,
 .context-header > button {
@@ -1019,7 +1019,7 @@ input {
 }
 @media (min-width: 1200px) {
   .page-with-contextual-sidebar {
-    padding-left: 220px;
+    padding-left: 256px;
   }
 }
 @media (min-width: 768px) {
@@ -1032,7 +1032,7 @@ input {
   bottom: 0;
   left: 0;
   z-index: 600;
-  width: 220px;
+  width: 256px;
   top: var(--header-height, 48px);
   background-color: #303030;
   transform: translate3d(0, 0, 0);
@@ -1105,7 +1105,7 @@ input {
 }
 @media (max-width: 767.98px) {
   .nav-sidebar {
-    left: -220px;
+    left: -256px;
   }
 }
 .nav-sidebar .nav-icon-container {
@@ -1405,7 +1405,7 @@ input {
   border-top: 1px solid #404040;
   position: fixed;
   bottom: 0;
-  width: 220px;
+  width: 256px;
 }
 .toggle-sidebar-button .collapse-text,
 .toggle-sidebar-button .icon-chevron-double-lg-left,
diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss
index 37d0c624eea..93ed70d65eb 100644
--- a/app/assets/stylesheets/startup/startup-general.scss
+++ b/app/assets/stylesheets/startup/startup-general.scss
@@ -974,7 +974,7 @@ input {
 .context-header {
   position: relative;
   margin-right: 2px;
-  width: 220px;
+  width: 256px;
 }
 .context-header > a,
 .context-header > button {
@@ -1004,7 +1004,7 @@ input {
 }
 @media (min-width: 1200px) {
   .page-with-contextual-sidebar {
-    padding-left: 220px;
+    padding-left: 256px;
   }
 }
 @media (min-width: 768px) {
@@ -1017,7 +1017,7 @@ input {
   bottom: 0;
   left: 0;
   z-index: 600;
-  width: 220px;
+  width: 256px;
   top: var(--header-height, 48px);
   background-color: #f0f0f0;
   transform: translate3d(0, 0, 0);
@@ -1090,7 +1090,7 @@ input {
 }
 @media (max-width: 767.98px) {
   .nav-sidebar {
-    left: -220px;
+    left: -256px;
   }
 }
 .nav-sidebar .nav-icon-container {
@@ -1390,7 +1390,7 @@ input {
   border-top: 1px solid #dbdbdb;
   position: fixed;
   bottom: 0;
-  width: 220px;
+  width: 256px;
 }
 .toggle-sidebar-button .collapse-text,
 .toggle-sidebar-button .icon-chevron-double-lg-left,
diff --git a/app/helpers/access_tokens_helper.rb b/app/helpers/access_tokens_helper.rb
index d8d44601327..44200e84afb 100644
--- a/app/helpers/access_tokens_helper.rb
+++ b/app/helpers/access_tokens_helper.rb
@@ -29,7 +29,9 @@ module AccessTokensHelper
   end
 
   def expires_at_field_data
-    {}
+    {
+      min_date: 1.day.from_now.iso8601
+    }
   end
 end
 
diff --git a/app/models/ci/secure_file.rb b/app/models/ci/secure_file.rb
index 9c82e106d6e..078b05ff779 100644
--- a/app/models/ci/secure_file.rb
+++ b/app/models/ci/secure_file.rb
@@ -23,6 +23,8 @@ module Ci
     after_initialize :generate_key_data
     before_validation :assign_checksum
 
+    scope :order_by_created_at, -> { order(created_at: :desc) }
+
     default_value_for(:file_store) { Ci::SecureFileUploader.default_store }
 
     mount_file_store_uploader Ci::SecureFileUploader