Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove capistrano and Ruby China deploy scripts. #781

Merged
merged 5 commits into from
Oct 20, 2016

Conversation

huacnlee
Copy link
Member

@huacnlee huacnlee commented Oct 20, 2016

@huacnlee huacnlee merged commit 8ec3112 into master Oct 20, 2016
@huacnlee huacnlee deleted the refactor/remove-ruby-china-deployment-scripts branch October 20, 2016 07:01
2point7 added a commit to 2point7/ruby-china that referenced this pull request Oct 22, 2016
Revert "Remove capistrano and Ruby China deploy scripts. (ruby-china#781)"

This reverts commit 8ec3112.

Conflicts:
	Gemfile.lock
	README.md
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	config/deploy.rb
	config/deploy/production.rb
	config/environments/production.rb
	config/puma-web.rb
Raincal pushed a commit to RubyHausu/ruby-china that referenced this pull request Nov 17, 2016
* Remove capistrano and Ruby China deploy scripts.

* Remove ruby-china special codes

* Merge cal-heatmap js into project.

* Remove 4 icon from home page;
Navbar primary color change to blue.

* Blue turbolink-progress-bar
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant