• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-08-18 · eb2bcce2
    Lin Jen-Shin authored
    * upstream/master: (114 commits)
      Fixes the blown up emoji problem in notes
      Total Pages should be at least one
      Add specs for pagination Link header
      don't add next page link if current page is out of range
      Don't escape html entities when rich == raw line
      Incorporate RepositoryService.ApplyGitattributes Gitaly RPC
      Add GitalyClient::RepositoryService specs
      use proper object notation and rename isNewRepo to isNewRepoEnabled
      Move workflow/importing/ to user/project/import/
      Prevent horizontal scrolling in new sidebar when collapsed
      Allow all users to delete their account
      Backports EE mirror stuck handling feature (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2628) to CE
      Use grpc 1.4.5
      Make admin user actions dropdown consistent
      Fixed height of group share dropdown
      Run remove_pages in a run_after_commit block
      Fix project import to group when there are project milestones
      Disable migrations output in migrations helpers
      Remove a wat in NamespacelessProjectDestroyWorker
      Migrate down before each migration unit test
      ...
    eb2bcce2
jobs.rb 7.48 KB