1. 13 Feb, 2018 6 commits
    • Phil Hughes's avatar
      Merge branch '42923-close-issue' into 'master' · 41285af4
      Phil Hughes authored
      Resolve "Can't close issue through buttons in the textarea on mobile"
      
      Closes #42923
      
      See merge request gitlab-org/gitlab-ce!17043
      41285af4
    • Sean McGivern's avatar
      Merge branch 'sh-no-cache-populate-migration' into 'master' · 4e846c73
      Sean McGivern authored
      Disable caching of tables for migration spec that drops a temporary table
      
      See merge request gitlab-org/gitlab-ce!16965
      4e846c73
    • Sean McGivern's avatar
      Merge branch 'sh-fix-issue-43193' into 'master' · 754d1ec4
      Sean McGivern authored
      Fix Error 500s creating merge requests with external issue tracker
      
      Closes #43193
      
      See merge request gitlab-org/gitlab-ce!17073
      754d1ec4
    • Phil Hughes's avatar
      Merge branch 'winh-new-branch-dropdown-style' into 'master' · 8925671a
      Phil Hughes authored
      Cleanup new branch/merge request form in issues
      
      Closes #41938
      
      See merge request gitlab-org/gitlab-ce!16854
      8925671a
    • Filipa Lacerda's avatar
      [ci skip] Merge branch 'master' into 42923-close-issue · d8d0f668
      Filipa Lacerda authored
      * master: (25 commits)
        Addressed mr observations
        Clean new Flash() and stop disabling no-new (eslint) when possible
        Disable query limiting warnings for now on GitLab.com
        Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'"
        Fix warning messages for promoting labels and milestones
        Fixed missing js selector for the realtime pipelines commit comp
        Honour workhorse provided file name
        Create an empty wiki when there is no wiki in the gitlab export bundle
        Revert and remove header_title line from labels issue
        Fixed bug with param config
        changed params passed to from a string to an object
        Move IssuableTimeTracker vue component
        Fix breadcrumb on labels page for groups
        Convert groups_select ajax to use axios
        Default CI variables to unprotected
        make sure there is a dependency on Gitlab::CurrentSettings is
        Make GITLAB_FEATURES in build_spec compatible with EE
        Update jquery.waitforimages & use npm version
        Fixed typo, updated test, and removed commented code
        Replaced use of $.get with axios.get and updated tests
        ...
      d8d0f668
    • Stan Hu's avatar
      Fix Error 500s creating merge requests with external issue tracker · 926002fd
      Stan Hu authored
      When JIRA or Redmine were enabled and the branch name did not match the
      matching regular expression, the `issue_iid` would be `nil`, preventing
      users from creating merge requests.
      
      Closes #43193
      926002fd
  2. 12 Feb, 2018 34 commits