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 |
|
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
|
4c02d4be19
|
[refs #90] fixed error
|
2012-08-08 16:33:48 +06:00 |
|
Alexander Machehin
|
0ddb960b8b
|
[refs #90] remove commits from pull refs
|
2012-08-08 00:23:17 +06:00 |
|
Alexander Machehin
|
edf882f2a1
|
[refs #90] remove unneeded method
|
2012-08-08 00:17:10 +06:00 |
|
Alexander Machehin
|
5cb1f4e7e9
|
[refs #90] small delegate refactoring
|
2012-08-08 00:08:02 +06:00 |
|
Alexander Machehin
|
6225410720
|
[refs #90] enable check for uniq pull requests
|
2012-08-08 00:06:49 +06:00 |
|
Alexander Machehin
|
37a0b4efe8
|
[refs #90] fixed error with / in branch name
|
2012-08-07 23:40:40 +06:00 |
|
Alexander Machehin
|
2a6b08c269
|
[refs #90] fixed error with wrong treeish
|
2012-08-07 22:24:47 +06:00 |
|
Alexander Machehin
|
35642102dd
|
[refs #90] fixed show merge button
|
2012-08-07 19:25:08 +06:00 |
|
Alexander Machehin
|
be6179b2ad
|
[refs #90] clean comment
|
2012-08-07 00:24:31 +06:00 |
|
Alexander Machehin
|
02214dda09
|
[refs #90] fixed merge with master
|
2012-08-07 00:17:04 +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
|
26617b7739
|
[refs #90] add close/reopen button
|
2012-07-12 20:15:28 +06:00 |