-
- Downloads
Merge branch 'master' into 6-0-dev
Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md
Showing
- CHANGELOG 10 additions, 0 deletionsCHANGELOG
- app/assets/stylesheets/gitlab_bootstrap/nav.scss 11 additions, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/nav.scss
- doc/api/README.md 12 additions, 12 deletionsdoc/api/README.md
- doc/api/projects.md 25 additions, 0 deletionsdoc/api/projects.md
- doc/install/installation.md 9 additions, 7 deletionsdoc/install/installation.md
- lib/api/entities.rb 7 additions, 0 deletionslib/api/entities.rb
- lib/api/helpers.rb 3 additions, 3 deletionslib/api/helpers.rb
- lib/api/projects.rb 36 additions, 0 deletionslib/api/projects.rb
- lib/redcarpet/render/gitlab_html.rb 1 addition, 1 deletionlib/redcarpet/render/gitlab_html.rb
- spec/requests/api/projects_spec.rb 67 additions, 0 deletionsspec/requests/api/projects_spec.rb
Loading
Please register or sign in to comment