X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=8ac1d2651286f79707703893ef7a07087488a326;hb=f10b2768b5bfea83a96d4fea4c0aed9aeb682237;hp=b225b1e90937db02764d516a4c37383ed40801f3;hpb=54dd675963bf0ad41f2d8ba1728467647e4ec3e2;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b225b1e9..8ac1d265 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -470,7 +470,7 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Create Branch";
+            this.el.label = "Create Branch / Start ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
@@ -581,20 +581,16 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Merge to master";
+            this.el.label = "Merge branch/  ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
-               _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
-               _this.repo.push();
-               _this.repo.loadStatus();
-               
-                _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
-                _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
-                
+            
                _this.el.hide();
-               Clones.singleton().reposStore.load();
-               
+               Clones.singleton().el.response(-1);
+               if (_this.repo.activeTicket != null) {
+            	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }