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

Require basic auth if ENV["AUTH_BASIC_PASS"] is set #302

Merged
merged 1 commit into from
Jul 28, 2015

Conversation

ruslankhaertdinov
Copy link
Contributor

Related to: #299

@timurvafin
Copy link
Member

@ruslankhaertdinov could you please add note to the CHANGELOG and README?

@ruslankhaertdinov
Copy link
Contributor Author

@timurvafin sure

@ruslankhaertdinov
Copy link
Contributor Author

@timurvafin done

@@ -2,13 +2,14 @@

## Unreleased

## 1.3 - 2015-07-03
## 1.3 - 2015-07-27
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruslankhaertdinov no need to change release date here, just add your new line in the "Unreleased" section.

@ruslankhaertdinov
Copy link
Contributor Author

@timurvafin Let ENV vars with description be in the separate PR.

@ruslankhaertdinov
Copy link
Contributor Author

@timurvafin ENV vars described in this PR: #304

@@ -9,6 +9,7 @@
- Fix `rails_best_practices` invocation from `bin/quality`, `config/rails_best_practices.yml` was ignored before.
- Introduce [CSSComb](https://github.com/csscomb/csscomb.js). For more details see: https://github.com/fs/rails-base/pull/284
- Add `Brewfile` to track application dependencies.
- Add ability to close app from unauthorized viewers, see: https://github.com/fs/rails-base/pull/302/files
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add it to "Unreleased" section. Time travel is prohibited on our planet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's my mistake

@ruslankhaertdinov
Copy link
Contributor Author

@vast done

@timurvafin
Copy link
Member

@ruslankhaertdinov #304 was merged in to master recently. Could you please format .env.example using new style?

After that please cleanup commits and we will be ready to merge.

Thanks

@ruslankhaertdinov
Copy link
Contributor Author

@timurvafin I already rebase this branch with master (and squash commits), should I do anything else?

@timurvafin timurvafin changed the title [#299] Require basic auth if ENV["AUTH_BASIC_PASS"] is set Require basic auth if ENV["AUTH_BASIC_PASS"] is set Jul 28, 2015
@timurvafin
Copy link
Member

Can't merge this branch b/c of conflicts

@ruslankhaertdinov
Copy link
Contributor Author

@timurvafin I fix conflicts

timurvafin added a commit that referenced this pull request Jul 28, 2015
Require basic auth if ENV["AUTH_BASIC_PASS"] is set
@timurvafin timurvafin merged commit 89c9f55 into fs:master Jul 28, 2015
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.

3 participants