anitab-org / vms

THIS PROJECT IS ARCHIVED. Volunteer Management System.
GNU General Public License v2.0
1 stars 4 forks source link

Added Button in UI to link Zulip #1091

Closed yash2189 closed 3 years ago

yash2189 commented 3 years ago

Description

To add button in UI to link Zulip Fixes #1038

Type of Change:

How Has This Been Tested?

Successfully added button in UI to link Zulip. When a registered user is logged in the button is shown on the home page.

Screenshot:

Button_ZULIP

Checklist:

keshakaneria commented 3 years ago

Build is failing, did you try to edit anything after submitting the PR? Details of this failure: This is a pull request build. It is running a build against the merge commit, after merging #1091 Added Button in UI to link Zulip. Any changes that have been made to the develop branch before the build ran are also included.

keshakaneria commented 3 years ago

@yash2189 Push new commit with requested changes and squash them to single commit for final merge

yash2189 commented 3 years ago

@keshakaneria I did not edit anything after submitting the PR

keshakaneria commented 3 years ago

@keshakaneria I did not edit anything after submitting the PR

add the last line needed as suggested by @gaurivn locally and push the commit again

yash2189 commented 3 years ago

Do I need to squash the commits after I push the new commit?

keshakaneria commented 3 years ago

Do I need to squash the commits after I push the new commit?

Every new edit will have to be pushed which will eventually increase the commits. Thus you will have to squash them to turn it into single commit.

yash2189 commented 3 years ago

Do I need to squash the commits after I push the new commit?

Every new edit will have to be pushed which will eventually increase the commits. Thus you will have to squash them to turn it into single commit.

I have done the required changes in the file will you please check @keshakaneria

yash2189 commented 3 years ago

Can you please check again @gaurivn @keshakaneria

keshakaneria commented 3 years ago

Can you please check again @gaurivn @keshakaneria

Let the build finish, its almost perfect so no need to worry! Once the build is finished, squash them so that i can put a tag to finally get merged.

yash2189 commented 3 years ago

@gaurivn @keshakaneria can you please tell me how do I squash these 3 commits since I made a mistake while doing the same previously .Also I am not acquainted with the rebase and squash commands in git.

gaurivn commented 3 years ago

Yay, it's working, and @yash2189, for squashing, do check this out.

yash2189 commented 3 years ago

Yay, it's working, and @yash2189, for squashing, do check this out.

Yes I did squash them a moment back, the build is running.

keshakaneria commented 3 years ago

@gaurivn @keshakaneria can you please tell me how do I squash these 3 commits since I made a mistake while doing the same previously .Also I am not acquainted with the rebase and squash commands in git.

Write git rebase --i HEAD~4 since you want to squash last 4 recent commits. Check it its the same which you want to squash. change pick to s to squash. Then type :!qw to save and go back. Push it again and your done with squashing.

keshakaneria commented 3 years ago

Yay, it's working, and @yash2189, for squashing, do check this out.

Yes I did squash them a moment back, the build is running.

Thats amazing! Congratulations for your first PR 🥳