Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

feat(config): upgrade angular-bootstrap from 0.13 to 1.0 #1143

Merged
merged 1 commit into from
Jan 29, 2016
Merged

feat(config): upgrade angular-bootstrap from 0.13 to 1.0 #1143

merged 1 commit into from
Jan 29, 2016

Conversation

trendzetter
Copy link
Contributor

Moving from 0.13 solves many the many issues with this version, provides a more stable interface.
Migration guide: https://github.com/angular-ui/bootstrap/wiki/Migration-guide-for-prefixes

Closes #1142
Closes #1131

@lirantal lirantal added this to the 0.5.0 milestone Jan 16, 2016
@lirantal
Copy link
Member

@trendzetter you should review our CONTRIBUTING documentation since it seems you need to squash your commits and change the commit text to our standards.

@trendzetter
Copy link
Contributor Author

@lirantal I'm a bit new to this, I tried to "squash" my commits and format my text according to the docs. Am I doing it better now?

@trendzetter trendzetter changed the title enhancement(config): upgrade angular-bootstrap from 0.13 to 1.0 feat(config): upgrade angular-bootstrap from 0.13 to 1.0 Jan 16, 2016
@mleanos
Copy link
Member

mleanos commented Jan 16, 2016

@trendzetter This is generally how I squash my commits down to 1 commit.
http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
You basically squash all your commits, into one.. in your case here (based on the commits) it would be git rebase -i HEAD~5

Also, I see you have merge commits here. It's better to not use merge for contributing, as it will sometimes pull in other changes that have already been merged upstream; thus, making it look like your made the changes & there can be conflicts when merging the PR.

Use rebase instead, as described here http://blog.bigbinary.com/2013/09/13/how-to-keep-your-fork-uptodate.html

  1. checkout master, and rebase from upstream master branch
  2. checkout your PR branch, and rebase from your local master branch
  3. if Git tells you that your branches have "diverged", then you will need to git push --force to force your remote branch to be exactly what your local branch is.

This took some time for me to get comfortable with, but it's really not as scary as it appeared to me at first :) The articles I shared really helped me a lot.

@trendzetter
Copy link
Contributor Author

I am grateful for you helpful attitude.
Did I pull it off?

@mleanos
Copy link
Member

mleanos commented Jan 16, 2016

LGTM

@ilanbiala
Copy link
Member

@mleanos did you test this as well, or just the change for the commit message?

@mleanos
Copy link
Member

mleanos commented Jan 17, 2016

The squash looks good, and the diffs look fine to me. However, I haven't tested. I wanted to, but I don't have time today.

@trendzetter Have you done a quick once over, and made sure nothing on the UI was adversely affected by this?

@ilanbiala
Copy link
Member

@trendzetter I haven't worked with ui-bootstrap after 0.13, so I'm not sure if it will change the CSS and look in addition to the directives and such as well. Have you tested the app with these changes?

@trendzetter
Copy link
Contributor Author

@lirantal Yes. All seemed to work after fixing the menu. After more systematic screening the code I have found more directives that need updating where I wasn't aware off. I will update my pr.

@trendzetter
Copy link
Contributor Author

I have updated my commit based on a carefully checking all ui-bootstrap components. It took me some wrestling with git. I will take a break and give it some more extensive testing.

@trendzetter
Copy link
Contributor Author

Further testing revealed no regressions. This should be encouraging to those heavily invested in angular-bootstrap.

@trendzetter
Copy link
Contributor Author

@ilanbiala They renamed their directives. Nothing is deprecated. Some directives are extended with additional options since 0.13. The migration guide sums the breaking changes up:
https://github.com/angular-ui/bootstrap/wiki/Migration-guide-for-prefixes

@ilanbiala
Copy link
Member

SGTM, haven't tested, but based on the docs, seems fine.

@mleanos
Copy link
Member

mleanos commented Jan 17, 2016

@trendzetter @ilanbiala

I ran through all the tests, and manually tested this branch. Everything looks good to me, with the exception of the confirm dialog not implemented in the article client controller. After looking at the code, I realized that this branch isn't current with master.

@trendzetter Can you rebase with the upstream master branch, and push? Normally, it wouldn't be much of an issue, since the changes would just be merged on top of master. However, these changes have a wide reach over the UI. I'd like to test with the most up to date code-base, to be sure we don't introduce any bugs/issues.

Many issues arise when using angular-bootstrap 0.13. Migration to 1.0 is
straightforward, offers a more stable interface, extra directives and fixes
many bugs.
Migration guide:
https://github.com/angular-ui/bootstrap/wiki/Migration-guide-for-prefixes

Fixes #1142
Fixes #1131
@trendzetter
Copy link
Contributor Author

I've synced with the upstream master. The confirm dialog for delete is correctly displayed. I am not seeing any new issues which is expected as the articles module is not using any of the renamed angular-bootstrap directives.

@ilanbiala
Copy link
Member

@trendzetter LGTM, just maybe change the scope of the commit message? @codydaig suggestions?

@codydaig
Copy link
Member

@ilanbiala I'm going to pull this branch down tomorrow and test. I'll ping back tomorrow with any comments.

@trendzetter
Copy link
Contributor Author

@codydaig Did you find any issues that I need to look in to?

@ilanbiala
Copy link
Member

@codydaig is this good to merge?

codydaig added a commit that referenced this pull request Jan 29, 2016
feat(config): upgrade angular-bootstrap from 0.13 to 1.0
@codydaig codydaig merged commit 43b8cae into meanjs:master Jan 29, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update to angular-bootstrap 1.0 bootstrap accordion is not working
5 participants