Commit Graph

210 Commits

Author SHA1 Message Date
Vokhmin Alexey V e3e228de33 #759: add tester role for user 2012-12-06 22:04:39 +04:00
Vokhmin Alexey V ab8c4016b5 #759: refactoring according to Vladimir's comments 2012-12-06 21:34:09 +04:00
Vokhmin Alexey V ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04:00
Alexander Machehin 3432b6af49 [refs #674] change comments 2012-12-04 00:06:31 +06:00
Alexander Machehin b132a56937 Merge branch 'master' into 674-diff_between_commits
Conflicts:
	db/schema.rb  fresh
2012-12-04 00:02:45 +06:00
Vokhmin Alexey V ee73df5d3a disable auto_publish for new_core, some refactoring 2012-12-03 15:28:27 +04:00
Alexander Machehin 611402c4c2 [refs #674] add stats 2012-12-03 17:11:55 +06:00
Vokhmin Alexey V fcdbfd4538 add new column to build_lists table, some refactoring 2012-11-30 14:41:39 +04:00
Vokhmin Alexey V a5daff3442 update getting logs, some repo generation 2012-11-29 21:56:03 +04:00
Vokhmin Alexey V 791f77dfd5 add 'New core' option for creating build_list 2012-11-29 19:12:24 +04:00
Alexander Machehin 8ed71e0f03 [refs #674] fixed undefined method 'binary?' for nil:NilClass when rename the file 2012-11-27 23:35:58 +06:00
Vokhmin Alexey V 96e8df1b50 use Redis for getting log 2012-11-26 22:16:34 +04:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Alexander Machehin 95d262b92f fix build list pagination 2012-11-14 23:56:00 +06:00
Alexander Machehin 8df87ed292 [refs #90] fixed error on create 2012-11-14 16:51:10 +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 58a9c68951 [refs #90] fixed rendering a new pull 2012-10-28 00:44:42 +06:00
Alexander Machehin 95e5804358 [refs #90] fixed git timeout error on the big diff 2012-10-26 20:03:46 +06:00
Vladimir Sharshov 00e92d9672 Merge pull request #678 from warpc/579-code_line_comments
[refs #579] code line comments
2012-10-19 07:48:50 -07:00
Vokhmin Alexey V 0cf0933074 #698:small refactoring 2012-10-19 11:32:12 +04:00
Vokhmin Alexey V 68dbae8c83 #698: added #create and #fork actions for Advisories API 2012-10-18 18:17:50 +04:00
Alexander Machehin c6f45956cc [refs #90] fixed error by 24fd99b2d5cab 2012-10-18 18:50:43 +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 f060d919d9 [refs #579] add new helper 2012-10-16 19:20:55 +06:00
Alexander Machehin 9579734506 [refs #579] some optimization by getting pull repo 2012-10-16 16:19:53 +06:00
Alexander Machehin b0604f89d1 [refs #579] move logick to model 2012-10-16 15:50:21 +06:00
Alexander Machehin 938a8a0ad1 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/views/projects/pull_requests/_pull_diff.html.haml
	app/views/projects/wiki/_diff_data.html.haml
2012-10-16 00:19:22 +06:00
Alexander Machehin b9d69a966b [refs #579] add 404 for wrong commit hash 2012-10-13 01:59:14 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Alexander Machehin e379a603b4 [refs #90] get new pull to this project 2012-10-11 00:59:25 +06:00
Alexander Machehin e7cd5f008a Revert "[refs #579] save additional info for pull inline comments"
This reverts commit 0de497c30f15720ae3b2f31c19e7ed2fdc390ad2.

Conflicts:

	app/controllers/projects/comments_controller.rb
2012-10-09 20:15:10 +06:00
Alexander Machehin a5477926bc [refs #579] fix checking path 2012-10-08 21:36:46 +06:00
Alexander Machehin fcfdf1b26b [refs #579] change 'base' & 'head' -> 'to' & 'from' 2012-10-08 21:36:23 +06:00
Alexander Machehin 70e8a1fe0d [refs #579] unless -> if 2012-10-08 21:33:43 +06:00
Alexander Machehin 21b7b0d0b1 [refs #579] dont create wrong comment 2012-10-08 21:31:30 +06:00
Alexander Machehin 3241b7a55a [refs #579] save additional info for pull inline comments 2012-10-08 20:54:36 +06:00
Alexander Machehin 824ee79452 [refs #579] redirect to created comment 2012-10-08 15:20:45 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +06:00
Alexander Machehin 49946f4f53 [refs #90] fix creating a blocked pull 2012-10-05 23:31:06 +06:00
Alexander Machehin 80a91b21a9 [refs #579] fixed bug with new_line access 2012-10-05 18:32:56 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Vokhmin Alexey V ad50934bab #624: fixed downloading RAW files 2012-10-04 01:20:07 +04:00
Vokhmin Alexey V 33209e7200 hotfix for downloading 'tar' archives 2012-10-04 00:27:13 +04:00
Alexander Machehin bf7bc8787a [refs #90] small controller refactoring 2012-10-03 17:59:18 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Alexander Machehin 1d424b463c [refs #90] fix when creating new pull 2012-10-03 09:21:16 +06:00