Commit b3bb56d4 authored by Sean McGivern's avatar Sean McGivern 🔴
Browse files

Merge branch 'ce-to-ee-2018-11-26' into 'master' 

CE upstream - 2018-11-26 10:21 UTC

Closes gitaly#1406

See merge request gitlab-org/gitlab-ee!8582
parents afb7260e 4eb852cf

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -938,6 +938,7 @@ qa:selectors: 
    - yarn install --frozen-lockfile --cache-folder .yarn-cache

    - date

    - yarn run webpack-prod

  <<: *except-docs



qa-frontend-node:6:

  <<: *qa-frontend-node

GITALY_SERVER_VERSION

+1 −1
Original line number Diff line number Diff line 
0.133.0
 
1.0.0

app/assets/javascripts/ide/components/commit_sidebar/form.vue

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ export default { 
          :text="commitMessage"

          :placeholder="preBuiltCommitMessage"

          @input="updateCommitMessage"

          @submit="commitChanges"

        />

        <div class="clearfix prepend-top-15">

          <actions />

app/assets/javascripts/ide/components/commit_sidebar/message_field.vue

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ export default { 
    onInput(e) {

      this.$emit('input', e.target.value);

    },

    onCtrlEnter() {

      if (!this.isFocused) return;

      this.$emit('submit');

    },

    updateIsFocused(isFocused) {

      this.isFocused = isFocused;

    },
@@ -109,6 +113,8 @@ export default { 
          @input="onInput"

          @focus="updateIsFocused(true);"

          @blur="updateIsFocused(false);"

          @keydown.ctrl.enter="onCtrlEnter"

          @keydown.meta.enter="onCtrlEnter"

        >

        </textarea>

      </div>

app/assets/javascripts/lazy_loader.js

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ export default class LazyLoader { 
  }



  searchLazyImages() {

    requestIdleCallback(

    window.requestIdleCallback(

      () => {

        const lazyImages = [].slice.call(document.querySelectorAll('.lazy'));
@@ -107,7 +107,7 @@ export default class LazyLoader { 
  }



  scrollCheck() {

    requestAnimationFrame(() => this.checkElementsInView());

    window.requestAnimationFrame(() => this.checkElementsInView());

  }



  checkElementsInView() {
@@ -122,7 +122,7 @@ export default class LazyLoader { 
        const imgBound = imgTop + imgBoundRect.height;



        if (scrollTop <= imgBound && visHeight >= imgTop) {

          requestAnimationFrame(() => {

          window.requestAnimationFrame(() => {

            LazyLoader.loadImage(selectedImage);

          });

          return false;