From 2ba43f0516ba062c178ec1914148e4f38e1694fb Mon Sep 17 00:00:00 2001 From: Matheus Sales Date: Thu, 30 Jun 2016 21:18:38 -0300 Subject: [PATCH 1/3] Add site maintenance section to the table of contents --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d6aca1e..b967c28 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Guides for getting things done, programming well, and programming in style. * [Git](/style/git) * [Ruby](/style/ruby) * [Rails](/style/rails) +* [Site Maintenance](/style/site-maintenance) ## High level guidelines: From b1ed18731bf858813152d6d1c3b5fb552ee0e8a5 Mon Sep 17 00:00:00 2001 From: Matheus Sales Date: Thu, 30 Jun 2016 21:18:54 -0300 Subject: [PATCH 2/3] Add Site Maintenance section --- style/site-maintenance/README.md | 56 ++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 style/site-maintenance/README.md diff --git a/style/site-maintenance/README.md b/style/site-maintenance/README.md new file mode 100644 index 0000000..27e9235 --- /dev/null +++ b/style/site-maintenance/README.md @@ -0,0 +1,56 @@ +# Site Maintenance + +## Found bugs? + +* Create a new task in our project +* Try to give us all the information you have, e.g.: print screen, browser name/version, operational system, desktop/mobile version. +* Post on the **#site-startae** channel that you found a bug and registered on Flow. +Feature +* Make sure your repository is updated +* Create a new branch from develop called `feature/feature_name` +* Add your modifications in our CHANGELOG.md file, e.g.: +``` + ## [1.5.0] - 2015-12-03 + ### Added + Feature name +``` +* Every new feature will increase the `MINOR` number in the: `MAJOR.MINOR.PATCH` format. (We follow these rules) +* Run the server to check if everything is fine, push your branch and submit a new pull request +* Update the task informing people everything is ok and get at least 3 approval from the developers in your pull request to develop branch +* Merge your pull request and delete your branch +* Check and test it on our staging environment +* Merge develop into master and deploy to Heroku + +## Bugfix + +* Make sure your repository is updated +* Create a new branch from develop called `fix/something` +* Add your modifications in our CHANGELOG.md file, e.g.: +``` + ## [1.4.1] - 2015-12-03 + ### Changed + Bug fix +``` +* Every new bugfix will increase the `PATCH` number in the: `MAJOR.MINOR.PATCH` format. (We follow these rules) +* Run the server to check if everything is fine, push your branch and submit a new pull request +* Update the task informing people everything is ok and get at least 2 approval from the developers in your pull request to develop branch +* Merge your pull request and delete your branch +* Check and test it on our staging environment +* Merge develop into master and deploy to Heroku + +## Update gems and libs + +* Make sure your repository is updated +* Create a new branch from develop called `feature/update_gems` +* Add your modifications in our CHANGELOG.md file, e.g.: +``` + ## [1.5.0] - 2015-12-03 + ### Changed + Update Gemfile (middleman, middleman-livereload, sass) +``` +* The updates will increase the `MINOR` number in the: `MAJOR.MINOR.PATCH` format. (We follow these rules) +* Run the server to check if everything is fine, push your branch and submit a new pull request +* Update the task informing people everything is ok and get at least 1 approval from the developers in your pull request to develop branch +* Merge your pull request and delete your branch +* Check and test it on our staging environment +* Merge develop into master and deploy to Heroku From 0a2e96577aa2f47c89706adba447c661bb1afed6 Mon Sep 17 00:00:00 2001 From: Matheus Sales Date: Fri, 1 Jul 2016 09:58:19 -0300 Subject: [PATCH 3/3] Add Site Maintenance section --- style/site-maintenance/README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/style/site-maintenance/README.md b/style/site-maintenance/README.md index 27e9235..9bd671e 100644 --- a/style/site-maintenance/README.md +++ b/style/site-maintenance/README.md @@ -1,11 +1,6 @@ # Site Maintenance -## Found bugs? - -* Create a new task in our project -* Try to give us all the information you have, e.g.: print screen, browser name/version, operational system, desktop/mobile version. -* Post on the **#site-startae** channel that you found a bug and registered on Flow. -Feature +## Feature * Make sure your repository is updated * Create a new branch from develop called `feature/feature_name` * Add your modifications in our CHANGELOG.md file, e.g.: @@ -21,6 +16,12 @@ Feature * Check and test it on our staging environment * Merge develop into master and deploy to Heroku +## Found bugs? + +* Create a new task in our project +* Try to give us all the information you have, e.g.: print screen, browser name/version, operational system, desktop/mobile version. +* Post on the **#site-startae** channel that you found a bug and registered on Flow. + ## Bugfix * Make sure your repository is updated