-
Notifications
You must be signed in to change notification settings - Fork 3
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
Feature/bitbucket porting #14
Conversation
50a2af8
to
d9addc9
Compare
@@ -56,7 +56,7 @@ public PluginUserManager(UserAdminService uas, PermissionAdminService pas, UserS | |||
} | |||
|
|||
public void createStashbotUser(JenkinsServerConfiguration jsc) { | |||
StashUser user = us.getUserByName(jsc.getStashUsername()); | |||
ApplicationUser user = us.getUserByName(jsc.getStashUsername()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as long as you're s/StashUser/ApplicationUser/ everywhere, may as well do it to your methods?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, maybe I'll fix that in a future change. Good point, would be less confusing.
…40-support to master Squashed commit of the following: commit 85592864f2e3d340b04c1136c40d3e031564ba58 Merge: 18a8e07 d016116 Author: Nathan J. Mehl <n@climate.com> Date: Mon Aug 8 09:56:50 2016 -0700 Merge branch 'upstream/terabyte' commit d016116 Merge: 6de94e1 88f8c73 Author: Carl Myers <cmyers@cmyers.org> Date: Mon Nov 23 14:37:25 2015 -0800 Merge pull request terabyte#37 from terabyte/feature/fix-pr-link Fix terabyte#36 - trigger PR build link broken after bitbucket migration commit 88f8c73 Author: Carl Myers <cmyers@pernixdata.com> Date: Mon Nov 23 13:49:35 2015 -0800 Fix terabyte#36 - trigger PR build link broken after bitbucket migration Resources: https://confluence.atlassian.com/bitbucketserver/how-to-update-your-add-on-779302412.html https://developer.atlassian.com/bitbucket/concepts/javascript-api.html commit 6de94e1 Merge: a612e4c 1bf85dd Author: Carl Myers <cmyers@cmyers.org> Date: Mon Nov 23 12:57:18 2015 -0800 Merge pull request terabyte#35 from terabyte/feature/forward-port Feature/forward port commit 1bf85dd Author: Carl Myers <cmyers@pernixdata.com> Date: Mon Nov 23 10:36:45 2015 -0800 Remove superfluous fetch commit e0fec95 Author: Nathan J. Mehl <n@climate.com> Date: Tue Nov 17 05:32:48 2015 -0800 use pull-request refspec in verify_pr job This addresses issue terabyte#26 in terabyte/stashbot commit a612e4c Merge: 618b589 3dc1533 Author: Carl Myers <cmyers@cmyers.org> Date: Wed Nov 18 16:51:13 2015 -0800 Merge pull request terabyte#32 from terabyte/backporting-merge-base Fix issue terabyte#31: editing a repo config as non-system-admin when locked … commit 618b589 Merge: c666797 fd6c6ce Author: Carl Myers <cmyers@cmyers.org> Date: Tue Nov 17 16:34:50 2015 -0800 Merge pull request terabyte#27 from terabyte/feature/fix-build-reporting Feature/fix build reporting commit fd6c6ce Author: Carl Myers <cmyers@pernixdata.com> Date: Mon Nov 16 23:19:26 2015 -0800 Correcting build key to include full jenkins path when folders enabled commit 87b09a0 Author: Carl Myers <cmyers@pernixdata.com> Date: Mon Nov 16 23:02:32 2015 -0800 Use more precise time in description for build status commit c666797 Author: Nathan J. Mehl <n@climate.com> Date: Thu Nov 12 05:46:51 2015 -0800 set default refspec for verify builds to support cross-repo PRs forward-ported fb78c98 commit 4ba6ea9 Merge: 33f6e95 5f603f3 Author: Carl Myers <cmyers@cmyers.org> Date: Mon Nov 16 21:52:53 2015 -0800 Merge pull request terabyte#18 from memory/default-deactivate Default build activations to false commit 33f6e95 Merge: 1435ba6 60c6e7b Author: Carl Myers <cmyers@cmyers.org> Date: Mon Nov 16 21:50:52 2015 -0800 Merge pull request terabyte#15 from terabyte/feature/issue-12 Feature/issue 12 commit 1435ba6 Merge: 250fef0 d9addc9 Author: Carl Myers <cmyers@cmyers.org> Date: Wed Nov 11 16:47:39 2015 -0800 Merge pull request terabyte#14 from terabyte/feature/bitbucket-porting Feature/bitbucket porting commit 60c6e7b Author: Carl Myers <cmyers@pernixdata.com> Date: Tue Nov 10 10:57:57 2015 -0800 Making folder prefix @NotNull so it can't cause NPEs later Updated APIs to automatically convert null or empty into a sigil, which is "/", and convert it back upon read. commit 3a64f68 Author: Carl Myers <cmyers@pernixdata.com> Date: Tue Nov 10 09:58:05 2015 -0800 Fix build links when folders are in use Closes github issue terabyte#12 commit d9addc9 Author: Carl Myers <cmyers@pernixdata.com> Date: Mon Nov 9 17:31:20 2015 -0800 Update generated-test-resources.zip for bitbucket migration commit 4de643d Author: Carl Myers <cmyers@pernixdata.com> Date: Tue Nov 10 10:20:13 2015 -0800 Migrate stashbot to bitbucket 4.X
No description provided.