Alexander Machehin
a033e3192e
[refs #531 ] fixed tests
2012-06-21 16:35:02 +06:00
Alexander Machehin
93ec9a135d
[refs #531 ] some refactoring and model tests
2012-06-21 00:10:27 +06:00
Alexander Machehin
4d91ea1d6e
[refs #531 ] fixed user roles
2012-06-20 23:59:47 +06:00
konstantin.grabar
264273c6c0
[refs #505 ] Remove comment. Add lost method into build_list model
2012-06-19 19:45:38 +04:00
konstantin.grabar
8e88c32147
[refs #505 ] Fix tests after merge. Remove ResqueAsyncMethods include
2012-06-19 14:23:03 +04:00
konstantin.grabar
dc8a11fa68
[refs #505 ] Merge master into 505-state_machine_migrate
2012-06-19 13:43:38 +04:00
konstantin.grabar
8ce6c26cc4
[refs #505 ] Fix state machine tests
2012-06-18 20:19:09 +04:00
Pavel Chipiga
b47b4ec075
Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510
2012-06-16 21:27:46 +03:00
konstantin.grabar
ac7a3980cd
[refs #505 ] Pending some tests. Return set_version_and_tag. Fix post_build action
2012-06-15 20:05:55 +04:00
konstantin.grabar
6db2fd3d10
[refs #505 ] Tried to fix strip error.
2012-06-15 17:05:55 +04:00
konstantin.grabar
49ac16ae19
[refs #505 ] Add changes to spec. Temporary broke tests to show errors
2012-06-15 14:14:32 +04:00
konstantin.grabar
5e7342fbd7
[refs #505 ] Comment DJ stub. Fix event name call
2012-06-15 12:47:40 +04:00
Alexander Machehin
9af3d22153
[refs #90 ] auto close after manual merge
2012-06-09 15:09:38 +06:00
Alexander Machehin
f6bfb38e79
[refs #90 ] fixed tests
2012-06-08 18:44:44 +06:00
Alexander Machehin
f44b9631ad
[refs #90 ] add pull requests authorizations
2012-05-31 00:08:07 +06:00
Alexander Machehin
5c9f914e4a
[refs #511 ] add issue index authorization
2012-05-30 22:03:07 +06:00
Alexander Machehin
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
Alexander Machehin
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
Alexander Machehin
0c89ca6575
[refs #90 ] broken tests
2012-05-23 00:23:00 +06:00
konstantin.grabar
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
Alexander Machehin
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +04:00
Vladimir Sharshov
bfabdc1dc3
Merge pull request #468 from warpc/466-edit_project
...
[refs #466 ] fixed access to project and tests for this cases.
2012-05-17 13:11:55 -07:00
Alexander Machehin
fcffff4178
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
2012-05-17 22:58:29 +06:00
Vladimir Sharshov
9e3afa8fc0
Merge pull request #476 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Repair arch factory and rename rsync stub method, remove symlink dir creation
2012-05-16 12:09:45 -07:00
konstantin.grabar
da70a11aab
[refs #438 ] Repair arch factory and rename rsync stub method
2012-05-16 19:29:28 +04:00
Vladimir Sharshov
1550d7a59e
Merge pull request #459 from warpc/438-remove_rsync_mount_from_app
...
[refs #438 ] Remove rsync mount and umount from platforms
2012-05-16 06:24:31 -07:00
konstantin.grabar
208310e83b
[refs #438 ] Add rake task to symlink migrate. Change rsync stubs
2012-05-16 17:01:25 +04:00
Alexander Machehin
e3caa7274f
[refs #466 ] add update project test
2012-05-15 17:15:34 +06:00
Pavel Chipiga
78ab229c4f
Fix advisories relaton. Minor code cleanup. Write more specs. Refs #444
2012-05-14 23:00:04 +03:00
Pavel Chipiga
8470674c62
Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444
2012-05-14 22:08:31 +03:00
Pavel Chipiga
f335863881
Fix dot in project name routes. Refactor and write basic route specs. Refs #454
2012-05-14 16:24:01 +03:00
George Vinogradov
9a0f582a16
[issue #428 ] Fixed typo in PlatformsHelper
2012-05-10 20:04:48 +04:00
Vladimir Sharshov
8819d0845a
[refs 428] Fix tests and merges missing
2012-05-05 23:26:34 +04:00
George Vinogradov
1f07332892
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
db/schema.rb
2012-05-04 21:29:04 +04:00
George Vinogradov
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
Pavel Chipiga
5157f31081
Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236
2012-05-04 00:52:56 +03:00
Alexander Machehin
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
Alexander Machehin
377035c911
[refs #263 ] dont change/remove owner from group && tests
2012-05-03 18:25:06 +06:00
Alexander Machehin
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
Alexander Machehin
eec083dc8b
[refs #90 ] fixed tests
2012-05-02 21:36:39 +06:00
Alexander Machehin
30ac14a413
Merge branch '90-pull' of github.com:warpc/rosa-build into 90-pull
...
Conflicts:
app/models/project.rb
app/models/pull_request.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
spec/models/pull_request_spec.rb
2012-05-02 15:18:56 +06:00
Pavel Chipiga
2539ef4795
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
2012-05-02 12:18:07 +03:00
Pavel Chipiga
b957600eda
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/models/project.rb
app/views/projects/_repo_block.html.haml
db/schema.rb
spec/controllers/issues_controller_spec.rb
spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Alexander Machehin
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
George Vinogradov
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
Vladimir Sharshov
41ef7e85f3
Merge pull request #424 from warpc/385-git_archive
...
[refs #416 ] dont show zip menu for empty project
[refs #385 ] Strictly restrict the parameter values(tar or zip)
Add tests for this cases
2012-04-24 11:41:12 -07:00
Alexander Machehin
843ebecf71
[refs #416 ] fixed tests for anonymous access
2012-04-25 00:34:36 +06:00
Alexander Machehin
f1cf96baab
[refs #385 ] fixed security bug & added some tests for project archive
2012-04-25 00:10:41 +06:00
Pavel Chipiga
cf907c19e8
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
Alexander Machehin
064dfcae54
[refs #347 ] refactoring collaborator tests
2012-04-24 21:38:50 +06:00
George Vinogradov
ffe94f2ba6
[issue #347 ] Fixed typo
2012-04-24 19:18:55 +04:00
George Vinogradov
f4e23bca14
[issue #347 ] Fixed CollaboratorsController spec.
2012-04-24 19:02:51 +04:00
Pavel Chipiga
7af06cc7ab
Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263
2012-04-23 23:55:42 +03:00
Alexander Machehin
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
Alexander Machehin
598c072a80
[refs #90 ] add already state
2012-04-23 23:34:11 +06:00
Alexander Machehin
fda1a847f5
[refs #90 ] some tests and questions
2012-04-23 23:34:10 +06:00
Alexander Machehin
58776a6e9e
[refs #90 ] fixing pull methods
2012-04-23 23:34:10 +06:00
Alexander Machehin
71fdaa4e4d
[refs #90 ] initial
2012-04-23 23:34:10 +06:00
Alexander Machehin
25bd2a6e77
[refs #90 ] issue status -> state
2012-04-20 23:19:23 +06:00
Alexander Machehin
5dc8a4ead1
[refs #90 ] add already state
2012-04-20 22:23:28 +06:00
Pavel Chipiga
701da7e1f9
Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263
2012-04-19 22:45:50 +03:00
Alexander Machehin
b1365fc567
[refs #90 ] some tests and questions
2012-04-20 01:09:00 +06:00
Alexander Machehin
c66931d347
[refs #90 ] fixing pull methods
2012-04-19 21:57:42 +06:00
Alexander Machehin
d48a3413cc
[refs #90 ] initial
2012-04-19 21:57:41 +06:00
Vladimir Sharshov
dcdea4b8d3
[Refs #404 ] Remove downloads statistics functional (db and tests)
2012-04-17 17:56:44 +04:00
Vladimir Sharshov
44ca501962
[Refs #194 ] Fix tests
...
[Refs #263 ] Update kernel API call
2012-04-16 21:51:51 +04:00
Vladimir Sharshov
07cc2db49e
Merge pull request #399 from warpc/194-assignee_and_user
...
[refs #194 ] Move user_id to assignee_id and creator_id to user_id, because user_id in project used only as author.
2012-04-16 09:39:23 -07:00
Vladimir Sharshov
2c0f047b38
[Refs #223 ] Fix errors and tests
2012-04-14 00:49:29 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
konstantin.grabar
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
Alexander Machehin
38eb8aeee5
[refs #391 ] fixed bug when creation project
2012-04-10 15:40:38 +06:00
Alexander Machehin
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
Pavel Chipiga
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
Vladimir Sharshov
d999062913
[Refs #263 ] Solution for callback tests
2012-04-05 17:17:02 +04:00
Pavel Chipiga
20e5936d0c
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
2012-04-05 00:43:06 +03:00
Vladimir Sharshov
a6ec36086c
[Refs #263 ] Refactoring ProductBuildList. Add tests
2012-04-04 00:56:21 +04:00
Vladimir Sharshov
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
Vladimir Sharshov
d31d0c9672
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 19:43:59 +04:00
Vladimir Sharshov
fef3affc07
[Refs #263 ] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action
2012-04-01 19:19:54 +04:00
Pavel Chipiga
36b2eaa784
Fix root page search field design. Allow aninymous search only projects. Fix activity_feeds routes. Show anonymous project build lists. Remove unused specs. Refs #349
2012-03-31 03:43:55 +03:00
Pavel Chipiga
d6e6959f46
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349 , #263
2012-03-31 02:37:54 +03:00
Pavel Chipiga
050398c39f
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-03-30 00:02:59 +03:00
Pavel Chipiga
583918fa68
Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263
2012-03-29 23:34:22 +03:00
Vladimir Sharshov
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
Vladimir Sharshov
39c5da2445
[Refs #263 ] Remove EasyUrpmi support
2012-03-29 23:07:38 +04:00
Vladimir Sharshov
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
Alexander Machehin
c2960b7083
[refs #263 ] fixed commentable accessibility
2012-03-27 22:45:07 +06:00
Alexander Machehin
a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
Vladimir Sharshov
115c90f03b
Merge pull request #331 from warpc/263-refactoring
...
[Refs #263 ] Fix broken tests
2012-03-23 13:49:20 -07:00
konstantin.grabar
1680b949f5
[refs #263 ] Fix personal repositories and CanCan platform tests
2012-03-23 15:29:25 +04:00
Pavel Chipiga
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02:00
konstantin.grabar
0010cee0aa
[refs #263 ] Issues tests fix
2012-03-22 19:56:10 +04:00
konstantin.grabar
16c9e6aa24
[refs #263 ] Fix most of the failed tests
2012-03-22 19:48:28 +04:00
Alexander Machehin
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
konstantin.grabar
f354c53709
[refs #263 ] Merge 3.2-master into 263-refactoring
2012-03-22 17:28:09 +04:00
konstantin.grabar
b7defd90f1
[refs #263 ] Remove unnessacesary projecsts#show action and test for it
2012-03-22 16:16:11 +04:00
Vladimir Sharshov
57520c6098
Merge pull request #330 from warpc/265-activity_feed_messages
...
[Refs #265 , #263 ] fixed tests to issue comments
2012-03-22 04:47:55 -07:00
Alexander Machehin
9d6960fab8
[refs #265 ] some changes
2012-03-22 16:19:21 +06:00
Alexander Machehin
6d330d9164
[refs #265 ] fixed tests to issue comments
2012-03-22 16:16:31 +06:00
Alexander Machehin
600eeeb4d7
[refs #194 ] fixed mailer tests
2012-03-22 15:12:22 +06:00
Alexander Machehin
867d678dc4
[refs #270 ] some users tests
2012-03-22 02:05:27 +06:00
Vladimir Sharshov
87e1ee4700
Merge pull request #317 from warpc/232-groups_tests
...
[refs #232 ] Add groups tests and mass assignment protect
2012-03-21 12:06:00 -07:00
konstantin.grabar
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
konstantin.grabar
aa4bd2c1bc
[refs #232 ] Add groups tests
2012-03-20 19:40:49 +04:00
konstantin.grabar
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
Pavel Chipiga
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
Pavel Chipiga
159fbe65dc
Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263
2012-03-03 02:28:27 +02:00
Pavel Chipiga
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +02:00
Pavel Chipiga
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
Alexander Machehin
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
Pavel Chipiga
7d112d0524
Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223
2012-03-01 19:33:46 +02:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
George Vinogradov
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Alexander Machehin
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Pavel Chipiga
159ef26b38
Merge branch 'master' into 3.2-master
...
Conflicts:
app/views/wiki/_compare.html.haml
app/views/wiki/_diff_data.html.haml
db/schema.rb
2012-02-27 22:32:57 +02:00
Pavel Chipiga
5e58ec9e59
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-24 19:27:58 +04:00
Alexander Machehin
de9071ae4f
fix collaborator tests
2012-02-24 19:27:54 +04:00
Pavel Chipiga
fd15a39f7a
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-24 19:27:54 +04:00
Alexander Machehin
027012d3e5
[refs #194 ] some refactotring
2012-02-23 21:57:51 +06:00
Alexander Machehin
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
Alexander Machehin
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06:00
Pavel Chipiga
ed60751dfa
Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205
2012-02-21 01:13:05 +02:00
Alexander Machehin
0ce76207af
[refs #194 ] Add issue tags
2012-02-21 00:41:40 +06:00
Alexander Machehin
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06:00
Alexander Machehin
a53f627f5f
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-14 17:54:46 +06:00
Alexander Machehin
6fff641531
fix collaborator tests
2012-02-14 17:52:33 +06:00
Pavel Chipiga
7bca61c58d
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-14 13:50:01 +02:00
konstantin.grabar
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
George Vinogradov
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
konstantin.grabar
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
Vladimir Sharshov
4165b188eb
Merge branch 'master' into 64-project_wiki
...
Conflicts:
app/models/project.rb
config/locales/en.yml
2012-02-03 00:55:16 +04:00
Alexander Machehin
aa9652409c
[refs #114 ] clean
2012-02-01 01:15:53 +06:00
George Vinogradov
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
Alexander Machehin
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
George Vinogradov
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
Pavel Chipiga
33dce21312
Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95
2012-01-30 22:36:58 +02:00
Alexander Machehin
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06:00
George Vinogradov
2f315f869d
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
db/schema.rb
2012-01-30 13:27:22 +04:00
Alexander Machehin
5efaca77cf
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
app/models/project.rb
app/views/user_mailer/new_comment_notification.en.haml
app/views/user_mailer/new_comment_notification.ru.haml
app/views/user_mailer/new_comment_reply_notification.ru.haml
config/locales/devise.en.yml
config/locales/en.yml
config/locales/ru.yml
db/schema.rb
2012-01-30 13:06:06 +06:00
Alexander Machehin
8962e85b2d
[refs #114 ] fix reverting
2012-01-30 12:38:31 +06:00
Alexander Machehin
e0b7699ffd
Revert "Merge branch '114-comment_notifications' into user-emails-list"
...
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.
Conflicts:
app/models/user.rb
2012-01-30 12:22:54 +06:00
Alexander Machehin
f6b6bbfb54
Revert "[refs #114 ] emails control"
...
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.
Conflicts:
app/models/subscribe.rb
app/models/user.rb
spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin
ea7cbe1908
Revert "[refs #114 ] fix emails uniqueness"
...
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.
Conflicts:
app/models/subscribe.rb
app/models/user_email.rb
2012-01-30 12:15:33 +06:00
Alexander Machehin
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
Alexander Machehin
39a4479fa3
[refs #114 ] fix emails uniqueness
2012-01-29 22:27:46 +06:00
Pavel Chipiga
74f891fc83
Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112
2012-01-27 17:35:18 +02:00
George Vinogradov
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin
06ab99a1d0
[refs #114 ] add js
2012-01-27 18:20:07 +06:00
Alexander Machehin
e71a9e84cb
[refs #114 ] emails control
2012-01-27 02:11:07 +06:00
Alexander Machehin
e04b2eb59b
Merge branch '114-comment_notifications' into user-emails-list
...
Conflicts:
app/models/subscribe.rb
config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin
77420d2a8f
[refs #114 ] user emails
2012-01-26 14:53:40 +06:00
Alexander Machehin
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
konstantin.grabar
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
Pavel Chipiga
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
Alexander Machehin
61be317b21
[refs #114 ] i18n
2012-01-25 01:00:51 +06:00
Alexander Machehin
6582a9afa5
[refs #114 ] fix tests
2012-01-24 18:15:56 +06:00
Alexander Machehin
651c5637ed
[refs #114 ] fix committer notification
2012-01-22 23:49:41 +06:00
Alexander Machehin
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
Alexander Machehin
d8df6c6279
[refs #114 ] committer subscribe + some tests
2012-01-21 00:22:25 +06:00
Alexander Machehin
3a00a66b86
[refs #114 ] polish controller tests
2012-01-20 22:48:21 +06:00
Alexander Machehin
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
Alexander Machehin
876351edb5
[refs #114 ] Fixed tests
2012-01-20 12:27:13 +06:00
Alexander Machehin
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
Alexander Machehin
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
Pasha
4ba268dd67
Merge pull request #109 from warpc/18-commit_comments
...
18 commit comments
2012-01-18 05:49:57 -08:00
Pavel Chipiga
f8be867aaf
Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103
2012-01-17 19:37:41 +02:00
santaux
62d0419bdd
Merge pull request #106 from warpc/103-bl_publish_new_params
...
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
Pavel Chipiga
b5170e2f2a
Write specs for tag based build. Refs #103
2012-01-17 14:25:54 +02:00
Alexander Machehin
bf4e4f02ed
Right merge branch 'master' into 18-commit_comments
...
Conflicts:
app/controllers/comments_controller.rb
app/views/comments/edit.html.haml
app/views/issues/show.html.haml
db/schema.rb
2012-01-17 15:52:46 +06:00
konstantin.grabar
ee58a8e789
[refs #54 ] Fix comments failed specs
2012-01-17 12:20:06 +04:00
Pavel Chipiga
a687a6601b
Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103
2012-01-16 23:51:20 +02:00
Vladimir Sharshov
68744b1676
Fix broken tests in #94 from pull request #92
2012-01-17 01:07:48 +04:00
Alexander Machehin
69debdd83e
fix tests for shared elements
2012-01-16 19:43:23 +06:00
konstantin.grabar
52696791f2
[refs #54 , #94 ] Merge master into issues
2012-01-16 13:42:44 +04:00
Alexander Machehin
674d5f8e56
[refs #18 ] model tests
2012-01-14 18:36:00 +06:00
Alexander Machehin
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
Pavel Chipiga
712ca8d95a
Save package_version during success build_list publish. Add specs. Refs #103
2012-01-13 18:45:13 +02:00
Alexander Machehin
794c55a030
Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments
2012-01-13 22:01:30 +06:00
Alexander Machehin
2b1fe79adc
[refs #18 ] controller tests
2012-01-13 22:00:28 +06:00
George Vinogradov
729bd94045
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
config/routes.rb
db/schema.rb
2012-01-13 18:05:42 +04:00
Pavel Chipiga
c23312ad51
Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97
2012-01-11 21:43:33 +02:00
konstantin.grabar
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
konstantin.grabar
dda40d9e9d
[refs #54 ] Mailer specs for comments and issues
2012-01-11 11:12:23 +04:00
konstantin.grabar
60a7f3e87f
[refs #54 ] Fix comments specs
2012-01-10 15:24:43 +04:00
konstantin.grabar
a44530980e
[refs #54 ] Remove some unnessacary comments
2011-12-30 18:44:47 +04:00
konstantin.grabar
e8977a7d95
Merger issues with master
2011-12-30 18:23:16 +04:00
konstantin.grabar
3f72082e0e
[refs #54 ] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes
2011-12-30 18:21:08 +04:00
konstantin.grabar
402133aff6
[refs #54 ] Add some subscribe specs and factory
2011-12-29 21:03:53 +04:00
konstantin.grabar
635e2b7977
[refs #54 ] Add comments specs and factory. Remove unused code. Add one delay and fix some links.
2011-12-29 15:16:54 +04:00
Pavel Chipiga
acb970686c
Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72
2011-12-29 04:37:34 +02:00
konstantin.grabar
a783b460bd
Merge issues with master
2011-12-28 13:22:57 +04:00
Pavel Chipiga
5e3addd5d2
Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85 . Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54
2011-12-28 04:59:05 +02:00
George Vinogradov
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
konstantin.grabar
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
Pavel Chipiga
7d3dd5eaf1
[ #82 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
konstantin.grabar
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00