-
- 下载
Merge branch 'master' into 13948-access-request-to-projects-and-groups
# Conflicts: # app/views/layouts/nav/_project.html.haml
显示
- CHANGELOG 1 个添加, 0 个删除CHANGELOG
- Gemfile 3 个添加, 0 个删除Gemfile
- Gemfile.lock 4 个添加, 0 个删除Gemfile.lock
- app/assets/javascripts/ci/build.coffee 9 个添加, 0 个删除app/assets/javascripts/ci/build.coffee
- app/controllers/projects/artifacts_controller.rb 11 个添加, 6 个删除app/controllers/projects/artifacts_controller.rb
- app/helpers/time_helper.rb 0 个添加, 1 个删除app/helpers/time_helper.rb
- app/models/ci/build.rb 29 个添加, 4 个删除app/models/ci/build.rb
- app/views/layouts/nav/_project.html.haml 4 个添加, 3 个删除app/views/layouts/nav/_project.html.haml
- app/views/layouts/nav/_project_settings.html.haml 36 个添加, 36 个删除app/views/layouts/nav/_project_settings.html.haml
- app/views/projects/builds/_sidebar.html.haml 22 个添加, 8 个删除app/views/projects/builds/_sidebar.html.haml
- app/workers/expire_build_artifacts_worker.rb 13 个添加, 0 个删除app/workers/expire_build_artifacts_worker.rb
- config/gitlab.yml.example 3 个添加, 0 个删除config/gitlab.yml.example
- config/initializers/1_settings.rb 3 个添加, 0 个删除config/initializers/1_settings.rb
- config/initializers/chronic_duration.rb 1 个添加, 0 个删除config/initializers/chronic_duration.rb
- config/routes.rb 1 个添加, 0 个删除config/routes.rb
- db/migrate/20160416182152_convert_award_note_to_emoji_award.rb 30 个添加, 3 个删除...grate/20160416182152_convert_award_note_to_emoji_award.rb
- db/migrate/20160416190505_remove_note_is_award.rb 0 个添加, 6 个删除db/migrate/20160416190505_remove_note_is_award.rb
- db/migrate/20160518200441_add_artifacts_expire_date_to_ci_builds.rb 5 个添加, 0 个删除.../20160518200441_add_artifacts_expire_date_to_ci_builds.rb
- db/schema.rb 3 个添加, 2 个删除db/schema.rb
- doc/api/README.md 27 个添加, 20 个删除doc/api/README.md
加载中
想要评论请 注册 或 登录