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 |
Vokhmin Alexey V
|
dfada7a270
|
#90: fixed NoMethodError on #show page for guest
|
2012-09-27 21:21:10 +04:00 |
Vokhmin Alexey V
|
da006871ba
|
#90: small refactoring, moved views
|
2012-09-27 20:32:28 +04:00 |
Vokhmin Alexey V
|
f41aaecd72
|
#90: added commits and comments for commits to pull-request discussion
|
2012-09-27 19:40:19 +04:00 |
Alexander Machehin
|
a994e7dd74
|
Merge remote-tracking branch 'origin/90-pull' into 90-pull
|
2012-09-26 23:10:45 +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
|
0ebc545b01
|
#90: small refactoring of views
|
2012-09-26 19:16:34 +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
|
eba6a14e0b
|
[refs #90] very small refactoring
|
2012-09-26 15:27:24 +06:00 |
Vokhmin Alexey V
|
397d411252
|
#90: added #index action, updated routes
|
2012-09-26 00:50:40 +04:00 |
Alexander Machehin
|
dfbf8a8d58
|
Merge branch 'master' into 90-pull
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
|
2012-09-25 17:55:30 +06:00 |
Alexander Machehin
|
c1c9f9680e
|
[refs #90] remove code duplication
|
2012-08-10 22:40:09 +06:00 |
Alexander Machehin
|
ec7d132a3f
|
[refs #90] fixed update commits button
|
2012-08-08 23:57:03 +06:00 |
Alexander Machehin
|
9bf2f728a7
|
[refs #90] change new action from post to get
|
2012-08-08 23:21:49 +06:00 |
Alexander Machehin
|
910aac939e
|
[refs #90] fixed changing tabs & anchors
|
2012-08-08 21:47:58 +06:00 |
Alexander Machehin
|
35642102dd
|
[refs #90] fixed show merge button
|
2012-08-07 19:25:08 +06:00 |
Alexander Machehin
|
fb66b74019
|
[refs #90] fixed pull abilities
|
2012-08-07 00:12:15 +06:00 |
Alexander Machehin
|
6c11597de6
|
Merge branch 'master' into 90-pull
|
2012-07-30 16:53:59 +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
|
35b953ac11
|
[refs #90] add commit/pull lines ref
|
2012-07-19 22:42:37 +06:00 |
Alexander Machehin
|
b24a4a35b2
|
[refs #90] modify pull tab urls
|
2012-07-19 00:02:27 +06:00 |
Alexander Machehin
|
966368a660
|
[refs #90] show same title and body for issues and pulls
|
2012-07-17 16:50:40 +06:00 |
Alexander Machehin
|
5b4c9b0948
|
[refs #90] remove reduntant information
|
2012-07-16 23:38:45 +06:00 |
Alexander Machehin
|
b903969aa6
|
[refs #90] changed displaying status message
|
2012-07-16 23:02:04 +06:00 |
Alexander Machehin
|
34e97510cd
|
[refs #90] modify pull headers
|
2012-07-16 22:27:41 +06:00 |
Alexander Machehin
|
56db0fffd0
|
[refs #90] small refactoring
|
2012-07-16 14:46: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 |
Alexander Machehin
|
07e02d9a17
|
[refs #90] modified Update commits button
|
2012-07-10 00:41:39 +06:00 |
Alexander Machehin
|
dd221cc880
|
[refs #90] autocomplete
|
2012-07-06 23:30:01 +06:00 |
Alexander Machehin
|
9b41fd50af
|
[refs #90] fixed translation of titles & headers
|
2012-06-26 15:40:37 +06:00 |
Alexander Machehin
|
6aa9cfaa50
|
[refs #90] view pull status
|
2012-06-25 22:04:43 +06:00 |
Alexander Machehin
|
682f33a9bf
|
[refs #90] view merged status
|
2012-06-13 23:52:11 +06:00 |
Alexander Machehin
|
724868e495
|
[refs #90] fixed view with #repo-wrapper
|
2012-06-08 14:28:23 +06:00 |
Alexander Machehin
|
bf11afca4c
|
[refs #90] fixed diff view
|
2012-06-08 13:53:30 +06:00 |
Alexander Machehin
|
5f50bacbe6
|
[refs #90] some refactoring with rtruncate method
|
2012-06-08 13:38:24 +06:00 |
Alexander Machehin
|
62128d2c72
|
[refs #90] change diff anchors to digits
|
2012-06-08 01:20:06 +06:00 |
Alexander Machehin
|
0b9c0fdd07
|
[refs #90] fixed rendering file rename
|
2012-06-08 01:19:18 +06:00 |
Alexander Machehin
|
8fadbf2d41
|
[refs #90] rewrite diff
|
2012-06-07 23:23:28 +06:00 |
Alexander Machehin
|
614691a737
|
[refs #90] removed index action
|
2012-06-05 18:10:51 +06:00 |
Alexander Machehin
|
91bf65d65d
|
[refs #90] comments for pull requests (slow version)
|
2012-06-05 18:08:52 +06:00 |
Alexander Machehin
|
8ed8e10cd6
|
[refs #90] moved update form lower
|
2012-05-31 23:30:10 +06:00 |
Alexander Machehin
|
60aba754ae
|
[refs #90] pull title/body update
|
2012-05-31 22:57:52 +06:00 |
Alexander Machehin
|
3c3448e26f
|
[refs #90] new/show views refactoring
|
2012-05-31 17:16:54 +06:00 |
Alexander Machehin
|
26baf999f4
|
[refs #90] diff stats
|
2012-05-29 23:09:43 +06:00 |
Alexander Machehin
|
11c67fb07d
|
Revert "[refs #90] issue status -> state" & changed state -> status
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
|
2012-05-29 16:50:25 +06:00 |
Alexander Machehin
|
df610931d7
|
[refs #90] commits tab
|
2012-05-25 16:48:44 +06:00 |
Alexander Machehin
|
4f1d23a2a4
|
[refs #90] branch, merge validation
|
2012-05-24 23:10:49 +06:00 |
Alexander Machehin
|
d643bb3cd0
|
[refs #90] try to prevent create same pull
|
2012-05-21 19:24:16 +06:00 |
Alexander Machehin
|
74aee232f9
|
[refs #90] some fixes and merge button
|
2012-05-17 22:49:29 +06:00 |
Alexander Machehin
|
f96990bd25
|
[refs #90] change view
|
2012-05-16 22:50:30 +06:00 |
Alexander Machehin
|
ff016efe1c
|
[refs #90] choose project
|
2012-05-14 23:09:18 +06:00 |
Alexander Machehin
|
3e0ebdc929
|
[refs #90] change route
|
2012-05-10 22:57:59 +06:00 |
Alexander Machehin
|
4040a486fe
|
[refs #90] fix diff
|
2012-05-10 18:32:54 +06:00 |
Alexander Machehin
|
381ae0a8b9
|
[refs #90] diff - dont work
|
2012-05-05 22:57:12 +06:00 |
Alexander Machehin
|
813afe53cf
|
[refs #90] minor interface changes
|
2012-05-04 23:13:41 +06:00 |
Alexander Machehin
|
c5731ff8dd
|
[refs #90] fixed merging errors
|
2012-05-04 16:56:11 +06:00 |
Alexander Machehin
|
178dbdc5f0
|
[refs #90] move files
|
2012-05-03 23:55:08 +06:00 |