X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.bjs;h=79e88ca127207e21dfc89853da14ddbe753f27c6;hb=9b0ec931b3bb641930971d356b70d84ba8f383b8;hp=28724df314007fd609844f6dfb427f0754b18a99;hpb=54dd675963bf0ad41f2d8ba1728467647e4ec3e2;p=gitlive

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 28724df3..79e88ca1 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -123,7 +123,7 @@
          "listeners" : {
           "button_press_event" : "() => {\n   var oldq = new Gee.ArrayList<GitMonitorQueue>();  \n\n\tClones.singleton().el.response(-1);\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n    return false;\n}"
          },
-         "label" : "Create Branch",
+         "label" : "Create Branch / Start ticket",
          "xtype" : "Button",
          "* pack" : "add",
          "$ xns" : "Gtk"
@@ -148,9 +148,9 @@
         },
         {
          "listeners" : {
-          "button_press_event" : "() => {\n   _this.repo.git({ \"commit\" , \"-a\" ,\"-m\", \"Uncommited changes synced\" });\n   _this.repo.push();\n   _this.repo.loadStatus();\n   \n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    \n   _this.el.hide();\n   Clones.singleton().reposStore.load();\n   \n    return false;\n}"
+          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   if (_this.repos.activeTicket != null) {\n\t   MergeBranch.singleton().show(this.repo.activeTicket, null);   \n   }\n    return false;\n}"
          },
-         "label" : "Merge to master",
+         "label" : "Merge branch/  ticket",
          "xtype" : "Button",
          "* pack" : "add",
          "$ xns" : "Gtk"