1. 05 Dec, 2016 3 commits
    • Valery Sizov's avatar
      Merge branch 'ce_upstream' into 'master' · ef59a367
      Valery Sizov authored
      CE upstream merge
      
      - [x] .gitlab-ci.yml
      - [x] Gemfile.lock
      - [x] app/assets/stylesheets/pages/issuable.scss
      - [x] app/controllers/concerns/lfs_request.rb
      - [x] app/controllers/projects/git_http_controller.rb
      - [x] app/helpers/issuables_helper.rb
      - [x] app/models/concerns/protected_branch_access.rb
      - [x] app/models/protected_branch/merge_access_level.rb
      - [x] app/models/protected_branch/push_access_level.rb
      - [x] app/services/system_note_service.rb
      - [x] app/views/shared/issuable/_filter.html.haml
      - [x] app/views/shared/issuable/_form.html.haml
      - [x] app/views/shared/issuable/form/_metadata.html.haml
      - [x] db/schema.rb
      - [x] doc/web_hooks/web_hooks.md
      - [x]  features/steps/project/wiki.rb
      - [x] lib/api/projects.rb
      - [x] lib/gitlab/git_access.rb
      - [x] spec/features/security/project/private_access_spec.rb
      - [x] spec/features/security/project/public_access_spec.rb
      - [x] spec/mailers/notify_spec.rb
      - [x] spec/services/merge_requests/merge_service_spec.rb
      - [x] spec/services/merge_requests/refresh_service_spec.rb
      - [x] spec/services/projects/destroy_service_spec.rb
      
      Merged changes https://gitlab.com/gitlab-org/gitlab-ce/compare/858602ea153056f6cbfeeb4114ea6e29aba03a7a...14046b9c734e5e6506d63276f39f3f9d770c3699
      
      See merge request !937
      ef59a367
    • Robert Speicher's avatar
      Merge branch 'fix-mirror-worker-pending-delete-project' into 'master' · a8f9dbc2
      Robert Speicher authored
      Prevent remote mirrors from failing when project is in pending_delete
      
      We noticed on GitLab.com that remote mirrors were not even running.
      UpdateAllRemoteMirrorsWorker was failing on a project that was in
      pending_delete, preventing any workers from running.
      
      Closes gitlab-org/gitlab-ce#23650
      
      See merge request !938
      a8f9dbc2
    • Valery Sizov's avatar
  2. 03 Dec, 2016 1 commit
  3. 02 Dec, 2016 24 commits
  4. 01 Dec, 2016 12 commits