Vokhmin Alexey V
|
abe31b3c2e
|
#671: added API #update action for platform
|
2012-10-09 18:46:20 +04:00 |
Alexander Machehin
|
e7cd5f008a
|
Revert "[refs #579] save additional info for pull inline comments"
This reverts commit 0de497c30f15720ae3b2f31c19e7ed2fdc390ad2.
Conflicts:
app/controllers/projects/comments_controller.rb
|
2012-10-09 20:15:10 +06:00 |
Vladimir Sharshov
|
32dca22298
|
Merge pull request #679 from warpc/hot-fix-for-api
[refs #679] Fix access for platforms_for_build; fix repositories for show and index.
|
2012-10-09 07:03:05 -07:00 |
Vokhmin Alexey V
|
07bf8f1d0f
|
fixed missprint
|
2012-10-09 17:54:17 +04:00 |
Vokhmin Alexey V
|
1e2d41b183
|
updated Ability model
|
2012-10-09 17:50:09 +04:00 |
Vokhmin Alexey V
|
d83243a3a3
|
hot fix for API
|
2012-10-09 17:47:05 +04:00 |
Vladimir Sharshov
|
f4348db614
|
Merge pull request #677 from warpc/374-update-api-for-projects
[refs #374] add necessary api calls to close projects builds
|
2012-10-08 11:08:23 -07:00 |
Vokhmin Alexey V
|
feefe8ed89
|
#374: added #platforms_for_build action for Platforms API
|
2012-10-08 22:02:44 +04:00 |
Alexander Machehin
|
17e7faff3d
|
Merge branch 'master' into 579-code_line_comments
|
2012-10-08 21:46:26 +06:00 |
Alexander Machehin
|
a5477926bc
|
[refs #579] fix checking path
|
2012-10-08 21:36:46 +06:00 |
Alexander Machehin
|
fcfdf1b26b
|
[refs #579] change 'base' & 'head' -> 'to' & 'from'
|
2012-10-08 21:36:23 +06:00 |
Alexander Machehin
|
70e8a1fe0d
|
[refs #579] unless -> if
|
2012-10-08 21:33:43 +06:00 |
Alexander Machehin
|
21b7b0d0b1
|
[refs #579] dont create wrong comment
|
2012-10-08 21:31:30 +06:00 |
Alexander Machehin
|
3241b7a55a
|
[refs #579] save additional info for pull inline comments
|
2012-10-08 20:54:36 +06:00 |
Alexander Machehin
|
694037af7e
|
[refs #579] remove unused lib
|
2012-10-08 20:47:03 +06:00 |
Alexander Machehin
|
548f698526
|
[refs #579] add a line comment button
|
2012-10-08 20:42:38 +06:00 |
Vokhmin Alexey V
|
ec0ec5fc32
|
#374: revert some changes
|
2012-10-08 17:37:09 +04:00 |
Vokhmin Alexey V
|
b1a9e2aa21
|
#374: updated api for projects
|
2012-10-08 16:47:02 +04:00 |
Alexander Machehin
|
824ee79452
|
[refs #579] redirect to created comment
|
2012-10-08 15:20:45 +06:00 |
Alexander Machehin
|
f12634cee8
|
[refs #579] add link to comments
|
2012-10-08 15:14:31 +06:00 |
Vladimir Sharshov
|
1bf0f07297
|
Merge pull request #676 from warpc/90-pull-fixes
[refs #90] fix creating & updating pulls
|
2012-10-05 12:51:30 -07:00 |
Alexander Machehin
|
ed7aec602f
|
[refs #579] alpha version of the pull inline comments
|
2012-10-06 01:19:05 +06:00 |
Alexander Machehin
|
3513d47be6
|
[refs #90] fix updating pull
|
2012-10-05 23:32:29 +06:00 |
Alexander Machehin
|
49946f4f53
|
[refs #90] fix creating a blocked pull
|
2012-10-05 23:31:06 +06:00 |
Alexander Machehin
|
80a91b21a9
|
[refs #579] fixed bug with new_line access
|
2012-10-05 18:32:56 +06:00 |
Alexander Machehin
|
2360a25a42
|
[refs #579] fixed many errors
|
2012-10-05 17:02:25 +06:00 |
Alexander Machehin
|
afa6dd0706
|
[refs #579] fixed style
|
2012-10-05 15:39:07 +06:00 |
Alexander Machehin
|
1bc76a7f18
|
[refs #579] fresh schema
|
2012-10-05 15:34:55 +06:00 |
Alexander Machehin
|
e085784d51
|
Merge branch 'master' into 579-code_line_comments
Conflicts:
app/assets/stylesheets/design/custom.scss
app/helpers/diff_helper.rb
app/models/ability.rb
app/views/projects/comments/_list.html.haml
app/views/projects/git/commits/_commit_diff.html.haml
lib/ext/git/inline_callback.rb
|
2012-10-05 15:32:29 +06:00 |
Alexander Machehin
|
a24ea9a4b1
|
[refs #579] fixed & refactoring markdown help
|
2012-10-05 14:16:27 +06:00 |
Alexander Machehin
|
21a5115137
|
[refs #579] fixed destroing comments
|
2012-10-05 12:13:14 +06:00 |
Alexander Machehin
|
527dd210bf
|
[refs #579] alpha version of inline comments for commit
|
2012-10-05 00:40:12 +06:00 |
Vladimir Sharshov
|
2d7f4de3b5
|
Merge pull request #675 from warpc/671-rest-api-for-plastforms
[refs #671]: REST API fo build task: elimination of discrepancies compared with the documentation
|
2012-10-04 08:54:49 -07:00 |
Vokhmin Alexey V
|
3e8664d157
|
#671: fixed comments
|
2012-10-04 19:50:20 +04:00 |
Vokhmin Alexey V
|
b3123a752e
|
#671: updated build list api
|
2012-10-04 19:38:33 +04:00 |
Vokhmin Alexey V
|
21a0d982f1
|
#671: updated arch field in json for build_lists API
|
2012-10-04 19:30:31 +04:00 |
Vokhmin Alexey V
|
910c79c4b3
|
#671: added specs for filter by type
|
2012-10-04 19:20:10 +04:00 |
Vokhmin Alexey V
|
f5d0d9f20b
|
#671: added filter platforms by type
|
2012-10-04 17:34:30 +04:00 |
Vokhmin Alexey V
|
df0251282d
|
#671: updated API arches controller, added specs
|
2012-10-04 17:13:55 +04:00 |
Vokhmin Alexey V
|
4b72501159
|
#671: added Architectures API
|
2012-10-04 16:45:49 +04:00 |
Vladimir Sharshov
|
f10640695e
|
Merge pull request #670 from warpc/624-wrong-files-on-raw-downloading
[refs #624]: Fixed downloading RAW files
|
2012-10-04 02:44:14 -07:00 |
Vokhmin Alexey V
|
ad50934bab
|
#624: fixed downloading RAW files
|
2012-10-04 01:20:07 +04:00 |
Vladimir Sharshov
|
ca697c0c4b
|
Merge pull request #669 from warpc/668-create-uploading-avatar-for-group
[refs #668]: Ability to upload avatar for group
|
2012-10-03 13:29:28 -07:00 |
Vokhmin Alexey V
|
33209e7200
|
hotfix for downloading 'tar' archives
|
2012-10-04 00:27:13 +04:00 |
Vokhmin Alexey V
|
04b2647ef0
|
#668: added uploading avatars for groups
|
2012-10-03 20:38:42 +04:00 |
Vladimir Sharshov
|
fb80764a74
|
Merge pull request #667 from warpc/90-refactoring
[refs #90] refactoring pull request:
* base_project -> to_project;
* base_ref -> to_ref.
|
2012-10-03 07:08:39 -07:00 |
Alexander Machehin
|
47046fdd7c
|
[refs #90] fixed migration for ActiveRecord::IrreversibleMigration
|
2012-10-03 19:00:09 +06:00 |
Alexander Machehin
|
5bc59ad365
|
[refs #90] fixed pull tests
|
2012-10-03 18:18:02 +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 |