Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
thelostone-mc committed Jun 8, 2021
2 parents 014682e + 7b1cfa4 commit 18f9704
Show file tree
Hide file tree
Showing 5 changed files with 310 additions and 304 deletions.
2 changes: 2 additions & 0 deletions app/assets/v2/js/explorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ Vue.component('bounty-explorer', Vue.extend({
};
},
mounted() {
let vm = this;

vm.bounties = [];
vm.featuredBounties = [];
if (this.tribe && this.tribe.handle) {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/v2/js/pages/profile-tribes.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,10 @@ const loadDynamicScript = (callback, url, id) => {
newPathName = 'projects';
break;
case 2:
newPathName = 'people';
newPathName = 'bounties';
break;
case 3:
newPathName = 'bounties';
newPathName = 'people';
break;
case 4:
newPathName = 'manage';
Expand Down
Loading

0 comments on commit 18f9704

Please sign in to comment.