Commit Graph

109 Commits

Author SHA1 Message Date
Alexander Machehin 834c03e6fa fix showing pull request diff & diff between two commits 2014-09-05 00:51:42 +06:00
Vokhmin Alexey V 44ac1056ab #376: updated priority of queues 2014-04-15 22:41:06 +04:00
Alexander Machehin 0a7d5d22da [#345] move lib/modules/models to app/models/concerns; small refactoring 2014-03-11 14:58:36 +06:00
Alexander Machehin a5f56bb835 [#345] remove observers; use new labmda syntax 2014-03-11 14:28:17 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Vokhmin Alexey V 6ffdddf48b #265: small refactoring according to Alexander's comments 2013-08-13 22:33:48 +04:00
Vokhmin Alexey V 01098152e9 #265: added specs for PullRequest model 2013-08-13 19:56:27 +04:00
Vokhmin Alexey V 81f82cbb7d #265: rename folders with pull_requests 2013-08-13 19:36:09 +04:00
Vokhmin Alexey V 4c254747ae #265: updated relations of pull_requests 2013-08-13 19:05:16 +04:00
Vokhmin Alexey V ffcdd26c66 #214: updated UI of PullRequest#show 2013-07-12 18:21:46 +04:00
Alexander Machehin e343ba90aa [#105] pulls api v1 2013-06-19 01:45:40 +06:00
Alexander Machehin 532fca43dd restore pull request fetching 2013-06-18 08:11:20 +06:00
Alexander Machehin 9d8abb30a4 fix bugs and remove unneeded shellescapes 2013-06-17 22:14:39 +06:00
Alexander Machehin 4b81a8dff9 add more shellescaping for pull request actions 2013-06-11 10:03:04 +06:00
Vokhmin Alexey V 12c5eb96e5 use #shellescape on system actions 2013-06-10 23:19:31 +04:00
Alexander Machehin 88d29385f7 remove cleaning branch 2013-04-02 15:19:09 +06:00
Alexander Machehin 4d046dd990 add exitstatus to debug merging pull requests 2013-03-25 16:34:37 +06:00
Alexander Machehin a4522bc3c7 add one more check for merging pull requests 2013-03-21 22:55:12 +06:00
Alexander Machehin 0f97ddb34a try to catch no merge errors 2013-03-19 00:27:26 +06:00
Alexander Machehin b31304b187 fix error: did you mean '--all' (with two dashes ?) 2013-03-19 00:26:45 +06:00
Alexander Machehin dbea9152b8 fix user identificator 2013-03-18 16:19:18 +06:00
Alexander Machehin 21e7588d0e add user identificator when merging pull request 2013-03-07 22:41:59 +06:00
Alexander Machehin 2ae652d70b fixed updating pull code 2013-03-07 18:01:08 +06:00
Alexander Machehin 8860238da4 [refs #878] fix some bugs when no master branch 2013-01-31 22:26:49 +06:00
Alexander Machehin 902438b7b5 [refs #719] fixed errors with tags & history rewrite 2013-01-28 22:41:38 +06:00
Alexander Machehin 7edcacee00 [refs #719] fix errors with deleting refs 2013-01-28 20:58:08 +06:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Alexander Machehin 56e9174045 [refs #90] avoid collisions with temporary repos 2012-11-14 22:28:21 +06:00
Alexander Machehin 1afcef17c3 [refs #90] clean dir before clone 2012-11-14 21:46:59 +06:00
Alexander Machehin 8ad53f4c0b [refs #90] create a "new" pull at another dir 2012-11-14 16:52:26 +06:00
Alexander Machehin 26af1aa27c Merge branch 'master' into 90-fix_orphan_pulls
Conflicts:
	app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
Alexander Machehin e9233d362a add new git_path param 2012-11-08 15:13:48 +06:00
Alexander Machehin 970da230f2 [refs #90] add validations 2012-10-29 21:33:20 +06:00
Alexander Machehin 36e07b440f [refs #90] set data to pull 2012-10-28 00:46:04 +06:00
Alexander Machehin c6a0dfee97 [refs #90] fixed orphan pulls 2012-10-28 00:04:28 +06:00
Alexander Machehin ea1ec80d29 [refs #579] fixed bug with updating comments 2012-10-18 23:37:52 +06:00
Alexander Machehin e15bf13c4f [refs #90] small refactoring of the diff method 2012-10-18 18:09:12 +06:00
Alexander Machehin 62ca030110 [refs #90] head_branch -> from_branch 2012-10-18 17:46:57 +06:00
Alexander Machehin 3868fbf4f3 [refs #579] forgot change to the pull.repo 2012-10-16 19:22:19 +06:00
Alexander Machehin 9579734506 [refs #579] some optimization by getting pull repo 2012-10-16 16:19:53 +06:00
Alexander Machehin 66f0cc3244 [refs #579] fixed setting status to inline comments 2012-10-15 23:45:01 +06:00
Alexander Machehin e3a0005bd3 [refs #579] small refactoring 2012-10-15 23:42:28 +06:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Alexander Machehin 8f011316c3 [refs #90] possible fix for nil commom ancestor commit 2012-10-01 23:52:18 +06:00
Alexander Machehin 8cb9171c17 [refs #90] final fix to merge 2012-09-28 20:31:21 +06:00
Alexander Machehin 0069dfffc7 [refs #90] catch error 2012-09-28 18:26:12 +06:00
Alexander Machehin ab939253df [refs #90] optimization? 2012-08-10 23:06:34 +06:00
Alexander Machehin 11e5f4dd99 [refs #90] try use grit to clone 2012-08-10 22:42:34 +06:00