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
|
ba74024b29
|
fixed order of the handle exceptions
|
2012-10-25 15:42:47 +06:00 |
Vokhmin Alexey V
|
05f16c1d13
|
#709: updated controller and view for fixing undefined local variable or method 'project_counter'
|
2012-10-22 12:26:00 +04:00 |
Vladimir Sharshov
|
daefb27f95
|
Merge pull request #707 from warpc/706-get-list-of-projects-by-repository
[refs #706:] REST API repository: list of repository projects.
|
2012-10-19 09:10:06 -07:00 |
Vokhmin Alexey V
|
25620af00c
|
hot fix for specs
|
2012-10-19 19:35:19 +04:00 |
Vokhmin Alexey V
|
e9fd2a2df6
|
Merge branch 'master' into 706-get-list-of-projects-by-repository
|
2012-10-19 18:51:11 +04:00 |
Vokhmin Alexey V
|
ba968cc5a0
|
#706: updated Ability model, Repositories controller, added specs
|
2012-10-19 18:49:01 +04:00 |
Vladimir Sharshov
|
00e92d9672
|
Merge pull request #678 from warpc/579-code_line_comments
[refs #579] code line comments
|
2012-10-19 07:48:50 -07:00 |
Vokhmin Alexey V
|
18ac16ae96
|
#698: small refactoring, added ckeck for main platform
|
2012-10-19 18:03:09 +04:00 |
Vokhmin Alexey V
|
b9f1835d1c
|
Merge branch 'master' into 698-rest-api-for-advisories
|
2012-10-19 17:58:38 +04:00 |
Vokhmin Alexey V
|
4680e9c62c
|
#706: added #projects action to Repositories API
|
2012-10-19 17:52:36 +04:00 |
Alexander Machehin
|
6c8c1ca880
|
Merge branch 'master' into 579-code_line_comments
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-10-19 18:47:26 +06:00 |
Vokhmin Alexey V
|
d563c9a9f9
|
#702: added handling errors
|
2012-10-19 15:47:49 +04:00 |
Vokhmin Alexey V
|
0cf0933074
|
#698:small refactoring
|
2012-10-19 11:32:12 +04:00 |
Vokhmin Alexey V
|
5cf69bff92
|
#698: renamed method
|
2012-10-18 20:36:29 +04:00 |
Vokhmin Alexey V
|
8bbb82faa8
|
#698: updated Advisories API
|
2012-10-18 20:25:24 +04:00 |
Vokhmin Alexey V
|
84e5f3ead3
|
#698: updated specs, permission access
|
2012-10-18 19:44:28 +04:00 |
Vokhmin Alexey V
|
d5ad5b1a95
|
Merge branch 'master' into 698-rest-api-for-advisories
|
2012-10-18 18:59:00 +04:00 |
Vokhmin Alexey V
|
a3252594b8
|
#698: fixed #index action in Advisories controller
|
2012-10-18 18:32:43 +04:00 |
Vokhmin Alexey V
|
68dbae8c83
|
#698: added #create and #fork actions for Advisories API
|
2012-10-18 18:17:50 +04: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 |
Vokhmin Alexey V
|
b7eff22c23
|
#698: added API for Advisories
|
2012-10-18 15:22:31 +04:00 |
Vokhmin Alexey V
|
97590f06a0
|
#686: added specs for projects API
|
2012-10-17 21:08:21 +04:00 |
Vokhmin Alexey V
|
6680265c64
|
#686: some refactoring of relations
|
2012-10-17 17:46:16 +04:00 |
Vokhmin Alexey V
|
2d067a45ca
|
#686: added members action for project API
|
2012-10-17 16:18:52 +04:00 |
Vokhmin Alexey V
|
351821912b
|
#686: added API for show list of projects
|
2012-10-17 14:35:33 +04:00 |
Vokhmin Alexey V
|
f0caf6a9f9
|
#692: updated groups/profile_controller
|
2012-10-16 20:38:49 +04:00 |
Vokhmin Alexey V
|
e5af275c3a
|
#692: small refactoring according to Alexander's comments
|
2012-10-16 20:36:59 +04:00 |
Vokhmin Alexey V
|
432e219571
|
#692: some refactoring
|
2012-10-16 17:42:52 +04:00 |
Alexander Machehin
|
f060d919d9
|
[refs #579] add new helper
|
2012-10-16 19:20:55 +06:00 |
Vokhmin Alexey V
|
df105efd56
|
#692: added #update_member action for Groups API
|
2012-10-16 17:03:18 +04:00 |
Vokhmin Alexey V
|
5795e1cea5
|
#692: updated API
|
2012-10-16 16:35:30 +04:00 |
Vokhmin Alexey V
|
d99a2104ce
|
#692:added index action for Groups API
|
2012-10-16 15:49:07 +04:00 |
Alexander Machehin
|
9579734506
|
[refs #579] some optimization by getting pull repo
|
2012-10-16 16:19:53 +06:00 |
Alexander Machehin
|
b0604f89d1
|
[refs #579] move logick to model
|
2012-10-16 15:50:21 +06:00 |
Vokhmin Alexey V
|
888cbe445e
|
#691: small refactoring
|
2012-10-15 22:30:06 +04: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 |
Vokhmin Alexey V
|
6aef7cfb30
|
#691: revert base controller
|
2012-10-15 19:49:52 +04:00 |
Vokhmin Alexey V
|
f3605a1211
|
#691: updated routes according to Vladimir's comments
|
2012-10-15 19:47:42 +04:00 |
Vokhmin Alexey V
|
5aa5bbc0b8
|
#691: small refactoring
|
2012-10-15 18:50:58 +04:00 |
Vokhmin Alexey V
|
84b49052b1
|
#691: added specs for Users API
|
2012-10-15 18:43:09 +04:00 |
Vokhmin Alexey V
|
0879a7e46f
|
#691: added #notifiers and #update actions for Users API
|
2012-10-15 18:06:08 +04:00 |
Vokhmin Alexey V
|
2ae671df21
|
Merge branch 'master' into 691-rest-api-for-users
|
2012-10-15 17:03:05 +04:00 |
Vokhmin Alexey V
|
9087a15627
|
#672: small refactoring Api::V1::BaseController#member method
|
2012-10-15 14:07:10 +04:00 |
Vokhmin Alexey V
|
5d9a1e2586
|
#672: removed API helper
|
2012-10-15 13:48:25 +04:00 |
Vokhmin Alexey V
|
e50bd3a2b5
|
#691: added #show action for Users API
|
2012-10-15 13:45:00 +04:00 |