##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2123:f43bc711 default
r2784:e8c62649 default
Show More
package.json
25 lines | 717 B | application/json | JsonLexer
project: added all source files and assets
r1 {
"name": "rhodecode-enterprise",
"version": "0.0.1",
"devDependencies": {
"grunt": "^0.4.5",
polymer: introduce webcomponents to rhodecode
r689 "grunt-contrib-copy": "^1.0.0",
project: added all source files and assets
r1 "grunt-contrib-concat": "^0.5.1",
"grunt-contrib-jshint": "^0.12.0",
"grunt-contrib-less": "^1.1.0",
"grunt-contrib-watch": "^0.6.1",
polymer: introduce webcomponents to rhodecode
r689 "crisper": "^2.0.2",
"vulcanize": "^1.14.8",
"grunt-crisper": "^1.0.1",
"grunt-vulcanize": "^1.0.0",
js: organized and updated JS packages....
r2123 "node2nix": "^1.0.0",
packages.json: add bower dependancy
r700 "jshint": "^2.9.1-rc3",
frontend: added favico.js to requirements
r877 "bower": "^1.7.9",
js: organized and updated JS packages....
r2123 "jquery": "1.11.3",
frontend: added favico.js to requirements
r877 "favico.js": "^0.3.10",
js: organized and updated JS packages....
r2123 "clipboard": "^1.7.1",
"moment": "^2.18.1",
"mousetrap": "^1.6.1",
"appenlight-client": "git+https://git@github.com/AppEnlight/appenlight-client-js.git#0.5.1"
project: added all source files and assets
r1 }
}