Commit Graph

81 Commits

Author SHA1 Message Date
Alexander Machehin 43d1c29d46 fix RegexpError: premature end of char-class 2012-12-25 15:46:07 +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
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 9579734506 [refs #579] some optimization by getting pull repo 2012-10-16 16:19:53 +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 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin e379a603b4 [refs #90] get new pull to this project 2012-10-11 00:59:25 +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 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
Alexander Machehin b3fd95d7fa [refs #90] always redirect to pull on update action 2012-10-02 21:27:15 +06:00
Alexander Machehin 53b421d8e5 [refs #90] fixed pull ability for project writers & changing tests 2012-10-02 21:19:50 +06:00
Alexander Machehin 35c965a796 [refs #90] add all ancestors to base project choise 2012-10-02 15:20:48 +06:00
Alexander Machehin d948949532 [refs #90] new pull optimization 2012-10-02 15:14:31 +06:00
Alexander Machehin f92f209323 [refs #90] fixed changing base project 2012-10-01 23:43:15 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Alexander Machehin 90069b2fb6 [#refs #90] fix pull flashes 2012-09-28 23:45:27 +06:00
Alexander Machehin fbc537174e [refs #90] search base project by fullname 2012-09-28 21:39:45 +06:00
Alexander Machehin a994e7dd74 Merge remote-tracking branch 'origin/90-pull' into 90-pull 2012-09-26 23:10:45 +06:00
Alexander Machehin 4100b875bd [refs #90] fixed access 2012-09-26 23:10:04 +06:00
Alexander Machehin cc05fa695a [refs #90] fixed pull abilities part 2 2012-09-26 23:09:29 +06:00
Vokhmin Alexey V 37fbb4632e #90: updated branch 2012-09-26 21:04:12 +04:00
Vokhmin Alexey V 613db04375 #90: added limit for commits into the pull request 2012-09-26 21:00:58 +04:00
Vokhmin Alexey V 6f889b15a9 #90: added access to show pull requests 2012-09-26 19:39:47 +04:00
Vokhmin Alexey V 37c9a906c4 Merge branch '90-pull' into 90-separate-issues-and-pull-requests 2012-09-26 18:45:26 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
Alexander Machehin dbf1a5f8ca Merge remote-tracking branch 'origin/90-pull' into 90-pull 2012-09-26 15:27:54 +06:00
Alexander Machehin 3491492c8d [refs #90] fixed pull authorization 2012-09-26 15:24:46 +06:00
Vokhmin Alexey V 397d411252 #90: added #index action, updated routes 2012-09-26 00:50:40 +04:00
Vokhmin Alexey V 0299c069c6 #90: style changes for header, increase performanse for #autocomplete_base_project action 2012-09-25 19:18:22 +04:00
Alexander Machehin c1c9f9680e [refs #90] remove code duplication 2012-08-10 22:40:09 +06:00
Alexander Machehin 1d5470b7d6 [refs #90] small fixes 2012-08-09 23:56:55 +06:00
Alexander Machehin edf882f2a1 [refs #90] remove unneeded method 2012-08-08 00:17:10 +06:00
Alexander Machehin 6225410720 [refs #90] enable check for uniq pull requests 2012-08-08 00:06:49 +06:00
Alexander Machehin 61b02ce1e8 [refs #90] fixed error on create 2012-08-08 00:05:43 +06:00
Alexander Machehin e97c3dc645 [refs #90] small controller refactor 2012-08-07 22:34:22 +06:00
Alexander Machehin 2a6b08c269 [refs #90] fixed error with wrong treeish 2012-08-07 22:24:47 +06:00
Alexander Machehin fb66b74019 [refs #90] fixed pull abilities 2012-08-07 00:12:15 +06:00
Alexander Machehin 25bdbb01d6 [refs #90] project fullname 2012-07-27 18:52:31 +06:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
Alexander Machehin 2feb03601b [refs #90] fixed authorize of the merge action 2012-07-16 22:35:44 +06:00
Alexander Machehin 26617b7739 [refs #90] add close/reopen button 2012-07-12 20:15:28 +06:00
Alexander Machehin 3290adb0b1 [refs #90] fixed merge ability 2012-07-10 22:58:39 +06:00