-
- Downloads
Merge branch 'master' into fixes/api, code clean up and tests fixed
Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb
Showing
- Capfile.example 4 additions, 0 deletionsCapfile.example
- Gemfile 4 additions, 1 deletionGemfile
- Gemfile.lock 18 additions, 1 deletionGemfile.lock
- README.md 19 additions, 12 deletionsREADME.md
- app/assets/javascripts/tree.js.coffee 7 additions, 7 deletionsapp/assets/javascripts/tree.js.coffee
- app/assets/stylesheets/gitlab_bootstrap/blocks.scss 0 additions, 7 deletionsapp/assets/stylesheets/gitlab_bootstrap/blocks.scss
- app/assets/stylesheets/gitlab_bootstrap/common.scss 1 addition, 0 deletionsapp/assets/stylesheets/gitlab_bootstrap/common.scss
- app/assets/stylesheets/sections/projects.scss 13 additions, 0 deletionsapp/assets/stylesheets/sections/projects.scss
- app/models/merge_request.rb 1 addition, 1 deletionapp/models/merge_request.rb
- app/models/repository.rb 19 additions, 0 deletionsapp/models/repository.rb
- app/services/git_push_service.rb 1 addition, 0 deletionsapp/services/git_push_service.rb
- app/views/devise/sessions/_new_ldap.html.haml 1 addition, 1 deletionapp/views/devise/sessions/_new_ldap.html.haml
- app/views/events/_event.html.haml 12 additions, 11 deletionsapp/views/events/_event.html.haml
- app/views/help/api.html.haml 11 additions, 0 deletionsapp/views/help/api.html.haml
- app/views/help/index.html.haml 1 addition, 1 deletionapp/views/help/index.html.haml
- app/views/layouts/public.html.haml 1 addition, 1 deletionapp/views/layouts/public.html.haml
- app/views/projects/_form.html.haml 8 additions, 0 deletionsapp/views/projects/_form.html.haml
- app/views/projects/show.html.haml 27 additions, 2 deletionsapp/views/projects/show.html.haml
- app/views/public/projects/index.html.haml 15 additions, 13 deletionsapp/views/public/projects/index.html.haml
- app/views/tree/_tree.html.haml 2 additions, 3 deletionsapp/views/tree/_tree.html.haml
Loading
Please register or sign in to comment