├── .gitignore ├── .rspec ├── .travis.yml ├── Gemfile ├── README.md ├── Rakefile ├── bin ├── console └── setup ├── doc ├── images │ ├── SmartMergeConf.jpg │ ├── SmartMergeFlow.jpg │ ├── WhatIsSmartMerge.jpg │ ├── branch_model.jpg │ └── conflict.jpg └── 分支集成加速器SmartMerge.md ├── lib ├── generators │ └── smart_merge │ │ ├── install_generator.rb │ │ └── templates │ │ ├── create_smart_merge_settings.rb │ │ └── smart_merge_setting.rb ├── smart_merge.rb └── smart_merge │ ├── base_service.rb │ ├── check_service.rb │ ├── create_service.rb │ ├── destroy_service.rb │ ├── merge_service.rb │ ├── trigger_service.rb │ ├── update_service.rb │ └── version.rb ├── smart_merge.gemspec └── spec ├── smart_merge_spec.rb └── spec_helper.rb /.gitignore: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/.gitignore -------------------------------------------------------------------------------- /.rspec: -------------------------------------------------------------------------------- 1 | --format documentation 2 | --color 3 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/.travis.yml -------------------------------------------------------------------------------- /Gemfile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/Gemfile -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/README.md -------------------------------------------------------------------------------- /Rakefile: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/Rakefile -------------------------------------------------------------------------------- /bin/console: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/bin/console -------------------------------------------------------------------------------- /bin/setup: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/bin/setup -------------------------------------------------------------------------------- /doc/images/SmartMergeConf.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/doc/images/SmartMergeConf.jpg -------------------------------------------------------------------------------- /doc/images/SmartMergeFlow.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/doc/images/SmartMergeFlow.jpg -------------------------------------------------------------------------------- /doc/images/WhatIsSmartMerge.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/doc/images/WhatIsSmartMerge.jpg -------------------------------------------------------------------------------- /doc/images/branch_model.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/doc/images/branch_model.jpg -------------------------------------------------------------------------------- /doc/images/conflict.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/doc/images/conflict.jpg -------------------------------------------------------------------------------- /doc/分支集成加速器SmartMerge.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/doc/分支集成加速器SmartMerge.md -------------------------------------------------------------------------------- /lib/generators/smart_merge/install_generator.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/generators/smart_merge/install_generator.rb -------------------------------------------------------------------------------- /lib/generators/smart_merge/templates/create_smart_merge_settings.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/generators/smart_merge/templates/create_smart_merge_settings.rb -------------------------------------------------------------------------------- /lib/generators/smart_merge/templates/smart_merge_setting.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/generators/smart_merge/templates/smart_merge_setting.rb -------------------------------------------------------------------------------- /lib/smart_merge.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge.rb -------------------------------------------------------------------------------- /lib/smart_merge/base_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/base_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/check_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/check_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/create_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/create_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/destroy_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/destroy_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/merge_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/merge_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/trigger_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/trigger_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/update_service.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/lib/smart_merge/update_service.rb -------------------------------------------------------------------------------- /lib/smart_merge/version.rb: -------------------------------------------------------------------------------- 1 | module SmartMerge 2 | VERSION = "0.0.1" 3 | end 4 | -------------------------------------------------------------------------------- /smart_merge.gemspec: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/smart_merge.gemspec -------------------------------------------------------------------------------- /spec/smart_merge_spec.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/spec/smart_merge_spec.rb -------------------------------------------------------------------------------- /spec/spec_helper.rb: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/gitlab-extra/smart_merge/HEAD/spec/spec_helper.rb --------------------------------------------------------------------------------