Commit Graph

111 Commits

Author SHA1 Message Date
Vokhmin Alexey V 0c1698886f #274: fixed NoMethodError: undefined method "id" for nil:NilClass 2013-08-22 17:46:16 +04:00
Alexander Machehin b02e2c0a75 fix showing pull request status 2013-07-27 00:02:00 +06:00
avm 72f933217b Merge pull request #228 from abf/rosa-build:226-remove-API-calls-from-JS
#226: Remove API calls from JS
2013-07-25 13:19:44 +04:00
Alexander Machehin 021d2a03a9 [#234] disable submit buttons 2013-07-25 02:29:28 +06:00
Vokhmin Alexey V 157becb196 #226: removed API calls from JS 2013-07-23 16:29:35 +04:00
Vokhmin Alexey V aadb77cf56 #214: Fixed: Cannot read property from_ref of null 2013-07-18 21:20:22 +04:00
Vokhmin Alexey V 2b423e6a6e #214: some refactoring of JS, added comments 2013-07-15 16:09:31 +04:00
Vokhmin Alexey V fe8e1216c5 #214: remove unnecessary code 2013-07-12 23:27:49 +04:00
Vokhmin Alexey V ffcdd26c66 #214: updated UI of PullRequest#show 2013-07-12 18:21:46 +04:00
Vokhmin Alexey V d747ffd070 #214: updated #branches page, integrated AngularJS 2013-07-11 14:34:44 +04:00
Alexander Machehin eb9ce47723 pull diff small refactoring 2013-06-24 21:03:08 +06:00
Alexander Machehin 30a54e6809 [#98] show in tracker sidebar count only open issues 2013-05-16 15:52:16 +06:00
warpc 1a9ff66f26 Merge pull request #66 from abf/rosa-build:19-gfm
[#19] add members/issues/pull requests/emoji references
2013-04-08 15:33:44 +04:00
Alexander Machehin 914a2967c3 Merge branch 'master' into 19-gfm
Conflicts:
	app/views/projects/issues/_issue.html.haml
2013-04-08 17:04:59 +06:00
Vokhmin Alexey V 2bc580500d #51: Change rights for operations with tags and assignee 2013-04-03 01:23:00 +04:00
Alexander Machehin 1f5f954962 [#19] fixed showing comments 2013-04-01 23:24:19 +06:00
Vokhmin Alexey V 4f40327293 #52: updated JS and rendering discussion in pull_request 2013-03-28 15:04:07 +04:00
Alexander Machehin 70e37925c6 Merge branch 'master' into 19-attach_issue_to_issue
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2013-03-28 00:19:59 +06:00
Alexander Machehin 8f18d0a874 [#19] fix showing discussion in pull requests && small refactoring 2013-03-22 23:17:10 +06:00
Vokhmin Alexey V 9a2fc870cf #37: moved some code into the partial 2013-03-21 15:07:08 +04:00
Vokhmin Alexey V 26c2a26680 #37: update styles, text message 2013-03-21 14:54:47 +04:00
Vokhmin Alexey V 3037520ab5 #37: update text messages 2013-03-21 00:59:25 +04:00
Vokhmin Alexey V 4261e250e8 #37: updated "assigned" for PullRequests 2013-03-21 00:36:22 +04:00
Vokhmin Alexey V a9ab9ab5a6 #37: update text labels 2013-03-20 20:05:37 +04:00
Vokhmin Alexey V 5239be2827 #37: update filter by "Accessory" for PullRequests 2013-03-20 19:22:13 +04:00
Vokhmin Alexey V f6ec81bb35 #37: update UI for "Assignee" Issues and PullRequests 2013-03-20 19:06:25 +04:00
Vokhmin Alexey V 2c56283fba #26: fixed search by substring 2013-03-19 19:30:50 +04: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 c6a0dfee97 [refs #90] fixed orphan pulls 2012-10-28 00:04:28 +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 ecf8e7e5ee [refs #579] fixed wiki & refactoring 2012-10-18 18:51:28 +06:00
Alexander Machehin c6f45956cc [refs #90] fixed error by 24fd99b2d5cab 2012-10-18 18:50:43 +06:00
Alexander Machehin 7870ffef7d [refs #579] fixed some bugs 2012-10-18 00:38:42 +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 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 cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Alexander Machehin ef37180825 [refs #579] small activity refactoring 2012-10-15 22:50:21 +06:00
Alexander Machehin fb1288e382 [refs #579] ugly sorting common pull comments 2012-10-15 22:33:16 +06:00
Alexander Machehin a7a442c4e1 [refs #90] fixed rendering diff 2012-10-15 21:24:29 +06:00
Alexander Machehin 00323cec82 [refs #579] grouped commits 2012-10-15 16:03:35 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +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 f92f209323 [refs #90] fixed changing base project 2012-10-01 23:43:15 +06:00
Alexander Machehin 948e0892bf [refs #90] markdown in create pull 2012-10-01 22:48:26 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Alexander Machehin 9b9295ba4f [refs #90] change ui on create pull 2012-09-28 23:46:02 +06:00