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
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
30b5188b50
#631 : updated db/schema.rb
2012-09-06 17:47:51 +04:00
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
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
2fbb72e537
[issue #620 ] Changes in Maintainer db:
...
* Added maintainer selection on project page (see TODO in sources);
* Added `actual` field to BuildList::Package;
* Added rake task to set BuildList::Package.actual field.
Run it after migration (see TODO in sources);
* Packages after publising of BuildList becomes actual;
* Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
3af72beb41
Add index to make "assignee" callback faster
2012-08-22 00:02:24 +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
c310d3cfec
[refs #604 ] Fix schema
2012-08-07 01:11:46 +04:00
f35d4cd873
Merge branch 'master' into #604-Remove_old_buildlist_created_more_than_3_month_ago
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-08-07 00:53:43 +04:00
69fb368911
merger stash
2012-08-07 00:48:29 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
b6c5221f41
Rollback schema.rb. Refs #263
2012-08-01 00:38:21 +03:00
8e91159b5b
Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263
2012-07-31 20:32:49 +03:00
ebc5cd2603
[refs #441 ] Fix schema
2012-07-31 17:35:05 +04:00
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
0305976a27
[refs #441 ] Fix schema
2012-07-31 12:56:55 +04:00
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
844e81a73d
[refs #441 ] Change public key type
2012-07-30 19:25:51 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
33e6cdc285
[refs #570 ] Remove mass build counters logs and transactions
2012-07-27 19:17:07 +04:00
944c6fc0e2
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
f9b217379d
[refs #570 ] Add mass build counters logs
2012-07-26 15:45:23 +04:00
e09a9467e2
Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576
2012-07-25 21:05:25 +03:00
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
b4059c67fc
[refs #441 ] Add key pairs for platform
2012-07-13 15:18:12 +04: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
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
2353a65972
[refs #442 ] Repair schema
2012-07-04 16:53:44 +04:00
e00e88340b
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
db/schema.rb
2012-07-04 03:31:51 +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
b46a7aba39
Fix branch with dots. Refs #263
2012-07-03 15:05:27 +03:00
dbbe4cef1f
[refs #442 ] Slice counters migration on two parts
2012-07-03 14:24:14 +04:00
561ebb8728
[refs #442 ] Add stop_build field
2012-06-29 19:17:25 +04:00
6507ad280f
[refs #442 ] Merge master into 442-mass_build
2012-06-29 16:40:54 +04:00
7561abca08
[refs #462 ] refactoring: remove notified_at
2012-06-28 21:40:32 +04:00
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04: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
f3bd3bbd7f
[refs #442 ] Add mass build counters ant their update. Add failed builds report generate
2012-06-22 19:10:44 +04:00
60f1f68ce1
[issue #428 ] Fixed schema.rb . Removed debug code.
2012-06-20 00:04:33 +04:00
735afaea15
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-06-19 02:57:39 +04:00
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
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
8eaec85aff
[refs #442 ] Fix auto_publish validate and default set
2012-05-29 17:44:30 +04: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
45ff187875
[refs #442 ] Remove button. Add tab. Fix locales. Fix schema
2012-05-23 20:44:04 +04:00
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
b85cb31b88
[refs #442 ] Remove def is_rpm. Change auto_publish default value. Change MassBuild set_name. Fix schema
2012-05-21 17:59:04 +04:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +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
ec9c19352e
[refs #461 ] Merge master into to 461-rename_is_rpm_to_is_package. Again
2012-05-17 12:00:21 +04:00
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
208310e83b
[refs #438 ] Add rake task to symlink migrate. Change rsync stubs
2012-05-16 17:01:25 +04:00
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
79a9b3d107
[refs #461 ] Fix is_package locale. Fix schema.rb and rename migration
2012-05-16 14:33:14 +04:00
1f088c0cfc
[refs #461 ] Rename is_rpm to is_package
2012-05-15 14:00:57 +04:00
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
52f5e01575
Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428
2012-05-06 00:43:04 +03:00
26a643eed1
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
db/schema.rb
2012-05-05 21:33:39 +04:00
69303561f4
[refs #434 ] add build priority to users
2012-05-05 17:05:24 +06:00
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
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
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06: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
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06: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
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
fda1a847f5
[refs #90 ] some tests and questions
2012-04-23 23:34:10 +06: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
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
3d1cb4bfee
Merge master into 396-rss_atom_feed
2012-04-18 16:53:53 +04:00
8ef020427d
[refs #396 ] Add token auth for atom feed
2012-04-18 16:46:09 +04:00
dcdea4b8d3
[Refs #404 ] Remove downloads statistics functional (db and tests)
2012-04-17 17:56:44 +04:00
44ca501962
[Refs #194 ] Fix tests
...
[Refs #263 ] Update kernel API call
2012-04-16 21:51:51 +04:00
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
a9ecc683f2
Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263
2012-04-05 20:11:02 +03:00
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
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
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
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
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
531ba0a35f
Add rspec to dev env, change repo source. Take back rails_datatables to plugins with all files. Refs #263
2012-03-30 00:24:57 +03:00
050398c39f
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-03-30 00:02:59 +03:00
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
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
c6d30b7ff3
[refs #344 ] Add link to product into product build lists list
2012-03-28 17:51:04 +04:00
f33ef75666
[refs #128 ] Add email confirmation on email change. Remove email confirmation after registration.
2012-03-27 17:45:09 +04:00
8b31c6373f
Merge branch 'master' into 128-account-activation
2012-03-27 13:46:21 +04:00
ae0ca1ce99
[refs #128 ] Fix devise mails. Fix confirm ability
2012-03-26 18:33:02 +04:00
a3d334f0c2
[refs #128 ] Merge 3.2-master into 128-account-activation
2012-03-26 13:55:45 +04:00
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
21c33b384b
[refs #325 ] Add new design to error pages
2012-03-22 11:16:56 +04:00
2db7726d55
Merge branch '3.2-master' into 190-encodings
...
Conflicts:
db/schema.rb
2012-03-22 00:13:18 +02:00
b902d8effe
[issue #195 ] Fixed avatar in commits & comments
2012-03-22 01:51:39 +04:00
89f31e9782
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
2012-03-21 21:55:14 +02:00
8b252d8c14
Add and tune devise lockable strategy. Refs #270
2012-03-21 15:37:16 +02:00
d3c3726a84
[Refs #66 ] Add priority in build list
2012-03-20 14:56:51 +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
5a77b17a43
[issue #279 ] Almost finished design for platforms
...
TODO:
* Add design for crontab generator
* Fix path generation
2012-03-14 21:22:47 +04: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
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
0dc22bae82
[refs #257 ] Add new design for users edit and private settings edit. Add new fields and action.
2012-03-03 12:01:32 +04:00
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
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
e147c2d6c5
[refs #257 ] Add new design for user public page. New field. Move locales to another file
2012-03-02 16:14:59 +04:00
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +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
dedd64f976
[issue #195 ] Returned lost files.
2012-03-01 03:29:16 +04:00
5b25ea221b
[refs #195 ] Add default value to is_rpm field for projects
2012-02-29 22:27:57 +04:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
12d8f5e7b8
[refs #232 ] Add new design to some group pages
2012-02-29 21:12:06 +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
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
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
39d42c1721
Fix seeds
2012-02-27 23:11:43 +02:00
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
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
fd15a39f7a
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-24 19:27:54 +04:00
3c5cdfd5e4
[refs #195 ] Add is_rpm field to projects. Continue set new design
2012-02-24 17:05:58 +04:00
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04: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
b7b69a86d8
Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96
2012-02-14 18:05:41 +02:00
02478f5451
Merge branch 'master' into 96-upgrade_rails
2012-02-14 14:05:27 +02:00
7bca61c58d
Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161
2012-02-14 13:50:01 +02:00
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
7d74b0af13
Merge branch 'master' into 96-upgrade_rails
...
Conflicts:
Gemfile
Gemfile.lock
app/models/group.rb
app/views/layouts/application.html.haml
db/schema.rb
public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
704c544cbc
Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174
2012-02-10 18:33:16 +02:00
ce39cdd04f
[issue #174 ] A half of work to create invitations system
2012-02-09 21:46:23 +04:00
a4baf8b670
[issue #133 ] Editor JS moved to separate file
2012-02-09 04:35:07 +04:00
7223b7deb9
Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96
2012-02-09 01:46:25 +02:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
26923740ad
Hot fix for en yml
...
Add new schema.rb
2012-02-03 01:30:08 +04:00
Pavel Chipiga
Vladimir Sharshov
Vokhmin Alexey V
George Vinogradov
Pavel Shved
Alexander Machehin
konstantin.grabar