Permalink
Switch branches/tags
Commits on Feb 19, 2018
  1. Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'

    DouweM committed Feb 19, 2018
    Fix Error 500 when viewing a commit with a GPG signature in Geo
    
    Closes gitlab-ee#4825
    
    See merge request gitlab-org/gitlab-ce!17207
  2. Merge branch '41949-move' into 'master'

    DouweM committed Feb 19, 2018
    Remember assignee when moving an issue
    
    See merge request gitlab-org/gitlab-ce!17116
  3. Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s…

    DouweM committed Feb 19, 2018
    …aving' into 'master'
    
    Sanitize extra blank spaces used when uploading a SSH key
    
    Closes #40552
    
    See merge request gitlab-org/gitlab-ce!17138
  4. Fix Error 500 when viewing a commit with a GPG signature in Geo

    stanhu committed Feb 19, 2018
    Closes gitlab-org/gitlab-ee#4825
  5. Fix squash rebase not working when diff contained encoded data

    stanhu committed Feb 19, 2018
    When the applied diff contains UTF-8 or some other encoded data, the diff
    returned back from the git process may be in ASCII-8BIT format. Writing this
    data to stdin may fail if the data because stdin expects this data to be in
    UTF-8. By switching the output to binmode, we ensure that the diff will
    always be written as-is.
    
    Closes gitlab-org/gitlab-ee#4960
Commits on Feb 18, 2018
  1. Remember assignee when moving an issue

    Jan Provaznik
    Jan Provaznik committed Feb 14, 2018
    Related to #41949
  2. Don't attempt to update user tracked fields if database is in read-only

    stanhu committed Feb 18, 2018
    With Geo, attempting to view an endpoint with a user could result in an
    Error 500 since Devise attempts to update the last sign-in IP and other
    details.
    
    Closes gitlab-org/gitlab-ee#4972
  3. Merge branch '17500-mr-multiple-issues-oxford-comma' into 'master'

    stanhu committed Feb 18, 2018
    Update issue closing pattern to be more forgiving
    
    Closes #17500
    
    See merge request gitlab-org/gitlab-ce!17198
Commits on Feb 17, 2018
  1. Add changelog entry

    vickychijwani committed Feb 17, 2018
  2. Merge branch 'revert-215dff76' into 'master'

    ibaum committed Feb 17, 2018
    Revert "Merge branch 'expired-ci-artifacts' into 'master'"
    
    See merge request gitlab-org/gitlab-ce!17193
  3. Merge branch 'dm-dont-cache-nil-root-ref' into 'master'

    stanhu committed Feb 17, 2018
    Don't cache a nil repository root ref to prevent caching issues
    
    See merge request gitlab-org/gitlab-ce!17179
Commits on Feb 16, 2018
  1. Merge branch '43296-fix-specs-broken-by-hardcoding-paths' into 'master'

    rspeicher committed Feb 16, 2018
    Fix order dependencies in some specs
    
    Closes #43296
    
    See merge request gitlab-org/gitlab-ce!17189
  2. Revert "Merge branch 'expired-ci-artifacts' into 'master'"

    stanhu committed Feb 16, 2018
    This reverts merge request !16578
  3. Fix order dependencies in some specs

    Nick Thomas
    Nick Thomas committed Feb 16, 2018
    Our automatically-generated project paths are of the form project<N>. If a spec
    manually specifies a project path of that form, it may conflict with the
    automatically-generated paths in some circumstances.
  4. Merge branch 'master' into 'refactor-jobs-show-haml'

    ClemMakesApps committed Feb 16, 2018
    # Conflicts:
    #   app/assets/javascripts/dispatcher.js
  5. Merge branch 'fix-more-dispatcher-stuff' into 'master'

    jschatz1 committed Feb 16, 2018
    Remove more route-based chunks from dispatcher.js
    
    See merge request gitlab-org/gitlab-ce!16901
  6. Re-add common_vue

    ClemMakesApps committed Feb 16, 2018
  7. Merge branch '42641-monaco-service-workers-do-not-work-with-cdn-enabl…

    Tim Zallmann
    Tim Zallmann committed Feb 16, 2018
    …ed' into 'master'
    
    Resolve "Monaco service workers do not work with CDN enabled"
    
    Closes #42641
    
    See merge request gitlab-org/gitlab-ce!17021
  8. Merge branch 'fl-refresh-btn' into 'master'

    Tim Zallmann
    Tim Zallmann committed Feb 16, 2018
    Show loading button inline in MR widget
    
    See merge request gitlab-org/gitlab-ce!17174
  9. applying feedback

    Micaël Bergeron
    Micaël Bergeron committed Feb 16, 2018
    		    #	modified:   lib/gitlab/git/commit.rb
  10. fix specs

    Micaël Bergeron
    Micaël Bergeron committed Feb 12, 2018
  11. add changelog

    Micaël Bergeron
    Micaël Bergeron committed Feb 9, 2018
  12. stop ProcessCommitWorker from processing MR merge commit

    Micaël Bergeron
    Micaël Bergeron committed Feb 9, 2018
    When a merge request is merged, it creates a commit with the
    description of the MR, which may contain references and issue
    closing references. As this will be handled in the PostMergeService
    anyways, let's ignore merge commit generated from a MR.