d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
611b22baa5
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
2012-07-17 11:02:56 +03:00
5b93ef9134
[refs #523 ] limit callback only for create action(update)
2012-07-12 00:40:55 +04:00
84f4d7d423
[refs #523 ] limit callback only for create action
2012-07-12 00:24:31 +04:00
b22a2ce3ba
[refs #523 ] Fix periodically error ActiveRecord::RecordNotFound in Resque service
2012-07-12 00:01:41 +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
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06: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
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
e794ce6330
Remove loner parameter to avoid queue ignore. Fix git hook process - do not require 7th param. Remove write_hook from queue. Refs #510
2012-06-20 02:20:25 +03: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
cb8345a207
Rename and separate queues. Refs #510
2012-06-18 17:16:53 +03:00
f19e82b3fc
Add comments for async method calls. Refs #510
2012-06-17 01:51:02 +03: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
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
38b55d769f
[refs #510 ] Add resque async workers
2012-05-31 11:02:25 +04:00
57ef020441
[refs #442 ] Fix problem for build list with save_to plaftorm is freeze; fix ignoring auto_publish option.
2012-05-22 01:10:00 +04:00
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +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
3e57359c96
[refs #442 ] Add mass build page functional
2012-05-17 19:20:03 +04:00
9d871af7ef
Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:40:10 +04:00
1385133ed5
[refs #461 ] Merge master into 461-rename_is_rpm_to_is_package
2012-05-16 14:37:35 +04:00
5ad43c684e
Merge master into 429-uname_format_error_explain
2012-05-16 14:01:41 +04:00
e807e5f3ec
[refs #429 ] Add format explain error message for uname
2012-05-15 15:11:18 +04:00
1f088c0cfc
[refs #461 ] Rename is_rpm to is_package
2012-05-15 14:00:57 +04:00
78ab229c4f
Fix advisories relaton. Minor code cleanup. Write more specs. Refs #444
2012-05-14 23:00:04 +03: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
ff016efe1c
[refs #90 ] choose project
2012-05-14 23:09:18 +06:00
f335863881
Fix dot in project name routes. Refactor and write basic route specs. Refs #454
2012-05-14 16:24:01 +03: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
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
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06: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
4ad39b05c0
[refs #90 ] model PullRequest, tests
2012-04-28 23:30:54 +06:00
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04:00
2a24997eb4
Allow set custom priority for mass rebuild
2012-04-24 23:03:45 +04:00
71fdaa4e4d
[refs #90 ] initial
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
40090f0903
[Refs #223 ] Fix human_average_build_time (wrong time)
2012-04-14 20:10:18 +04:00
afd82ab4ec
[Refs #223 ] Mass rebuild method now connect project platform repository and main if main exist.
2012-04-14 17:46:39 +04:00
ba9184cc49
Merge pull request #398 from warpc/223-build_list_notify_and_duration_updates
...
223 build list notify and duration updates
2012-04-13 11:43:57 -07:00
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +04:00
f0b9cabefa
[Refs #223 ] Change order for version select in build list creation page.
2012-04-10 19:45:18 +04:00
207be85ff4
[refs #223 ] Add group select to versions
2012-04-10 16:03:33 +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
977ec8382c
Merge branch 'master' into 263-refactoring
2012-04-05 19:58:46 +03:00
01976015a6
[refs #295 ] fix broken create/fork project
2012-04-05 22:52:21 +06: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
302179eff8
[refs #295 ] set priority to delayed jobs
2012-04-04 18:13:10 +06:00
1fb63cf1a7
[refs #263 ] division init bare & fork
2012-04-03 17:32:00 +06:00
5a384c6846
[refs #263 ] added dj queues
2012-04-03 01:29:06 +06:00
0c2d0f4612
[Refs #263 ] Delete Categories
2012-03-29 23:01:25 +04:00
5db485a4c0
[Refs #263 ] Remove Aut BuildList. Part 2
2012-03-29 22:43:46 +04:00
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03:00
a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
9ced817560
[Refs #279 ] Temporary fix for mass rebuild
2012-03-24 03:30:12 +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
e7ac387466
[refs #265 ] fixed check rails env
2012-03-15 18:10:10 +06:00
a78b7b4155
Merge branch 'master' into 3.2-master
2012-03-11 23:39:11 +02:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
41ae79eb46
Add configurable arch parameter to project build_for method. Write rake task for projects build. Refs #282
2012-03-08 01:25:17 +02: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
d6f9b2c3e9
Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255
2012-03-06 17:53:04 +02:00
4f995ca548
[refs #265 ] hook mode 775 -> 755
2012-03-06 15:39:23 +06:00
de0f7c83c8
[refs #265 ] fix hook and add execute bit for it
2012-03-06 15:07:14 +06: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
56b9371ee2
[refs #194 ] add default scope for comments
2012-03-02 01:10:12 +06:00
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
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
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
51e2c85b0a
Fix build_for settings. Refs #207
2012-02-24 19:28:01 +04:00
069c226110
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-24 19:28:00 +04:00
30f47a1748
[refs #134 ] lost env!
2012-02-24 19:27:57 +04:00
a809a4c116
[refs #134 ] fixed bug with new project
2012-02-24 19:27:57 +04:00
41861185c0
[refs #134 ] fixed git hook
2012-02-24 19:27:56 +04:00
dde34cdffb
Fix build_for settings. Refs #207
2012-02-23 22:20:44 +02:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
8f4c207545
Place platform destroy to background. Redo clone process to 2 phases - base_clone and relations_clone. Place relations clone and XML RPC to background. Remove unneeded validations. Refactor xml_rpc_clone. Refs #207
2012-02-22 14:35:40 +02:00
ecb29d1762
[refs #194 ] tags -> labels
2012-02-22 02:28:04 +06: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
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
a5375c369c
[refs #134 ] lost env!
2012-02-16 22:29:41 +06:00
4888993c3f
[refs #134 ] fixed bug with new project
2012-02-16 21:08:08 +06:00
20836e8864
[refs #134 ] fixed git hook
2012-02-15 17:12:49 +06:00
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
9271c15a5f
[refs #123 ] Add new commits support
2012-02-10 21:33:05 +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
c367fc818b
Merge branch 'master' of github.com:warpc/rosa-build
2012-02-06 19:05:50 +04:00
fde67a2c22
[refs #134 ] add post receive hook to repos
2012-02-06 15:31:22 +06:00
85c0d8b827
Change git branch for mass rebuild
2012-02-03 18:32:04 +04:00
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
f15cb90b87
Merge branch 'master' into 114-comment_notifications
...
Conflicts:
config/locales/ru.yml
2012-01-31 21:42:37 +06:00
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
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
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
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
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
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
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
fab4aa6eb6
Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112
2012-01-28 03:04:11 +02:00
e966e523e9
Merge pull request #132 from warpc/112-sync_projects
...
Auto sync for mandriva repo
* 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
2012-01-27 08:46:58 -08:00
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
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
eed3040944
[issue #64 ] Changed validation message and removed unnecessary
...
validation of projects owner.
2012-01-27 10:13:56 +04:00
45c175942b
Temporary change arch for mass rebuild
2012-01-27 05:00:44 +04:00
2d1e36fb1a
[issue #64 ] Changed own_projects validation.
2012-01-27 04:16:07 +04:00
ba84d5f216
[issue #64 ] Added validation of own_projects count.
2012-01-27 03:37:19 +04:00
1498e937f6
[issue #64 ] Added own_projects counters to User & Group
2012-01-27 02:33:18 +04:00
4cca8f7bb1
[refs #114 ] some refactoring
2012-01-25 23:33:26 +06:00
60c1153d49
Save with validation. Refs #31
2012-01-24 23:29:23 +02:00
3f4bf65825
Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31
2012-01-24 22:35:36 +02:00
7e1a26000e
Fix for "undefined method `<<' for nil:NilClass"
2012-01-24 01:12:42 +04:00
9127b6b689
[refs #114 ] changed logics
2012-01-24 01:42:54 +06:00
e1a4dd5ab5
Fix branch name for mass rebuild
...
Fix error in include_repos
2012-01-23 21:07:09 +04:00
733adaf111
Update build_for for new requirements
2012-01-23 20:19:10 +04:00
36a895385c
[refs #114 ] changed rules
2012-01-22 01:13:33 +06:00
371abac031
[refs #114 ] fix controller tests
2012-01-20 21:17:05 +06:00
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
800b02f544
[refs #18 ] Add project subsribe, tests
2012-01-20 00:20:03 +06:00
022a013b79
[issue #64 ] Added Wiki seeding on create.
2012-01-19 16:06:27 +04:00
dba11f4662
[refs #114 ] FIXME subscribers
2012-01-19 01:12:52 +06:00
a0aad7103e
some fixes
2012-01-17 17:38:40 +06:00
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
f8d00f5235
[refs #18 ] Fix cancan ability for commit comments
2012-01-12 18:04:16 +06:00
07dc7a4800
[refs #18 ] add comments to commit
2012-01-12 17:19:22 +06:00
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
5237939f49
Merge issues with master
2011-12-26 13:26:13 +04: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
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
39dade9945
[ closed #63 ] Added user column to build_list.
2011-12-20 21:09:29 +04:00
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
88ea7110f3
[issue #23 ] Fixed scope 'by_name' in Project model.
2011-12-16 04:32:42 +04:00
4ea4d7f56e
Refactor build_all - move to model. Apply delayed build_all. Refs #2261
2011-11-30 23:43:01 +02:00
4971fbbbde
Redo project versions to use tags and branches for build. Refs #2261
2011-11-30 02:22:26 +02:00
43eb873b70
Rollback last changes and fix deploy script. Refs #2261
2011-11-30 00:23:09 +02:00
a0cb729140
Try to fix strange production error with project fork. Refs #2261
2011-11-30 00:16:20 +02:00
c4a31e3d29
Improve and fix project fork functionality. Fix project create and validation. Add user role display. Add user role at user edit form. Refs #2261
2011-11-29 23:42:58 +02:00
148a0fec28
[refs #2249 ] Global name to description and unixname to name renames
2011-11-29 14:51:14 +04:00
02a813a474
Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262
2011-11-26 02:54:40 +02:00
Alexander Machehin
Pavel Chipiga
Vladimir Sharshov
George Vinogradov
konstantin.grabar