1. 05 Jun, 2016 4 commits
    • Valery Sizov's avatar
      Merge branch 'ce_upstream' into 'master' · 161a8b10
      Valery Sizov authored
      CE upstream
      
      Could you guys please resolve next conflicts (the conflicts just committed to the branch):
      
      @dzaporozhets - `app/views/layouts/nav/_project_settings.html.haml`
      
      @iamphill `app/views/projects/_builds_settings.html.haml` and `app/views/projects/edit.html.haml`
      
      @annabeldunstone `app/views/projects/_home_panel.html.haml`
      
      @jschatz1 - `app/views/shared/issuable/_form.html.haml`
      
      - [x] `app/views/layouts/nav/_project_settings.html.haml`
      - [x] `app/views/projects/_builds_settings.html.haml` 
      - [x] `app/views/projects/edit.html.haml`
      - [x] `app/views/projects/_home_panel.html.haml`
      - [x] `app/views/shared/issuable/_form.html.haml`
      - [x]  `app/views/layouts/nav/_project.html.haml`
      - [x]	`app/views/projects/hooks/index.html.haml`
      
      See merge request !425
      161a8b10
    • Valery Sizov's avatar
    • Valery Sizov's avatar
      [CE->EE] fix grooup management spinach · 11c239cd
      Valery Sizov authored
      11c239cd
    • Valery Sizov's avatar
      [CE->EE] fix spinach · 1560b866
      Valery Sizov authored
      1560b866
  2. 04 Jun, 2016 4 commits
  3. 03 Jun, 2016 13 commits
  4. 02 Jun, 2016 19 commits