Vokhmin Alexey V
|
37b5f710c2
|
#349: added new specs for anonymous_access
|
2012-10-02 19:32:13 +04: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
|
8d8aaa9e3b
|
#349: updated specs for groups/profile_controller
|
2012-10-02 16:14:43 +04:00 |
|
Vokhmin Alexey V
|
cfde461521
|
#349: updated specs for users/profile_controller
|
2012-10-02 16:07:46 +04: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 |
|
Alexander Machehin
|
e76f9e56a7
|
[refs #90] fixed pull tests
|
2012-10-02 14:51:14 +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 |
|
Vokhmin Alexey V
|
6bc3c4b9a8
|
#90: updated redhillonrails_core gem
|
2012-10-01 22:09:59 +04: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 |
|
Vladimir Sharshov
|
0369f912a4
|
Merge pull request #664 from warpc/658-add-link-to-notification-center-in-emails
[refs #658]: add link to notification center in emails
|
2012-10-01 06:35:16 -07: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
|
96165b9e87
|
#90: fixed specs for pull request model
|
2012-10-01 16:29:36 +04:00 |
|
Vokhmin Alexey V
|
c4e974a89e
|
Merge branch 'master' into 90-add-specs-for-pull-requests
|
2012-10-01 15:42:06 +04:00 |
|
Vokhmin Alexey V
|
aa9779dabe
|
#90: renamed shared_example
|
2012-10-01 15:40:52 +04:00 |
|
Vokhmin Alexey V
|
ea9baa4972
|
#90: updated specs for pull requests
|
2012-10-01 15:32:40 +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
|
e7549635f0
|
[refs #90] change translation
|
2012-09-28 23:44:26 +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 |
|
Vladimir Sharshov
|
3d080404e7
|
Merge pull request #662 from warpc/90-create-discussion-in-the-pull-requests-like-github
[refs #90]: create discussion in the pull requests like github
|
2012-09-28 02:43:26 -07:00 |
|
Vladimir Sharshov
|
7756f6200d
|
[refs #374] Add http headers for rate limit, restrict rate limit only for api calls.
|
2012-09-28 01:07:19 +04:00 |
|
Vokhmin Alexey V
|
e310f5607c
|
#90: removed unnecessary code
|
2012-09-27 23:30:59 +04:00 |
|
Vokhmin Alexey V
|
7e09f17b58
|
Merge branch 'master' into 90-create-discussion-in-the-pull-requests-like-github
|
2012-09-27 22:37:54 +04:00 |
|
Vladimir Sharshov
|
de21c6142b
|
Merge pull request #544 from warpc/90-pull
[refs #90] Pull request
|
2012-09-27 11:21:21 -07:00 |
|
Alexander Machehin
|
abafbc6ef5
|
Merge again-and-again branch 'master' into 90-pull
Conflicts:
db/schema.rb
|
2012-09-28 00:09:34 +06:00 |
|
Alexander Machehin
|
f579fc007a
|
[refs #90] fixed ability for pulls
|
2012-09-28 00:00:04 +06:00 |
|
Vokhmin Alexey V
|
bd04e8ea75
|
#90: revert changes in the controller
|
2012-09-27 21:54:40 +04:00 |
|
Vokhmin Alexey V
|
dfada7a270
|
#90: fixed NoMethodError on #show page for guest
|
2012-09-27 21:21:10 +04:00 |
|
Vokhmin Alexey V
|
3fdca32e0e
|
#90: updated styles
|
2012-09-27 20:59:48 +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
|
2b4e2f03e5
|
Merge pull request #585 from warpc/374-rest_api_for_builds
[refs #374] Add json responses for build lists api
|
2012-09-27 07:00:19 -07:00 |
|
Vladimir Sharshov
|
223aa33604
|
[refs #374] Add info about API doc site
|
2012-09-27 17:55:16 +04:00 |
|
Vladimir Sharshov
|
7c4c855341
|
[refs #374] Small refactoring
|
2012-09-27 17:41:02 +04:00 |