-
- Downloads
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts: lib/gitlab/markdown.rb
No related branches found
No related tags found
Showing
- CHANGELOG 3 additions, 0 deletionsCHANGELOG
- app/assets/javascripts/dispatcher.js.coffee 2 additions, 0 deletionsapp/assets/javascripts/dispatcher.js.coffee
- app/assets/javascripts/issue.js.coffee 2 additions, 6 deletionsapp/assets/javascripts/issue.js.coffee
- app/assets/javascripts/merge_request.js.coffee 2 additions, 6 deletionsapp/assets/javascripts/merge_request.js.coffee
- app/assets/stylesheets/generic/common.scss 1 addition, 1 deletionapp/assets/stylesheets/generic/common.scss
- app/controllers/namespaces_controller.rb 13 additions, 5 deletionsapp/controllers/namespaces_controller.rb
- app/helpers/gitlab_routing_helper.rb 4 additions, 0 deletionsapp/helpers/gitlab_routing_helper.rb
- app/models/concerns/mentionable.rb 1 addition, 1 deletionapp/models/concerns/mentionable.rb
- app/views/dashboard/milestones/_milestone.html.haml 20 additions, 0 deletionsapp/views/dashboard/milestones/_milestone.html.haml
- app/views/dashboard/milestones/index.html.haml 1 addition, 19 deletionsapp/views/dashboard/milestones/index.html.haml
- app/views/groups/milestones/_milestone.html.haml 25 additions, 0 deletionsapp/views/groups/milestones/_milestone.html.haml
- app/views/groups/milestones/index.html.haml 1 addition, 25 deletionsapp/views/groups/milestones/index.html.haml
- app/views/projects/milestones/_milestone.html.haml 10 additions, 12 deletionsapp/views/projects/milestones/_milestone.html.haml
- app/views/projects/refs/logs_tree.js.haml 1 addition, 1 deletionapp/views/projects/refs/logs_tree.js.haml
- app/views/users/_projects.html.haml 4 additions, 4 deletionsapp/views/users/_projects.html.haml
- app/views/users/show.html.haml 1 addition, 1 deletionapp/views/users/show.html.haml
- config/gitlab.yml.example 2 additions, 2 deletionsconfig/gitlab.yml.example
- doc/customization/issue_closing.md 33 additions, 2 deletionsdoc/customization/issue_closing.md
- lib/api/branches.rb 3 additions, 3 deletionslib/api/branches.rb
- lib/gitlab/markdown.rb 13 additions, 13 deletionslib/gitlab/markdown.rb
Loading
Please register or sign in to comment