Skip to content
This repository was archived by the owner on Jul 6, 2020. It is now read-only.

Commit 2bf4cb0

Browse files
Merge branch 'master' into improve_coverage_ngx
2 parents 316b492 + e5816b9 commit 2bf4cb0

File tree

3 files changed

+32
-6
lines changed

3 files changed

+32
-6
lines changed

.github/CONTRIBUTING.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,28 @@ git checkout -b your-branch-name
6868

6969
- If your checks have passed, your PR will be assigned a reviewer who will review your code and provide comments. Please address each review comment by pushing new commits to the same branch (the PR will automatically update, so you don’t need to submit a new one). Once you are done, comment below each review comment marking it as “Done”. Feel free to use the thread to have a discussion about comments that you don’t understand completely or don’t agree with.
7070

71-
- Once all comments are addressed, the reviewer will give an LGTM (‘looks good to me’) and merge the PR.
72-
4. Rules for great commit messages:
71+
- Once all comments are addressed, the maintainer will approve the PR.
72+
73+
4. Once you get reviewed by a mentor and done with all the required changes, squash all the commits:
74+
75+
```
76+
git checkout <branch_name>
77+
git rebase -i HEAD~N (N is the number of commits to be squashed)
78+
```
79+
80+
Then a screen will appear with all N commits having "pick" written in front of every commit.Change pick to s for the last N-1 commits and let it be pick for the first one.
81+
82+
Press esc button and type ":wq" to save the change and close the screen. Now a new screen will appear asking you to change commit message. Change it accordingly and save it.
83+
84+
```
85+
git push origin <branch_name> --force
86+
```
87+
88+
For further query regarding rebasing, visit https://github.com/todotxt/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit
89+
90+
Once rebasing is done, the reviewer will approve and merge the PR.
91+
92+
5. Rules for great commit messages:
7393

7494
- Write your commit message in the imperative: "Fix bug" and not "Fixed bug" or "Fixes bug."
7595

@@ -85,7 +105,7 @@ git checkout -b your-branch-name
85105

86106
- Describe why a change is being made.
87107

88-
5. Commit message is important as it should answers/should do the following:
108+
6. Commit message is important as it should answers/should do the following:
89109

90110
- How does it address the issue?
91111

@@ -95,7 +115,7 @@ git checkout -b your-branch-name
95115

96116
- Provide concise explaination to the user about limitations of the current code, like a bug or an issue
97117

98-
6. Examples of a great commit message:
118+
7. Examples of a great commit message:
99119

100120
- Add CPU arch filter scheduler support
101121

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ sudo: required
22
dist: trusty
33
language: node_js
44
addons:
5+
apt:
6+
packages:
7+
- dpkg
58
chrome: stable
69

710
node_js:

src/app/components/challenge/challengesettings/challengesettings.component.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,14 @@ export class ChallengesettingsComponent implements OnInit {
105105
*/
106106
remove(email): void {
107107
const SELF = this;
108-
const index = this.bannedEmailIds.indexOf(email);
108+
const index = SELF.bannedEmailIds.indexOf(email);
109109

110110
if (index >= 0) {
111-
this.bannedEmailIds.splice(index, 1);
111+
SELF.bannedEmailIds.splice(index, 1);
112112
}
113+
114+
// updating the banned Email Ids list
115+
SELF.updateBannedEmailList();
113116
}
114117

115118
validateEmail(email) {

0 commit comments

Comments
 (0)