Commit Graph

114 Commits

Author SHA1 Message Date
Vokhmin Alexey V acd57203c7 #435: display statistics by issues and pull-requests 2014-10-20 23:18:34 +04:00
Alexander Machehin f3e6347fda small optimize 2014-08-28 23:13:38 +06:00
Alexander Machehin bf0a31dcdc fix TypeError: Cannot visit Project 2014-08-28 20:53:04 +06:00
Alexander Machehin b20fa2bbc2 [#399] smarter selection of target project for pull requests 2014-06-10 17:31:15 +06:00
Alexander Machehin 718c8bb08c [#345] remove url_for hack 2014-03-13 22:35:00 +06:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Vokhmin Alexey V 157becb196 #226: removed API calls from JS 2013-07-23 16:29:35 +04:00
Alexander Machehin 854f324627 redirect from issue to pull request and vice versa 2013-07-22 22:54:59 +06:00
Vokhmin Alexey V c79fbbd2d5 Merge branch 'master' into 214-delete-and-restore-branches 2013-07-13 00:31:52 +04:00
Vokhmin Alexey V fe8e1216c5 #214: remove unnecessary code 2013-07-12 23:27:49 +04:00
Alexander Machehin 38ced2c998 [#200] fix dublication messages & activity after creating pull request 2013-07-10 01:55:43 +06:00
Alexander Machehin 8e189821bd remove extra pull check 2013-06-24 21:18:52 +06:00
Alexander Machehin 926c4d604d [#105] restore deleted code in error 2013-06-21 19:49:12 +06:00
Alexander Machehin 20056fbc31 many issue/pull fixes 2013-06-19 02:00:01 +06:00
Vokhmin Alexey V 38ce6115c2 #73: merge master into branch 2013-04-08 22:55:21 +04:00
Vokhmin Alexey V 179615f5b7 #73: create #by_owner_and_name scope 2013-04-04 17:33:11 +04:00
Vokhmin Alexey V 110499360b #73: small refactoring 2013-04-04 01:18:56 +04:00
Vokhmin Alexey V 9dcd08b868 #73: add owner_uname into Project 2013-04-04 01:06:13 +04:00
Vokhmin Alexey V 62ff6312b4 #73: Increatse performance for #autocomplete_to_project action 2013-04-03 20:03:52 +04:00
Vokhmin Alexey V 9e7eb7af94 #29: merge master into branch 2013-04-03 16:10:22 +04:00
Vokhmin Alexey V 6585c3a92b #51: move logic to controller 2013-04-03 13:59:34 +04:00
Vokhmin Alexey V 8b6a0eab0f #51: some refactoring 2013-04-03 01:59:33 +04:00
Vokhmin Alexey V 8e21159314 #37: some styles changes 2013-03-22 01:20:36 +04:00
Vokhmin Alexey V c3a9246d09 #37: fix for assignee User to PullRequest 2013-03-21 00:46:33 +04:00
Vokhmin Alexey V 5239be2827 #37: update filter by "Accessory" for PullRequests 2013-03-20 19:22:13 +04:00
Vokhmin Alexey V a92df70c5e #26: update 'font-size' for issue-title, increase count of issues on page 2013-03-20 01:30:35 +04:00
Vokhmin Alexey V 2c56283fba #26: fixed search by substring 2013-03-19 19:30:50 +04:00
Vokhmin Alexey V f8fb48a85b #26: remove unnecessary stiles, JS, update PullRequests controller 2013-03-19 16:11:02 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 6c00085c84 change default base branch on create pull request 2013-03-07 18:22:48 +06:00
Vokhmin Alexey V 69d384412e #899: update #init_statistics method, refactoring 2013-02-15 15:57:00 +04:00
Alexander Machehin 8860238da4 [refs #878] fix some bugs when no master branch 2013-01-31 22:26:49 +06:00
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