2a6b08c269
[refs #90 ] fixed error with wrong treeish
2012-08-07 22:24:47 +06:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
61ca25a820
[issue #590 ] Eager loading of BuildList's owner and repository.
2012-08-07 01:41:57 +04:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
710fef1f0b
Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
...
[refs #601 ] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
dd1bf7719f
[refs #601 ] Add statuscheck for destroy action in product build list(small fix)
2012-08-06 17:08:13 +04:00
43d8e2020c
[refs #374 ] Remove states check logic from ability.rb. Small api reject answer fix
2012-08-06 16:21:19 +04:00
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
0e3e5c0ce1
Merge pull request #600 from warpc/590-build_list_page_change
...
[refs #590 ] build list page change:
* Fix migration;
* Repository rights checking moved to controller;
* Repository fetches through project and platform.
2012-08-06 04:18:26 -07:00
94178c6ee3
[issue #590 ] Removed unnecessary check from controller.
2012-08-06 15:03:10 +04:00
b963c9342a
[issue #590 ] Repository fetches through project and platform
2012-08-06 14:59:07 +04:00
36de270fad
[issue #590 ] Moved repository check to controller.
2012-08-06 14:21:33 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
a1b7bcac32
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04: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
f3db00832a
[refs #374 ] Api v1 base functional and specs
2012-08-03 14:05:05 +04:00
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +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
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
6c11597de6
Merge branch 'master' into 90-pull
2012-07-30 16:53:59 +06:00
f674735c8c
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-07-30 13:31:28 +04:00
63801e2676
[issue #590 ] Platform fetches through repository.
2012-07-27 23:37:56 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
255bd3a73a
Merge pull request #589 from warpc/551-old_bugs_with_by_object
...
[refs #551 ] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
2105457d62
Merge pull request #587 from warpc/586-datatables_json_fixes
...
[refs #586 ] Custom JSON generators changed to JBuilder
2012-07-27 05:45:23 -07:00
bbb03d3243
[issue #586 ] Removed @total_project & @total_user.
2012-07-27 16:40:13 +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
5aecdc203b
Merge pull request #571 from warpc/263-refactoring
...
[refs #263 ] Big git refactoring
2012-07-27 04:51:34 -07:00
40b0bb4b58
[issue #551 ] by_object changed to by_actor.
2012-07-27 08:12:09 +04:00
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03:00
35e673d44e
Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263
2012-07-27 00:15:57 +03:00
03cc4668dc
[issue #586 ] Custom JSON generators changed to JBuilder
2012-07-27 00:25:44 +04:00
48f8c3ad08
[refs #374 ] Add json responses for build lists api
2012-07-26 13:22:51 +04:00
6f4f48cbce
[issue #578 ] Fixed error handling in PresonalRepository.
2012-07-26 01:49:55 +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
6d046764ef
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04:00
d6c65a1626
[issue #565 ] Added feedback form.
...
* Added web pages to send request
* Added mailer to send feedback message.
2012-07-20 20:06:31 +04: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
2feb03601b
[refs #90 ] fixed authorize of the merge action
2012-07-16 22:35:44 +06:00
3cf3546c2e
[refs #441 ] Add secret to filter. Add repository key exist check
2012-07-13 18:16:56 +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
43d2c1b223
[refs #90 ] fix after fail of the pull creation
2012-07-10 22:10:24 +06:00
4663babac6
[refs #90 ] redirect to right place after create
2012-07-10 21:48:11 +06:00
65c139b922
[refs #90 ] dont show empty projects
2012-07-10 19:29:10 +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
c45e599eb0
Merge pull request #560 from warpc/442-mass_build
...
[refs #442 ] Add tests for mass builds and attr_accessible. Fix ability.
2012-07-10 02:49:23 -07:00
8c5a8c884d
[issue #561 ] Some DB query optimization.
2012-07-10 01:13:55 +04:00
7b3c74e97d
[issue #561 ] Changed BuildList pages
...
* Removed mass_build, cancel and updated_at fields from list
* Added link to commit in list (instead of version)
* Added platform field in list
* Added filter by main platforms
* Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
adc917ca3b
[refs #442 ] MassBuild data initialize refactor
2012-07-09 20:13:02 +04:00
c6600054d1
[refs #442 ] Change platform and user set to platform_id and user_id
2012-07-09 17:17:02 +04:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
c1a90872db
[issue #428 ] Fixed bug with before_filter in advisory
2012-07-06 18:23:49 +04:00
49927728cd
[issue #428 ] Fetching packages moved to particular method.
2012-07-06 17:31:18 +04:00
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
69d48f000e
[issue #428 ] Removed commented code.
2012-07-05 11:36:18 +04:00
db66c7b3e1
[issue #428 ] Attempt to fix duplication in packages list
2012-07-04 22:01:06 +04:00
1c4c91df5c
[issue #428 ] Fixed attaching projects to advisory.
2012-07-04 21:38:45 +04:00
8c9cca39ef
[issue #428 ] Attempt to fix packages listing
2012-07-04 20:52:22 +04:00
02ae717af9
[issue #428 ] Fixed bug with compact! and uniq!
2012-07-04 18:57:23 +04:00
9e68dae63b
[refs #90 ] fixed autocomplete for new pull
2012-07-04 20:36:52 +06:00
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
f6cf8373e5
[issue #428 ] Removed fetching of all Advisories.
2012-07-04 17:28:43 +04:00
82612c368d
[refs #442 ] Move mass_builds to platforms dir
2012-07-04 16:15:12 +04:00
8c88e7a0da
[issue #428 ] Some code simplification.
2012-07-04 15:42:43 +04:00
4eac2a232f
[refs #442 ] Ability rights refactor. status_by_human refactor
2012-07-04 15:22:26 +04:00
7515f3515d
[issue #428 ] Fixed refs in advisory preview
2012-07-04 03:44:30 +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
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
54f3c63e68
[refs #90 ] removed logger
2012-07-04 00:17:15 +06:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06: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
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
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
46161253ab
[refs #462 ] Product status does not change
2012-06-28 19:54:58 +04:00
ce163f89a9
[refs #442 ] Add rep_name field. Add cancel builds ability
2012-06-28 19:23:33 +04:00
ef945278e8
[refs #90 ] refactoring check methods
2012-06-28 19:47:29 +06:00
10aed58bdd
[refs #442 ] Small refactor. Remove bootstrap collapse
2012-06-28 15:31:25 +04:00
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04:00
b857a2d09e
[refs #90 ] remove debug to cancan
2012-06-27 17:21:31 +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
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
651dd57044
Merge branch 'master' into 442-mass_build
2012-06-25 18:29:16 +04:00
f3bd3bbd7f
[refs #442 ] Add mass build counters ant their update. Add failed builds report generate
2012-06-22 19:10:44 +04:00
edcc0c996f
Merge branch 'master' into 442-mass_build
2012-06-22 13:20:50 +04:00
10efb2401a
[refs #442 ] Fix auto_publish select
2012-06-21 17:49:20 +04:00
5e3241a1f5
[refs #525 ] Rename erase to clear. Fix flash. Replace repository to platform in locales
2012-06-21 11:15:26 +04:00
3ebd36f6fe
[refs #525 ] Erase corrections and refactor
2012-06-20 22:02:42 +04:00
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
3d38adcb94
[issue #428 ] Added Atom feed to advisories.
2012-06-20 18:44:32 +04:00
270dbf2e9b
[refs #525 ] Add erase repository functional
2012-06-20 17:21:32 +04:00
01b8f3b5c5
[issue #428 ] Fixed typo
2012-06-20 00:32:56 +04:00
60f1f68ce1
[issue #428 ] Fixed schema.rb . Removed debug code.
2012-06-20 00:04:33 +04:00
dc8a11fa68
[refs #505 ] Merge master into 505-state_machine_migrate
2012-06-19 13:43:38 +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
cb8345a207
Rename and separate queues. Refs #510
2012-06-18 17:16:53 +03:00
73ec2ec5e9
Fix typo. Refs #510
2012-06-18 14:38:25 +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
ac7a3980cd
[refs #505 ] Pending some tests. Return set_version_and_tag. Fix post_build action
2012-06-15 20:05:55 +04:00
5e7342fbd7
[refs #505 ] Comment DJ stub. Fix event name call
2012-06-15 12:47:40 +04:00
5acc13e9a6
[ref #505 ] Refactor set_version_and_tag. Rename success and error events
2012-06-14 17:36:40 +04:00
76b261638f
Merge master into 505-state_machine_migrate
2012-06-14 10:34:55 +04:00
17815ddab2
[refs #505 ] Change start event name and move some logic to set_version_and_tag method
2012-06-13 22:33:23 +04:00
682f33a9bf
[refs #90 ] view merged status
2012-06-13 23:52:11 +06:00
9b3da14f83
[refs #505 ] Add more events and replace hand made status change
2012-06-13 21:27:35 +04:00
f37e0e54a3
[refs #510 ] Replace dj with resque
2012-06-09 16:52:29 +04:00
9af3d22153
[refs #90 ] auto close after manual merge
2012-06-09 15:09:38 +06:00
8fadbf2d41
[refs #90 ] rewrite diff
2012-06-07 23:23:28 +06:00
863213767b
[issue #428 ] Fixed typos. Removed unnecessary parts.
2012-06-05 19:58:11 +04:00
614691a737
[refs #90 ] removed index action
2012-06-05 18:10:51 +06:00
91bf65d65d
[refs #90 ] comments for pull requests (slow version)
2012-06-05 18:08:52 +06: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
4b8def5bd0
[refs #90 ] add pulls to tracker
2012-06-04 23:00:19 +06:00
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
ca72504ca2
[refs #90 ] new/show actions refactoring
2012-05-31 17:23:30 +06:00
f44b9631ad
[refs #90 ] add pull requests authorizations
2012-05-31 00:08:07 +06:00
5c9f914e4a
[refs #511 ] add issue index authorization
2012-05-30 22:03:07 +06:00
26baf999f4
[refs #90 ] diff stats
2012-05-29 23:09:43 +06: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
a446bd38e5
[refs #442 ] Filter mass builds by platform. Order them by created_at
2012-05-28 19:58:12 +04:00
df82cf69ca
[refs #442 ] Refactor mass_build
2012-05-25 21:31:57 +04:00
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
df610931d7
[refs #90 ] commits tab
2012-05-25 16:48:44 +06:00
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
e211fa2fc3
[refs #90 ] fixed errors, add validations & tests
2012-05-23 22:09:11 +06:00
e835eae50e
[refs #442 ] Remove commented code
2012-05-23 18:36:42 +04:00
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +04:00
7c45263799
[refs #442 ] Add mass build select to monitoring. Remove build lists from build_all action
2012-05-22 17:40:27 +04:00
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
d643bb3cd0
[refs #90 ] try to prevent create same pull
2012-05-21 19:24:16 +06:00
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
5133fe6bc3
Merge pull request #487 from warpc/443-tour
...
[refs #443 ] invite localization
2012-05-18 11:10:15 -07:00
aad7a3a547
[refs #443 ] invite localization
2012-05-18 22:54:57 +06:00
cd3564bb81
[refs #442 ] Add mass build model and new build_all fixes
2012-05-18 19:12:51 +04:00
b41a9e3b49
Redo project assign for build_list_packages. Redo and fix double render error during build_list publish. Refs #444 , #481
2012-05-18 00:19:57 +03:00
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
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
3e57359c96
[refs #442 ] Add mass build page functional
2012-05-17 19:20:03 +04:00
59acdf4f44
[refs #443 ] fixed setting language
2012-05-17 16:28:58 +06:00
2b5115df78
Merge pull request #477 from warpc/443-tour
...
[refs #443 ] fixed error whis empty accept languages
2012-05-16 12:02:19 -07:00
8facb45bb7
[refs #443 ] fixed error whis empty accept languages
2012-05-16 23:20:42 +06:00
f96990bd25
[refs #90 ] change view
2012-05-16 22:50:30 +06:00
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
4f7ccbb4a9
[refs #443 ] fixed preferred language
2012-05-16 15:48:42 +06:00
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
2ae66d6ae4
[refs #466 ] fixed access to project
2012-05-15 17:18:43 +06:00
06191eb12a
Quickfix for status_build. Refs #444
2012-05-15 01:15:48 +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
bd2bb2b91f
[refs #90 ] fixed merge
2012-05-12 22:34:27 +06:00
85d4489009
[refs #90 ] dont work pull
2012-05-12 00:23:09 +06:00
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
5320fc2d3e
[issue #428 ] AdvisoriesController moved from its scope
2012-05-10 21:17:59 +04:00
f8d32495b8
[issue #428 ] Added title. Changed BuildListsController#update
2012-05-10 19:15:50 +04:00
4040a486fe
[refs #90 ] fix diff
2012-05-10 18:32:54 +06: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
8819d0845a
[refs 428] Fix tests and merges missing
2012-05-05 23:26:34 +04:00
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
381ae0a8b9
[refs #90 ] diff - dont work
2012-05-05 22:57:12 +06:00
6fe0e5b530
[issue #428 ] Added AdvisoriesController & show view.
2012-05-05 02:53:45 +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
813afe53cf
[refs #90 ] minor interface changes
2012-05-04 23:13:41 +06:00
8350fc8fb1
[issue 428] Added advisory.
2012-05-04 21:12:51 +04:00
c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06:00
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
178dbdc5f0
[refs #90 ] move files
2012-05-03 23:55:08 +06: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
45cb90463a
Minor members controller refactor. Refs #263
2012-05-03 17:43:23 +03: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
377035c911
[refs #263 ] dont change/remove owner from group && tests
2012-05-03 18:25:06 +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
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
e29a4f30bb
[refs #194 ] fixed checking for AJAX requests
2012-04-25 16:42:36 +06:00
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
f1cf96baab
[refs #385 ] fixed security bug & added some tests for project archive
2012-04-25 00:10:41 +06:00
cf907c19e8
Merge branch 'master' into 263-refactoring
...
Conflicts:
app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
1934d5b553
Merge pull request #423 from warpc/347-javascript_refactoring
...
Fixed CollaboratorsController specs
2012-04-24 08:51:49 -07:00
326b35b4f8
[issue #347 ] Fixed bag with creating collaborator.
...
Before this changes if we have initialize Collaborator with project_id
and change project, Relation, incapsulated by Collaborator wasn't
changes.
2012-04-24 18:59:50 +04:00
93daa25a62
[Refs #421 ] Fix bug: autopublish build list in released platform
2012-04-24 15:15:04 +04:00
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
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
1684f4a1fc
Fix bug: could not update description in personal platform
2012-04-20 22:55:40 +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
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
cd153375dd
[refs #396 ] Devise token auth update for atom feed. Some atom feed fixes.
2012-04-18 19:15:04 +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
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
2dafd49763
[refs #396 ] Add atom feed
2012-04-17 19:01:35 +04:00
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06: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
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
26a468f6e3
[refs #223 ] Replace notified_at by updated_at
2012-04-12 16:12:06 +04:00
b281cdf65b
[refs #385 ] changed archive
2012-04-12 17:27:15 +06:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
38eb8aeee5
[refs #391 ] fixed bug when creation project
2012-04-10 15:40:38 +06:00
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
679765541e
Minor comments controller refactor. Refs #263
2012-04-05 20:21:25 +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
1ef60a3f94
[Refs #263 ] Fix copy-past evil
2012-04-03 17:14:08 +04:00
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04:00
d31d0c9672
[Refs #263 ] Refactoring repository. Add tests
2012-04-02 19:43:59 +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
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
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
265090a172
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
db/schema.rb
2012-03-31 02:41:25 +03: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
0c09568d74
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/models/group.rb
app/models/user.rb
2012-03-31 02:48:44 +04:00
71c1a4afcf
[issue #195 ] Owner removed from list of collaborators when editing list
2012-03-31 02:45:05 +04:00
3cedef5f07
Merge branch 'master' into 344-fix_products_monitoring
...
Conflicts:
db/schema.rb
2012-03-30 20:30:06 +04:00
d3c2bac226
[refs #344 ] Add product buils list filter and search
2012-03-30 15:26:28 +04:00
34011513b5
[Refs #263 ] Remove old xml-rpc API
2012-03-29 23:19:00 +04:00
39c5da2445
[Refs #263 ] Remove EasyUrpmi support
2012-03-29 23:07:38 +04: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
66c285c796
[Refs #263 ] Delete AutoBuildList
2012-03-29 22:22:48 +04:00
9a45353ccb
Merge pull request #342 from warpc/128-account-activation
...
[Refs #128 ] account activation
2012-03-29 09:09:03 -07:00
839daefc41
[refs #128 ] Small refactor of users#update action
2012-03-28 18:01:25 +04:00
9ee350b007
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
2012-03-28 02:58:03 +03:00
c9f4cf0ea4
Fix and refactor project membered abilities. Refs #195
2012-03-28 00:28:50 +03: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
7143c7a9bc
Merge pull request #343 from warpc/263-refactoring
...
[Refs #263 ] Fix comment tests; refactoring.
2012-03-27 10:13:04 -07:00
b12f120962
Strip whitespaces during search. Refs #255
2012-03-27 19:22:45 +03:00
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
a0b7f243d6
[refs #263 ] changed and fixed comment tests; some refactoring
2012-03-27 21:09:04 +06:00
f33ef75666
[refs #128 ] Add email confirmation on email change. Remove email confirmation after registration.
2012-03-27 17:45: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
6a8b8fec3a
[Refs #66 ] User builds more priority than mass rebuild with zero priority
2012-03-24 01:29:51 +04:00
115c90f03b
Merge pull request #331 from warpc/263-refactoring
...
[Refs #263 ] Fix broken tests
2012-03-23 13:49:20 -07: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
861da824d0
Redirect to project build lists after build list creation. Add more columns for product build lists. Refs #223
2012-03-23 13:58:20 +02: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
16c9e6aa24
[refs #263 ] Fix most of the failed tests
2012-03-22 19:48:28 +04:00
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
23eeb1cae7
[refs #270 ] changes in ban
2012-03-22 20:50:15 +06:00
9f23cf7727
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
385bd8034b
[refs #263 ] Fix projects#index
2012-03-22 17:30:01 +04:00
f354c53709
[refs #263 ] Merge 3.2-master into 263-refactoring
2012-03-22 17:28:09 +04:00
b7defd90f1
[refs #263 ] Remove unnessacesary projecsts#show action and test for it
2012-03-22 16:16:11 +04:00
fcc1fad0d1
[refs #270 ] fixed translations
2012-03-22 18:00:34 +06:00
71f1822fce
[refs #270 ] some refactoring
2012-03-22 17:17:11 +06:00
5b1db0e041
[refs #263 ] Fix broken projects#show test and action
2012-03-22 14:13:56 +04:00
b0eeb4f260
[refs #270 ] fix some errors
2012-03-22 14:48:33 +06:00
9e31ae75b1
[issue #195 ] Added groups support to project.
2012-03-22 04:44:05 +04:00
90e027b8a6
Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190
2012-03-21 23:52:40 +02:00
867d678dc4
[refs #270 ] some users tests
2012-03-22 02:05:27 +06: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
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
bf1340939b
[refs #270 ] fixed users filtration
2012-03-22 00:02:58 +06:00
a6a5b722d2
[refs #270 ] use devise lockable to ban
2012-03-21 23:45:51 +06:00
72c02282aa
[refs #232 ] Add mass-assignment fixes. Add create and mass-assig tests.
2012-03-21 17:52:35 +04:00
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
375aa7e74e
Merge pull request #322 from warpc/265-activity_feed_messages
...
[refs #265 ] add ajax to older messages
2012-03-21 03:50:25 -07:00
b678320638
[refs #265 ] add ajax to older messages
2012-03-21 16:29:45 +06:00
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
5c408540ff
[refs #270 ] can ban user
2012-03-21 02:06:51 +06:00
20ff998f08
[refs #270 ] user control
2012-03-21 00:12:18 +06:00
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
09fcc04489
Merge pull request #315 from warpc/200-new_build_repos_rules
...
[refs #200 ] Change build list repos and platforms interface
2012-03-20 06:02:49 -07:00
981ea7d69f
[refs #200 ] Remove debug code from build_lists controller
2012-03-20 17:01:18 +04:00
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
d5d2b7229b
[issue #279 ] Removed freeze & unfreeze actions from Platform
2012-03-19 19:03:09 +04:00
86871ab32d
Merge branch '3.2-master' into 265-activity_feed_messages
...
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
2012-03-17 01:09:04 +06:00
dd5f51de71
[refs #265 ] added build tasks feed
2012-03-16 21:37:58 +06: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
4addff059b
[refs #265 ] added activity feed tabs
2012-03-15 23:52:54 +06:00
548550d355
[issue #279 ] Added filtering to repositories projects.
2012-03-15 17:53:36 +04:00
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +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
3642163fd7
[refs #265 ] changed feed messages
2012-03-14 23:00:26 +06: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
5f6ca140d9
[refs #257 ] add ability to destroy avatar
2012-03-12 18:51:07 +06:00
64926498d6
[Refs #195 ] Fix pagination for index projects page
2012-03-12 16:05:19 +04:00
c2dc8d9e38
[issue #279 ] Added platform products list
2012-03-12 04:07:18 +04:00
61bd704cb1
[issue #279 ] Added platform repositories list.
2012-03-12 03:58:25 +04:00
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
3e344f90ad
Display only 10 last activities. Refs #265
2012-03-12 00:47:22 +02:00
19a962560a
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
c4fd73b52b
[refs #265 ] fixed double wiki feed
2012-03-12 00:28:14 +06:00
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +06:00
66b57f7a0a
[refs #265 ] fixed issue assignee
2012-03-11 17:56:56 +06:00
1cf2660cda
Fix search order. Refs #255
2012-03-08 02:32:12 +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
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
de62aaad53
[refs #257 ] fix user update registration page
2012-03-08 00:47:19 +06:00
185962890f
[refs #194 ] issue executor
2012-03-07 22:27:12 +06:00
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06: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
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06: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
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +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
b9de81f4df
[refs #194 ] managing labels in the issue
2012-03-06 21:21:13 +06:00
de6490346b
[refs #257 ] Change error messages logic. Fix avatar ru translation
2012-03-06 15:24:42 +04:00
91ba8b1543
[Refs #257 ] Fix password change, refactoring.
2012-03-05 19:36:23 +04:00
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
f58e24b134
[refs #257 ] User edit pages fixes
2012-03-03 20:03:23 +04:00
ecff8d2d41
[refs #257 ] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile
2012-03-03 13:23:30 +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
ce633f5838
Fix group owner. Refs #232
2012-03-03 03:34:24 +02:00
a0f0c24f88
Fix flash messages. Add styles. Refs #263
2012-03-03 03:05:19 +02: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
a831a4aa63
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
2012-03-03 01:43:14 +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
622d80c6d3
Merge pull request #261 from warpc/194-tracker
...
[Refs #194 ] Fix ACL and tests for issues
2012-03-02 11:48:10 -08:00
7cd3e40efc
[refs #194 ] fix accessible list
2012-03-03 01:23:45 +06:00
319fcdad86
[refs #194 ] refactoring
2012-03-03 00:21:46 +06:00
c7b412c0e0
[refs #194 ] some refactoring
2012-03-02 23:38:00 +06:00
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
41c0d1e856
[refs #194 ] fix security and tests
2012-03-02 22:52:15 +06:00
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
8677fa7493
[refs #232 ] Remove name field
2012-03-02 14:39:48 +04:00
3369953b4c
[refs #232 ] Remove unused commented code from groups controller
2012-03-02 13:46:16 +04:00
1700588b97
[refs #232 ] Merge 3.2-master into 232-new_groups_design
2012-03-02 13:44:54 +04:00
d376b55a57
[refs #232 ] Move groups locales to another files. Remove unsused commented code. On small sidebar fix
2012-03-02 12:47:16 +04:00
036dfb6dd5
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-02 02:04:04 +02:00
318dc72d29
[issue #195 ] Fixes.
...
* Added border to gutter in file preview
* Added "empty repo" message
* Fixed one of bugs with tree/branch selector
2012-03-02 02:23:53 +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
eb689b7f18
[refs #232 ] Add new design and logic refactor for group members action
2012-03-01 19:41:40 +04:00
fc3d4c0b6d
[refs #232 ] Add group members edit page design
2012-03-01 18:23:26 +04:00
55ff2c7f6b
[refs #195 ] Change new project route and some other changes
2012-03-01 16:10:12 +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
05eac4918f
Fix NoMethodError: undefined method `default_order' for ActiveRecord::Relation
2012-02-29 19:10:01 +04:00
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +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
2ec2548390
[refs #195 ] Add base design and functional to project members page
2012-02-29 01:01:25 +04:00
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
529d8d3708
Merge pull request #192 from warpc/123-activity-feed
...
[Refs #123 ] activity feed (commits notifcation not work)
2012-02-28 07:46:55 -08:00
99e3bbb762
[refs #194 ] update issue content
2012-02-28 21:41:47 +06:00
0abea8ff55
[refs #194 ] fix issues count
2012-02-28 20:28:11 +06: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
0d75a37451
[refs #194 ] show page beta version
2012-02-28 20:05:18 +06:00
66a08662c2
[refs #194 ] new styles; some changes
2012-02-28 15:23:27 +06:00
03663a8ed7
[refs #195 ] Add sections page and method to projects
2012-02-28 12:00:56 +04:00
70963d0943
Merge branch 'master' into 3.2-master
2012-02-27 22:34:21 +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
ddda2b92ab
[Refs #221 ] Delete product build lists (only in web)
2012-02-28 00:00:33 +04:00
b6a52fb840
Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
2012-02-27 21:47:05 +04:00
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
72fec3b314
[refs #195 ] Add owner choose on project create
2012-02-27 13:03:28 +04:00
46a5ab1c76
Merge branch 'master' into 123-activity-feed
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-02-24 20:44:36 +04:00
586d4e0bea
Fixed bug with Windows line endings in blob editing.
2012-02-24 20:34:41 +04:00
15f78e30a0
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-24 19:28:00 +04:00
9015b971aa
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-24 19:28:00 +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
7c273c022b
Remove raise. Refs #207
2012-02-24 19:27:59 +04:00
600df031f5
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-24 19:27:59 +04: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
5986cd6dde
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-24 19:27:55 +04:00
bab3a90155
Apply approved and rejected filters for register requests. Tune abilities. Link to user profile if user have already registered. Refs #174
2012-02-24 19:27:55 +04:00
43c896021e
[issue #64 ] Added possibility to diff and revert last commit
2012-02-24 19:27:55 +04:00
28e2494e14
[refs #123 ] Remove stubs controller
2012-02-24 15:26:50 +04:00
66fc31e404
Redo platform build_all with sleep and errors rescue. Refs #207
2012-02-23 20:32:56 +02:00
a6a51225b8
[refs #194 ] some js refactoring
2012-02-23 22:16:04 +06:00
027012d3e5
[refs #194 ] some refactotring
2012-02-23 21:57:51 +06:00
9e5e7cd5e4
[refs #194 ] labels manage
2012-02-23 20:48:46 +06:00
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
9eb191da7b
Redo clone logic. Split clone process for repositories. Optimize and refactor. Refs #207
2012-02-22 22:24:29 +02: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
5829ab87e9
Remove raise. Refs #207
2012-02-21 23:43:06 +02:00
5b29de93af
Refactor platform clone controller and routes. Refactor and fix clone process for platform, repository, product. Place XML RPC clone request to DJ. Refs #207
2012-02-21 23:27:11 +02: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
5dcc4eabf8
[refs #194 ] tracker without tags manage
2012-02-20 22:54:45 +06:00
eaa6a46a43
[refs #96 ] fixed commit subscribing
2012-02-15 19:07:56 +06:00
90c1250769
Merge pull request #186 from warpc/64-project_wiki
...
[Refs #64 ] - Fix diff for russians pages, add ability to revert last commit
2012-02-15 01:44:41 -08:00
5b7d1a79d0
[issue #64 ] Removed debug methods and unnecessary comments.
2012-02-15 02:13:52 +04:00
da0d791f74
[refs #96 ] fixed commentable & subscribeable ids
2012-02-15 02:28:01 +06: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
101fa63514
Small ActivityFeed refactoring
2012-02-14 20:46:08 +04:00
08ffd8c25d
[refs #123 ] Add wiki to ActivityFeed
2012-02-14 20:09:41 +04: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
e9c5273136
[issue #64 ] Added possibility to diff and revert last commit
2012-02-14 18:54:44 +04: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
99ee490e94
[issue #64 ] Added callback for notifications + some minor changes
2012-02-14 03:30:17 +04:00
159bf21810
Merge branch 'master' into 64-project_wiki
2012-02-14 02:29:32 +04:00
141a078cce
Merge pull request #175 from warpc/133-editing_from_web
...
[Refs #133 ] Edit files in git-repo with web editor
2012-02-13 13:07:55 -08:00
4dcc39975d
[issue #133 ] Fixed redirection bugs
2012-02-13 23:04:41 +04:00
2ca69df1cd
Merge pull request #165 from warpc/150-acl-collaborators
...
[Fix #150 ] Disable edit and update action for non-admin collaborators in projects.
2012-02-13 10:49:01 -08:00
c26962c216
[issue #133 ] Added redirects if cannot find Blob object
2012-02-13 22:45:45 +04:00
e4da6057a5
[issue #64 ] Changed authorization filters
2012-02-13 22:28:43 +04:00
99c314fb11
[issue #133 ] Merge branch 'master' into 133-editing_from_web
...
Conflicts:
db/schema.rb
2012-02-13 21:48:40 +04:00
8c0cd29f0e
[issue #133 ] Fixed bug with no acl on editing blobs
2012-02-13 19:21:00 +04:00
8417e8c16f
[issue #174 ] multiupdate in admin view.
2012-02-10 15:18:40 +04:00
a17f548168
[issue #174 ] Fixed bugs
2012-02-10 14:04:15 +04: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
ffe2608c32
[issue #133 ] Some makeup and a lot of encodings magic
2012-02-09 04:27:26 +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
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
02217752af
[refs #169 ] fix creating build list on empty repository
2012-02-08 17:07:16 +06:00
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
a83d64eaab
[refs #150 ] Fix collaborators cancan authorize
2012-02-06 19:04:56 +04:00
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
87abfb4352
[refs #64 ] fixed forbidden redirection after signin
2012-02-03 21:28:19 +06:00
a2f07fad10
Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki
2012-02-03 04:05:18 +04:00
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +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
8562b882da
Merge pull request #136 from warpc/114-comment_notifications
...
Notifications and subscribtions about new comments in commit [Refs #114 ]
2012-02-01 11:12:24 -08:00
d0717c8f9e
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
db/schema.rb
2012-02-01 22:39:04 +04:00
b117ec1331
[issue #64 ] Yet another hacks.
2012-02-01 22:33:53 +04:00
0559f1b678
[refs #127 ] Filter request refactor
2012-02-01 20:00:19 +04:00
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +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
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04:00
119c378149
[refs #114 ] change subsrcibe status to boolean
2012-01-30 17:59:57 +06: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
f7c58f6a77
[issue #64 ] Removed unnecessary files.
2012-01-30 13:12:18 +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
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
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
dc39eefe62
Revert "[refs #114 ] add js"
...
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
2e2e7e43d3
[refs #114 ] some refactoring
2012-01-30 02:18:14 +06:00
Alexander Machehin
George Vinogradov
George Vinogradov
Vladimir Sharshov
konstantin.grabar
Pavel Chipiga