2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
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
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
a2d87c9228
Fix autocomplete_maintainers for local admins. Refs #620
2012-09-06 13:31:31 +03:00
3e69d7d0f4
[issue #349 ] Guest user can show open platforms.
2012-09-01 02:00:39 +04:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
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
a70f9b9ecb
[refs #616 ] allow create issue for public projects
2012-08-20 23:54:55 +06:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
0ff8f92b62
Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263
2012-08-15 16:52:32 +03:00
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
b50d9f87d2
[refs #90 ] clean ability
2012-08-07 23:07:18 +06:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
43d8e2020c
[refs #374 ] Remove states check logic from ability.rb. Small api reject answer fix
2012-08-06 16:21:19 +04:00
36da0cf808
[refs #374 ] Continue tests fix
2012-08-06 14:43:04 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04:00
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
1de9277e4a
[refs #442 ] Add main? method for platforms
2012-07-10 11:06:08 +04:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
1f2a3b82d3
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability
2012-07-06 20:49:21 +04:00
4eac2a232f
[refs #442 ] Ability rights refactor. status_by_human refactor
2012-07-04 15:22:26 +04:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
6afe8c0375
[refs #442 ] Merge master into 442-mass_build
2012-07-03 18:41:02 +04:00
0827cf5100
[refs #442 ] Add other mass builds action to mass_builds controller. Rename cancel_mass_builds action
2012-07-03 18:34:07 +04:00
ea8775f1f7
[refs #547 ] remove mistake condition
2012-07-03 16:42:58 +06:00
8f9a6ee2d2
[refs #442 ] Change cancel btn. Move some actions to mass_builds controller. Add more ability rights
2012-07-02 18:50:47 +04:00
004f603e02
[refs #442 ] Add new actions rights. Cancel build list btn rights fix
2012-06-29 23:10:18 +04:00
ae4c8a6a5e
[refs #90 ] fixed lost data after merge
2012-06-28 16:44:55 +06:00
ce0ff70561
[refs #90 ] fixed errors
2012-06-27 16:47:08 +06:00
1ffb1b3940
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
2012-06-27 16:20:38 +06:00
96d284d5ee
Merge pull request #533 from warpc/531-fix_users_role
...
[refs #531 ] Changed the rules for granting user rights in the project
2012-06-26 05:44:16 -07:00
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
baec8a1016
[refs #525 ] Fix clear action rights
2012-06-25 18:26:01 +04:00
d2f4135065
[refs #531 ] refactoring
2012-06-21 15:49:39 +06:00
93ec9a135d
[refs #531 ] some refactoring and model tests
2012-06-21 00:10:27 +06:00
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
4d91ea1d6e
[refs #531 ] fixed user roles
2012-06-20 23:59:47 +06:00
270dbf2e9b
[refs #525 ] Add erase repository functional
2012-06-20 17:21:32 +04:00
ec21c042dd
Fix and refactor active menu. Refs #207
2012-06-09 19:04:06 +03:00
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
526bdbe60f
[refs #510 ] Resque sinatra app secure
2012-05-31 17:36:41 +04:00
f44b9631ad
[refs #90 ] add pull requests authorizations
2012-05-31 00:08:07 +06:00
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
43e95b565e
[refs #442 ] Change build_all button to mass_builds
2012-05-23 20:27:06 +04:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
aceb9e61fc
Rename is_rpm to is_package in ability.rb
2012-05-18 01:07:04 +04:00
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
74aee232f9
[refs #90 ] some fixes and merge button
2012-05-17 22:49:29 +06:00
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
944626d59a
[refs #455 ] add ability for build lists
2012-05-14 16:51:08 +06:00
85d4489009
[refs #90 ] dont work pull
2012-05-12 00:23:09 +06:00
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
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
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
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
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
77414b3092
Universal mass rebuildfor platform onwer without hardcoded main repository or architecture
2012-04-26 13:18:11 +04:00
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
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
3e4eba7f9d
Merge pull request #411 from warpc/408-frozen_platform
...
[issue #408 ] Allow publish build list in released platform only for platform members. Add rejected function for bs.
2012-04-18 04:17:32 -07:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
644b95d5bd
Fuuu!
...
Revert "[refs #385 ] removed dublicate ability"
This reverts commit 72de5731722f0a5b7110983ecb97cba1beda3056.
2012-04-17 19:52:52 +06:00
05ec6cbac3
[refs #385 ] removed dublicate ability
2012-04-17 16:21:45 +06:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
6d5cee2c04
[refs #383 ] added ability to destroy project
2012-04-05 17:36:53 +06:00
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
0f91e0e8a1
[refs #344 ] fixed ability and submenu
2012-03-30 23:23:46 +06:00
4dd97d8c63
[Refs #263 ] Remove xml-rpc gem, clear CanCan abilities and tests
2012-03-30 00:24:45 +04:00
c9f4cf0ea4
Fix and refactor project membered abilities. Refs #195
2012-03-28 00:28:50 +03:00
2ba4a282cd
[issue #195 ] Global admin can change members in all projects
2012-03-28 00:16:33 +04:00
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
dafedb3dcf
Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270
2012-03-26 17:49:00 +03:00
d44de9f2bb
Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195
2012-03-23 22:37:17 +02:00
cd42c912d8
[issue #279 ] Fixed permissions for personal platforms.
2012-03-20 22:41:14 +04:00
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
3d9f9b5c73
[issue #279 ] Fixed permissions and moved some buttons.
...
Removed Freeze/Unfreeze actions from Platform.
2012-03-16 17:25:34 +04:00
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
9911d9f25e
[issue #279 ] Removed can_clone? and can_build? from Product
2012-03-16 01:10:24 +04:00
76af82805d
[issue #279 ] Fixes.
...
* Fixed permissions.
* Added pagination in repository view.
2012-03-15 04:07:53 +04:00
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
51e2584995
Fix abilities for invites. Refs #174
2012-03-12 23:24:05 +02:00
f6dd072a24
Merge branch '3.2-master' into 257-new_design_for_profiles
...
Conflicts:
config/locales/users.en.yml
config/locales/users.ru.yml
2012-03-12 23:04:31 +06:00
24639b8684
[refs 257] renamed to profile
2012-03-12 21:03:25 +06:00
bb7cff5de8
Fix abilities - allow users search build_lists. Refs #223
2012-03-12 13:46:57 +02:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
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
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
13ba125dc0
[refs #265 ] add project_id to comment & fix email notification
2012-03-07 03:49:29 +06:00
0f823bd9f3
[refs #265 ] fix security & commit to comments
2012-03-07 02:51:51 +06:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
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
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
06795a56be
[refs #195 ] Add sections action ability for projects
2012-02-28 19:44:16 +04:00
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
e1f7817624
Add local admin ability to build product. Fix template links. Refactor. Refs #217
2012-02-27 15:49:24 +02:00
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
2c493cdbb7
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-14 20:15:52 +02:00
d0fe7f55d5
[issue #174 ] added static pages and some changes
2012-02-10 02:57:43 +04:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
c47db56270
[refs #168 ] can read repos in the open platform
2012-02-07 19:55:45 +06:00
325667dde0
[refs #168 ] removed wrong ability
2012-02-07 17:31:00 +06:00
cb7a9fcc21
fix group autocomplete
2012-02-02 02:42:23 +06:00
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
bae56741d0
Temporary disable AutoBuild functions for users (not working at now)
2012-01-20 12:24:57 +04:00
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
bdc3b3a3d1
[refs #18 ] controller tests
2012-01-14 18:16:42 +06:00
f8d00f5235
[refs #18 ] Fix cancan ability for commit comments
2012-01-12 18:04:16 +06:00
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
3f72082e0e
[refs #54 ] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes
2011-12-30 18:21:08 +04:00
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
fa8656d1f5
[refs #54 ] Refactor subscires routes and authorize
2011-12-28 17:54:45 +04:00
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
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04:00
894bc0c077
[refs #54 ] Add issues tests. Fix some CanCan rights. Make some fixes to logic
2011-12-23 14:56:46 +04:00
e2144e0fdb
[refs #54 ] Fix issue ability and comment redirect after update
2011-12-22 11:41:37 +04:00
2c67843c34
Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65
2011-12-21 23:42:06 +02:00
e588482f32
[ #74 ] Merge branch 'master' into 65-build_repo
...
Conflicts:
app/controllers/build_lists_controller.rb
app/controllers/projects_controller.rb
db/schema.rb
2011-12-21 20:13:57 +02:00
3ab55d34b8
[refs #54 ] Add CanCan rules for issues and comments. Fix serial_id routes and some actions
2011-12-21 18:48:16 +04:00
d901426b79
Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65
2011-12-21 16:01:50 +02:00
6c48e058be
[ close #70 ] Removed all & filter methods in BuildListsController
...
* Removed methods
* Changed abilities
* Changed routes
* Added specs
2011-12-21 05:30:34 +04:00
3eb2ae545a
[issue #27 ] Merge branch 'master' into build_list_visibilities
...
Conflicts:
app/views/build_lists/_filter.html.haml
2011-12-20 21:25:35 +04:00
0978312366
[update #27 ] Removed unnecessary comments.
2011-12-20 21:22:44 +04:00
c81698b81b
[refs #57 ] Forbid access to users_path for simple users
2011-12-16 11:32:34 +04:00
194aabdbc3
[issue #27 ] Fixed typo in ability.rb
2011-12-16 02:09:05 +04:00
0c3b62b235
[issue #27 ] Changed abilities. Added test, but test fails.
2011-12-16 01:58:20 +04:00
b1eac17c4c
[issue #37 ] Fixed typos.
2011-12-13 19:11:16 +04:00
0d668be2c7
[issue #37 ] Fixed typos
2011-12-13 18:28:22 +04:00
7ebc2f22c9
[issue #37 ] Maybe fixed bug that user can't show created build_list
2011-12-13 18:21:25 +04:00
0bffb0581e
Some changes in groups.
2011-12-07 03:45:09 +04:00
2f5ce7cebe
Merge branch 'groups_reincarnation' into staging
...
Conflicts:
app/models/ability.rb
app/models/project.rb
config/environments/production.rb
2011-12-05 17:16:32 +04:00
9cc820080b
Groups base functional.
2011-12-05 16:32:18 +04:00
1abcdbc028
[refs #2249 ] Add corrections to ACL
2011-12-02 19:26:28 +04:00
233f9b8035
[refs #2249 ] Add corrections to ACL rules
2011-12-02 10:57:58 +04:00
96d4886f49
[refs #2249 ] Add new ACL relations
2011-12-01 18:20:24 +04:00
19076c805e
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 15:56:00 +02:00
7535fc124a
Skip authorization for callback actions during project build. Refactor. Refs #2261
2011-11-30 02:56:57 +02:00
05054abdb9
[refs #2249 ] Add platforms specs. Correct some collaborators specs
2011-11-28 17:28:29 +04:00
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
0573acb650
[refs #2249 ] Add more Collaborators and Projects controllers specs
2011-11-24 23:22:37 +04:00
Vladimir Sharshov
Vokhmin Alexey V
Pavel Chipiga
George Vinogradov
Alexander Machehin
konstantin.grabar