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
|
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 |
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
|
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 |
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 |
Alexander Machehin
|
1d424b463c
|
[refs #90] fix when creating new pull
|
2012-10-03 09:21:16 +06:00 |
Vladimir Sharshov
|
d2c338e4e4
|
Merge pull request #665 from warpc/90-ui
[refs #90] pull request ui + fixes
|
2012-10-02 10:41:06 -07:00 |
Vokhmin Alexey V
|
ecae06db81
|
#349: removed duplicate of ability
|
2012-10-02 21:16:55 +04:00 |
Vokhmin Alexey V
|
cb994c6fd6
|
#349: created autocompletes_controller, refactoring, updated specs
|
2012-10-02 20:54:55 +04:00 |
Alexander Machehin
|
f699add7b4
|
[refs #90] clean ability
|
2012-10-02 22:46:51 +06:00 |
Alexander Machehin
|
b3fd95d7fa
|
[refs #90] always redirect to pull on update action
|
2012-10-02 21:27:15 +06:00 |
Vokhmin Alexey V
|
ba7a7b20a5
|
#349: updated locales, added shared template
|
2012-10-02 19:20:58 +04:00 |
Alexander Machehin
|
53b421d8e5
|
[refs #90] fixed pull ability for project writers & changing tests
|
2012-10-02 21:19:50 +06:00 |
Vokhmin Alexey V
|
c7fda1a810
|
#349: updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page
|
2012-10-02 19:14:08 +04:00 |
Alexander Machehin
|
f66f80c128
|
Merge branch 'master' into 90-ui
Conflicts:
spec/controllers/projects/pull_requests_controller_spec.rb
|
2012-10-02 19:43:23 +06:00 |
Alexander Machehin
|
d36155ec7f
|
[refs #90] remove useless abilities
|
2012-10-02 19:24:53 +06:00 |
Vokhmin Alexey V
|
ffe38b0a08
|
#349: updated Users::ProfileController and Groups::ProfileController
|
2012-10-02 16:04:26 +04:00 |
Alexander Machehin
|
35c965a796
|
[refs #90] add all ancestors to base project choise
|
2012-10-02 15:20:48 +06:00 |
Alexander Machehin
|
d948949532
|
[refs #90] new pull optimization
|
2012-10-02 15:14:31 +06:00 |
Vladimir Sharshov
|
226f1b592c
|
Merge pull request #663 from warpc/90-add-specs-for-pull-requests
[refs #90]: add specs for pull requests
|
2012-10-01 11:12:01 -07:00 |
Alexander Machehin
|
8f011316c3
|
[refs #90] possible fix for nil commom ancestor commit
|
2012-10-01 23:52:18 +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 |
Vokhmin Alexey V
|
3271fd8479
|
#658: small refactoring
|
2012-10-01 17:33:46 +04:00 |
Vokhmin Alexey V
|
234615d728
|
#658: added link to notification center in email
|
2012-10-01 17:08:02 +04:00 |
Vokhmin Alexey V
|
c4e974a89e
|
Merge branch 'master' into 90-add-specs-for-pull-requests
|
2012-10-01 15:42:06 +04:00 |
Alexander Machehin
|
9b9295ba4f
|
[refs #90] change ui on create pull
|
2012-09-28 23:46:02 +06:00 |
Alexander Machehin
|
90069b2fb6
|
[#refs #90] fix pull flashes
|
2012-09-28 23:45:27 +06:00 |
Alexander Machehin
|
64ee8b6845
|
[refs #90] change pull header
|
2012-09-28 21:49:10 +06:00 |
Alexander Machehin
|
fbc537174e
|
[refs #90] search base project by fullname
|
2012-09-28 21:39:45 +06:00 |
Vokhmin Alexey V
|
fb8d1ded5f
|
#90: added some specs for pull requests
|
2012-09-28 19:08:51 +04: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 |
Vladimir Sharshov
|
847ecc2a15
|
[refs #374] Remove unused data from build list api
|
2012-09-28 14:38:01 +04:00 |
Vokhmin Alexey V
|
e310f5607c
|
#90: removed unnecessary code
|
2012-09-27 23:30:59 +04:00 |