1. 16 Dec, 2016 13 commits
  2. 15 Dec, 2016 8 commits
  3. 14 Dec, 2016 14 commits
  4. 13 Dec, 2016 3 commits
  5. 12 Dec, 2016 2 commits
    • Douglas Barbosa Alexandre's avatar
      Merge branch 'ce-to-ee' into 'master' · 2a17a63b
      Douglas Barbosa Alexandre authored
      CE upstream
      
      Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution)
      
      ```
      both modified:   app/models/namespace.rb
      both modified:   app/models/project.rb
      both modified:   app/views/layouts/nav/_group_settings.html.haml
      both modified:   app/views/projects/_merge_request_settings.html.haml
      both modified:   app/views/projects/edit.html.haml
      both modified:   app/views/shared/milestones/_summary.html.haml
      both modified:   db/schema.rb
      both modified:   doc/README.md
      both modified:   doc/api/merge_requests.md
      both modified:   lib/api/merge_requests.rb
      both modified:   lib/gitlab/search_results.rb
      both modified:   spec/lib/gitlab/import_export/all_models.yml
      both modified:   spec/models/project_spec.rb
      both modified:   spec/services/merge_requests/refresh_service_spec.rb
      ```
      
      See merge request !960
      2a17a63b
    • Douglas Barbosa Alexandre's avatar