Alexander Machehin
7f031ac688
[refs #374 ] added commit validation
2012-10-11 22:11:53 +06:00
Vokhmin Alexey V
6b3bf41c7a
#671 : removed before_filter
2012-10-11 19:36:14 +04:00
Vokhmin Alexey V
992892f2c8
#671 : small refactoring
2012-10-11 19:18:54 +04:00
Alexander Machehin
a7bb5f48ba
[refs #90 ] fixed wiki diff
2012-10-11 01:16:47 +06:00
Alexander Machehin
e379a603b4
[refs #90 ] get new pull to this project
2012-10-11 00:59:25 +06:00
Vokhmin Alexey V
05d222e9de
#671 : updated output errors
2012-10-10 21:51:00 +04:00
Vokhmin Alexey V
eef640e82c
#671 : added API Platforms#create action, updated specs, added validation to platform model
2012-10-10 21:45:56 +04:00
Vokhmin Alexey V
919459617a
#671 : small refactoring
2012-10-10 20:31:22 +04:00
Vokhmin Alexey V
0841c4d705
added 400 error for API BuildLists#create action
2012-10-10 20:19:00 +04:00
Vokhmin Alexey V
972877bc76
#671 : added API Platforms#destroy action and specs
2012-10-10 19:43:14 +04:00
Vokhmin Alexey V
d9c583e226
#671 : added specs for API Platforms#clone action
2012-10-10 19:13:14 +04:00
Vokhmin Alexey V
e6bb63db08
#671 : removed restrict_paginate method
2012-10-10 16:02:59 +04:00
Vokhmin Alexey V
e5c6707594
#671 : added #remove_member action for platforms API, updated specs
2012-10-09 21:07:10 +04:00
Vokhmin Alexey V
30909b281d
#671 : added #add_member action for platforms API, added new specs
2012-10-09 20:23:48 +04:00
Vokhmin Alexey V
9e6e2de955
#671 : added #members action for platforms API
2012-10-09 19:06:27 +04:00
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
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
Vokhmin Alexey V
feefe8ed89
#374 : added #platforms_for_build action for Platforms API
2012-10-08 22:02:44 +04: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
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
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
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
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
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
Vladimir Sharshov
a20e1552cc
[refs #374 ] Fix test, small refactoring.
2012-09-27 16:13:59 +04:00
Vladimir Sharshov
0dd103b7f4
[refs #374 ] Fix build list tests, remove unused code.
2012-09-27 03:54:56 +04:00
Vladimir Sharshov
77b57cce11
[refs #374 ] Fix support http basic auth, fix tests, fix abilities.
2012-09-26 21:15:11 +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
4100b875bd
[refs #90 ] fixed access
2012-09-26 23:10:04 +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
5f0e683711
#90 : moved code
2012-09-26 19:41:00 +04:00
Vokhmin Alexey V
6f889b15a9
#90 : added access to show pull requests
2012-09-26 19:39:47 +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
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
Vokhmin Alexey V
efe8b1ffdb
#90 : small refactoring
2012-09-26 18:20:46 +04:00
Vokhmin Alexey V
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
Alexander Machehin
ccb004bc03
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-09-26 16:27:46 +06:00
Alexander Machehin
dbf1a5f8ca
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 15:27:54 +06:00
Alexander Machehin
eba6a14e0b
[refs #90 ] very small refactoring
2012-09-26 15:27:24 +06:00
Alexander Machehin
3491492c8d
[refs #90 ] fixed pull authorization
2012-09-26 15:24:46 +06:00
Vokhmin Alexey V
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
Alexander Machehin
47a73a4ddb
[refs #90 ] fixed existing project name
2012-09-25 21:47:08 +06:00
Vokhmin Alexey V
d54a50e2e0
#90 : added line-height style
2012-09-25 19:31:06 +04:00
Vokhmin Alexey V
0299c069c6
#90 : style changes for header, increase performanse for #autocomplete_base_project action
2012-09-25 19:18:22 +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
Vladimir Sharshov
06099a15b6
Merge pull request #657 from warpc/648-add-filters-to-projects-page
...
[refs #648 ]: Filters by owners in projects page
2012-09-25 03:41:11 -07:00
Vladimir Sharshov
c426f81abe
Merge pull request #656 from warpc/616-issues_and_comments
...
[refs #616 ] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
2012-09-25 03:37:44 -07:00
Vokhmin Alexey V
40999debbf
#648 : updated projects_helper
2012-09-25 13:50:28 +04:00
Alexander Machehin
06e15cf3fa
[refs #616 ] remove unneeded code
2012-09-25 15:47:12 +06:00
Alexander Machehin
a29a2f8fe9
[refs #616 ] change ability for preview
2012-09-25 15:46:19 +06:00
Vokhmin Alexey V
84378afc3d
#648 : small code optimization
2012-09-25 13:36:50 +04:00
Vokhmin Alexey V
d15094f128
#648 : moved 'Create' button
2012-09-25 00:03:33 +04:00
Vokhmin Alexey V
91f215351c
#648 : small refactoring according to comment
2012-09-24 23:27:00 +04:00
Vokhmin Alexey V
0bb9f38b66
#648 : collor for labels has been changed
2012-09-24 22:44:06 +04:00
Vokhmin Alexey V
1e468b5073
#648 : updated styles, added icons for filters
2012-09-24 22:36:02 +04:00
Vokhmin Alexey V
768f4b1dfb
#648 : renamed parametr
2012-09-24 22:07:53 +04:00
Vokhmin Alexey V
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
Alexander Machehin
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
Alexander Machehin
f4bbeaaa46
[refs #616 ] fixed 500 when failed to create comment
2012-09-24 23:01:04 +06:00
Alexander Machehin
fc672451c6
[refs #616 ] small changes in styles
2012-09-24 21:19:50 +06:00
Alexander Machehin
eaf71f9cc0
[refs #652 ] set url options for mailer
2012-09-24 19:02:21 +06:00
Vokhmin Alexey V
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
konstantin.grabar
11c428ec20
[refs #374 ] Fix failed tests after http basic auth
2012-09-21 23:48:30 +04:00
konstantin.grabar
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +04:00
Vokhmin Alexey V
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
Vokhmin Alexey V
c14f2851e3
#648 : revert changes
2012-09-21 22:04:58 +04:00
Vokhmin Alexey V
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
konstantin.grabar
5bcebcf384
[refs #374 ] Add publish_without_qa field, fix some specs, update docs for auth
2012-09-21 18:30:40 +04:00
Alexander Machehin
b5bee35275
Revert "[refs #616 ] add table styles"
...
This reverts commit 1818f25de28de0e9efa8d1ae9e22649445d3953d.
2012-09-21 19:23:41 +06:00
Alexander Machehin
1f63fec004
Revert "[refs #616 ] dont filter html"
...
This reverts commit 68eac7a9de083d6a29503ac2900b3dd404e22c0c.
2012-09-21 19:22:27 +06:00
Alexander Machehin
855f1f356d
[refs #616 ] remove some inline styles
2012-09-21 18:10:47 +06:00
Alexander Machehin
651be997b3
[refs #616 ] add table styles
2012-09-21 17:46:44 +06:00
Alexander Machehin
94c3863e27
[refs #616 ] fixed markdown image example
2012-09-21 16:43:54 +06:00
Alexander Machehin
d25bdb2329
[refs #616 ] fixed preview bug
2012-09-21 16:32:53 +06:00
Alexander Machehin
b65ca14131
[refs #616 ] small js refactoring
2012-09-21 16:31:55 +06:00
konstantin.grabar
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
Alexander Machehin
96f8a9a43f
[refs #616 ] dont filter html
2012-09-20 23:48:20 +06:00
Alexander Machehin
378fe5847e
[refs #616 ] ugly replaces
2012-09-20 23:10:50 +06:00
konstantin.grabar
e027eee40c
[refs #374 ] Update api platforms list docs and code
2012-09-20 19:07:06 +04:00
Vokhmin Alexey V
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
Vladimir Sharshov
7e28920bc7
Merge pull request #653 from warpc/385-change-name-for-git-archives
...
[refs #385 ] Support download project source code by build clients(rpmbuild)
2012-09-20 06:37:13 -07:00
Vokhmin Alexey V
b398a0e456
#634 : fixed
2012-09-20 16:43:23 +04:00
Vokhmin Alexey V
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
Vokhmin Alexey V
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
Vokhmin Alexey V
805521c486
Merge branch 'master' into 385-change-name-for-git-archives
2012-09-20 14:53:29 +04:00
Vladimir Sharshov
0acc4ce1c7
Improve invite email(prevent falling into the spam)
2012-09-20 12:29:07 +04:00
Vokhmin Alexey V
7a8b68b90b
small refactoring
2012-09-20 00:54:15 +04:00
Vokhmin Alexey V
9d2c9ae2b3
#385 : added rsa to name of archives for git branches
2012-09-20 00:38:40 +04:00
Vokhmin Alexey V
17bdcf9a3c
updated model according to last comments, added new specs
2012-09-19 23:52:18 +04:00
Vokhmin Alexey V
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
Alexander Machehin
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +06:00
Alexander Machehin
11c67b7951
[refs #616 ] fixed bug on new issue
2012-09-19 23:59:46 +06:00
Alexander Machehin
fbc5f3a925
[refs #616 ] small refactoring
2012-09-19 23:59:14 +06:00
Alexander Machehin
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
Vokhmin Alexey V
426eb72d5f
moved #notify_users method from observer to model, updated specs
2012-09-19 17:55:17 +04:00
Alexander Machehin
4fc9ba7aeb
[refs #616 ] add lost i18n
2012-09-19 15:41:08 +06:00
Alexander Machehin
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
Vokhmin Alexey V
7fbf17a824
updated email templates
2012-09-18 19:34:39 +04:00
Vokhmin Alexey V
967c5daaa8
#575 : added 'arch' to subject and body of email
2012-09-18 16:03:10 +04:00
Alexander Machehin
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
Vokhmin Alexey V
7ea856686e
#575 : added some specs
2012-09-18 01:11:28 +04:00
Vokhmin Alexey V
5dd352887d
#575 : removed unnecessary method
2012-09-17 21:17:22 +04:00
Vokhmin Alexey V
6b62615a3e
#575 : did some refactoring according to comments
2012-09-17 20:17:43 +04:00
Vokhmin Alexey V
8788db12c0
#575 : added notification for users
2012-09-17 19:18:02 +04:00
Vokhmin Alexey V
15a75077db
Merge branch 'master' into 575-email-notification-for-build-tasks
2012-09-17 17:49:43 +04:00
Alexander Machehin
a4c8e8eff8
Merge branch 'master' into 616-issues_and_comments
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Vokhmin Alexey V
2681a1c676
#575 : added logic for BuildList notification
2012-09-16 22:18:41 +04:00
Vokhmin Alexey V
5326098884
#575 : updated email template
2012-09-16 22:02:28 +04:00
Vokhmin Alexey V
ef923d06c7
#575 : added build_list_notification
2012-09-16 21:29:45 +04:00
Vokhmin Alexey V
01576702a0
#575 : added migration, updated Settings page
2012-09-14 20:12:48 +04:00
Vokhmin Alexey V
7bb0ced8cb
#645 : fixed.
2012-09-14 18:49:08 +04:00
Vladimir Sharshov
c690a8446a
Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
...
[refs #633 ] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
2012-09-13 16:39:19 -07:00
Vokhmin Alexey V
6bdaf06d86
#633 : removed unnecessary code
2012-09-14 02:30:54 +04:00
Vokhmin Alexey V
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
Vladimir Sharshov
fc4eb189b5
Add new staging server;
...
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
Vokhmin Alexey V
fe20814b5a
#633 : hot fix
2012-09-13 20:18:09 +04:00
Vokhmin Alexey V
ba6805598f
#633 : small refactoring
2012-09-13 20:16:13 +04:00
Vokhmin Alexey V
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
Vladimir Sharshov
5a699ad379
Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
...
[refs #638 ] Repository supervisor
2012-09-12 13:52:42 -07:00
Vokhmin Alexey V
1c9a9e803e
#638 : some refactoring
2012-09-13 00:47:39 +04:00
Vladimir Sharshov
87b71cf611
Merge pull request #643 from warpc/641-enable-disable-project-from-private-repository
...
[refs #641 ] Include/exclude project from personal owner repository according to value of option project is package
2012-09-12 13:39:56 -07:00
Vokhmin Alexey V
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
Vokhmin Alexey V
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
Vladimir Sharshov
e3bcd2382e
[refs #641 ] Show only public projects in group profile
2012-09-12 18:49:40 +04:00
Vokhmin Alexey V
3b622f54b9
#638 : added before_filter to repositories_controller
2012-09-12 17:43:02 +04:00
Vokhmin Alexey V
bc4043e558
#638 : hot fix
2012-09-12 17:25:46 +04:00
Vokhmin Alexey V
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +04:00
Vokhmin Alexey V
aadfb39682
#638 : added access to add/remove member to repository for owner and local_admin
2012-09-12 16:17:51 +04:00
Vokhmin Alexey V
1f32e72508
#638 : added access to remove_project for members of repository
2012-09-12 00:43:08 +04:00
Vokhmin Alexey V
96466b808b
#638 : fixed ability model
2012-09-12 00:40:16 +04:00
Vokhmin Alexey V
b4c2c368e4
#638 : added permissions to add new project for members of repository
2012-09-12 00:27:28 +04:00
Vokhmin Alexey V
1e40b9fb06
#638 : some refactoring
2012-09-12 00:08:25 +04:00
Vokhmin Alexey V
405c09fc72
#638 : created table of users as shared
2012-09-11 20:03:43 +04:00
Vokhmin Alexey V
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +04:00
Vokhmin Alexey V
bff32c27c4
#637 : removed comments
2012-09-11 12:36:33 +04:00
Vokhmin Alexey V
1768df5010
#637 : removed unnecessary lines
2012-09-10 15:19:13 +04:00
Vokhmin Alexey V
e530fa5b74
#637 : updated message
2012-09-10 15:16:55 +04:00
Vokhmin Alexey V
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04:00
Vladimir Sharshov
8c06b0c18d
[refs #631 ] Fix right for publication build list using publish button
2012-09-07 22:45:03 +04:00
Vladimir Sharshov
216559024c
[refs #631 ] Change list repositories view, add button for edit and delete action
2012-09-07 21:59:34 +04:00
Pavel Chipiga
7570f1cab7
Set publish_without_qa to false for all platform repos when released. Fix mgration. Refs #631
2012-09-07 18:41:42 +03:00
Pavel Chipiga
768e40ee2a
Merge branch 'master' into 631-publish-to-the-repository-without-qa
...
Conflicts:
app/models/ability.rb
2012-09-07 16:38:21 +03:00
Vladimir Sharshov
3247db53c6
[refs #635 ] Fixed the lack of choice owner on create a project page
2012-09-07 14:25:04 +04:00
Vladimir Sharshov
29f5ef5f2e
Refactoring tests
2012-09-07 13:41:49 +04:00
Vladimir Sharshov
4828aa24f8
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
spec/controllers/platforms/maintainers_controller_spec.rb
spec/factories/build_lists.rb
2012-09-07 00:36:06 +04:00
Vladimir Sharshov
71e28cf3f3
Merge branch 'master' into 349-anonymous_access
2012-09-07 00:31:28 +04:00
Pasha
9247a1c850
Merge pull request #613 from warpc/263-refactoring
...
[#263 ] Исправление и рефакторинг тестов
2012-09-06 13:23:23 -07:00
Vladimir Sharshov
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov
54c6ba55be
[refs #349 ] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules
2012-09-06 21:09:10 +04:00
Vokhmin Alexey V
c1d87a36da
#631 : fixed misprint in model and controller
2012-09-06 19:43:07 +04:00
Vokhmin Alexey V
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
Vokhmin Alexey V
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
Vokhmin Alexey V
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
Vladimir Sharshov
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
Pavel Chipiga
a2d87c9228
Fix autocomplete_maintainers for local admins. Refs #620
2012-09-06 13:31:31 +03:00
konstantin.grabar
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
Vladimir Sharshov
ec32cf7fa0
[refs #630 ] swap tour conten for porject and build pages
2012-09-04 18:30:02 +04:00
konstantin.grabar
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +04:00
konstantin.grabar
5d0d972a0d
[refs #374 ] Refactor api build lists create logic
2012-09-03 17:49:11 +04:00
George Vinogradov
3e69d7d0f4
[issue #349 ] Guest user can show open platforms.
2012-09-01 02:00:39 +04:00
Vladimir Sharshov
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
George Vinogradov
decd4bf293
[issue #620 ] Removed scope from BuildList::Package && small refactoring.
2012-08-31 21:47:52 +04:00
Alexander Machehin
067615d79f
[refs #616 ] small js fix
2012-08-31 19:18:38 +06:00
Alexander Machehin
3225274425
[refs #616 ] change styles
2012-08-31 19:02:03 +06:00
konstantin.grabar
6229daf137
[refs #374 ] Add paginate restriction for API
2012-08-31 16:23:44 +04:00
George Vinogradov
16e101cc05
[issue #620 ] Fixed BuildList#actualize_packages
2012-08-31 01:20:30 +04:00
George Vinogradov
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
konstantin.grabar
0607eedb15
[refs #626 ] Set invites redirect add register link to top menu
2012-08-30 14:30:07 +04:00
Alexander Machehin
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
konstantin.grabar
03986b7c21
[refs #374 ] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template
2012-08-28 20:57:12 +04:00
George Vinogradov
88d0e358ce
[issue #620 ] Set maintainer for new and forked project
2012-08-28 19:00:04 +04:00
George Vinogradov
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
George Vinogradov
f688985814
[issue #620 ] Changed maintainer assignment.
...
* Added `project:maintainer:set_to_owner` task to set projects maintainer
to its owner
* Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
Vladimir Sharshov
6bcff5ad6f
Merge pull request #623 from warpc/616-issues_and_comments
...
[refs #616 ] Refactoring and fixed bugs with issue:
* could not remove all labels from issue;
* after update issue body now no need reload page to view changes;
* refactoring issues controller.
2012-08-27 03:46:27 -07:00
Alexander Machehin
1c3ca85f03
[refs #616 ] add comment for clarity
2012-08-27 15:43:44 +06:00
Alexander Machehin
2c0826a77d
[refs #616 ] fixed showing body after update
2012-08-25 23:40:51 +06:00