c5731ff8dd
[refs #90 ] fixed merging errors
2012-05-04 16:56:11 +06:00
fa027d8486
Merge pull request #432 from warpc/263-refactoring
...
Исправление роутов групп
2012-05-04 03:49:42 -07: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
b1b5363972
Fix deploy. Redo main group route. Refs #263
2012-05-03 19:48:22 +03:00
72e3eaf1a1
Minor design fix. Refs #263
2012-05-03 18:56:33 +03: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
f3cc6a03a5
[refs #263 ] dont show owner in the group members list
2012-05-03 18:34:30 +06: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
eec083dc8b
[refs #90 ] fixed tests
2012-05-02 21:36:39 +06:00
30ac14a413
Merge branch '90-pull' of github.com:warpc/rosa-build into 90-pull
...
Conflicts:
app/models/project.rb
app/models/pull_request.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
spec/models/pull_request_spec.rb
2012-05-02 15:18:56 +06:00
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
6f246b5684
Bringing the block 'My today builds' in utc
2012-04-29 01:55:20 +04: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
e29a4f30bb
[refs #194 ] fixed checking for AJAX requests
2012-04-25 16:42:36 +06:00
2a24997eb4
Allow set custom priority for mass rebuild
2012-04-24 23:03:45 +04: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
cb9588619a
[refs #416 ] dont show zip menu for empty project
2012-04-24 22:36:52 +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
9c9e4d8738
[issue #347 ] Removed unnecessary comment
2012-04-24 19:07:40 +04: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
e9473f4a8a
Fix static date field in build list show page
2012-04-24 18:49:46 +04:00
93daa25a62
[Refs #421 ] Fix bug: autopublish build list in released platform
2012-04-24 15:15:04 +04:00
29750da420
[Refs #396 ] Change name to nickname in Atom feed title
2012-04-24 15:11:03 +04:00
90c615d373
[refs #420 ] Add Yandex Metrika counter
2012-04-24 13:57:03 +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
9cae595d77
Merge branch 'master' into 263-refactoring
2012-04-23 22:22:24 +03:00
0c8f8e14a6
Merge pull request #419 from warpc/347-javascript_refactoring
...
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-23 12:21:00 -07: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
598c072a80
[refs #90 ] add already state
2012-04-23 23:34:11 +06:00
a37bf7b50a
Revert "[refs #90 ] more security"
...
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-23 23:34:11 +06:00
41fb4f2700
[refs #90 ] more security
2012-04-23 23:34:11 +06:00
fda1a847f5
[refs #90 ] some tests and questions
2012-04-23 23:34:10 +06:00
58776a6e9e
[refs #90 ] fixing pull methods
2012-04-23 23:34:10 +06:00
71fdaa4e4d
[refs #90 ] initial
2012-04-23 23:34:10 +06:00
c0d2d67c73
Merge branch 'master' into 263-refactoring
...
Conflicts:
Gemfile
Gemfile.lock
config/routes.rb
2012-04-23 17:58:45 +03:00
89bfa8d0a9
[refs #415 ] Fix radio button click handler
2012-04-23 13:50:42 +04:00
af18f4404f
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-22 13:17:33 +04:00
1684f4a1fc
Fix bug: could not update description in personal platform
2012-04-20 22:55:40 +04:00
25bd2a6e77
[refs #90 ] issue status -> state
2012-04-20 23:19:23 +06:00
5dc8a4ead1
[refs #90 ] add already state
2012-04-20 22:23:28 +06:00
61a27bbb7d
Revert "[refs #90 ] more security"
...
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-20 21:17:43 +06:00
24922cc43c
Merge pull request #388 from warpc/347-javascript_refactoring
...
[issue #347 ] Union users and groups into one table in collaborators page. Use backbone(JS framework) for it. Improve UI for collaborators page (AJAX).
2012-04-20 08:15:12 -07:00
aa83c14165
[refs #90 ] more security
2012-04-20 17:38:19 +06:00
678f7cc0ed
[issue #347 ] Changed search field.
2012-04-20 00:35:31 +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
b1365fc567
[refs #90 ] some tests and questions
2012-04-20 01:09:00 +06:00
5efabc9d4e
Fix atom feed urls. Refs #396
2012-04-19 20:35:35 +03:00
c66931d347
[refs #90 ] fixing pull methods
2012-04-19 21:57:42 +06:00
d48a3413cc
[refs #90 ] initial
2012-04-19 21:57:41 +06: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
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
02095e62c1
Merge pull request #413 from warpc/396-rss_atom_feed
...
[Refs #396 ] Hide atom feed link from anonymus users
2012-04-19 07:47:29 -07:00
714fe34883
[refs #396 ] Hide atom feed link from anonymus users
2012-04-19 18:37:20 +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
be3daca1e6
[refs #396 ] Fix atom feed link tag
2012-04-19 18:06:54 +04:00
799ba33766
[refs #396 ] Add token to atom feed link tag
2012-04-19 17:57:22 +04:00
2fc4e2db61
[refs #396 ] Fix token migration. Fix atom link tag title
2012-04-19 14:50:43 +04:00
0324ead59b
Merge pull request #412 from warpc/408-frozen_platform
...
[issue #408 ] Fixed bug with selectbox
2012-04-18 10:39:59 -07:00
618d1ecb49
[issue #408 ] Fixed bug with selectbox
2012-04-18 21:31:11 +04: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
9566855110
[issue #347 ] Added missed lib
2012-04-18 16:17:11 +04:00
3e4eba7f9d
Merge pull request #411 from warpc/408-frozen_platform
...
[issue #408 ] Allow publish build list in released platform only for platform members. Add rejected function for bs.
2012-04-18 04:17:32 -07:00
9d96b2b565
[issue #408 ] Removed comment.
2012-04-18 14:46:34 +04:00
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +04:00
2dafd49763
[refs #396 ] Add atom feed
2012-04-17 19:01:35 +04:00
644b95d5bd
Fuuu!
...
Revert "[refs #385 ] removed dublicate ability"
This reverts commit 72de5731722f0a5b7110983ecb97cba1beda3056.
2012-04-17 19:52:52 +06:00
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
05ec6cbac3
[refs #385 ] removed dublicate ability
2012-04-17 16:21:45 +06:00
2716c19635
[refs #385 ] add anonymous access to project archive
2012-04-17 16:18:03 +06:00
3d1ef0ce4c
Merge pull request #406 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Move project version to right column and change fields order
2012-04-17 02:42:20 -07:00
31d9f54743
[refs #223 ] Move project version to right column
2012-04-17 13:37:09 +04:00
1b871bf6dd
[refs #404 ] Remove downloads statistics functional
2012-04-17 12:23:58 +04:00
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
eb95492073
Merge pull request #402 from warpc/401-build_list_links_filter_on_home
...
[refs #401 ] Fix build lists link filter on home page
2012-04-16 10:08:11 -07:00
c339f2aee0
Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
07cc2db49e
Merge pull request #399 from warpc/194-assignee_and_user
...
[refs #194 ] Move user_id to assignee_id and creator_id to user_id, because user_id in project used only as author.
2012-04-16 09:39:23 -07:00
d24422f757
[refs #223 ] Add branch auto select
2012-04-16 20:06:34 +04:00
d4aa61e81b
[refs #401 ] Fix build lists link filter on home page
2012-04-16 12:18:07 +04: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
c1ddc2204f
Fix scopes. Refs #223
2012-04-14 01:27:24 +03:00
afbfbcd9e4
[Refs #223 ] Fix time calculation
2012-04-14 01:20:56 +04:00
2c0f047b38
[Refs #223 ] Fix errors and tests
2012-04-14 00:49:29 +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
42967381b6
[refs #223 ] some refactoring
2012-04-14 00:26:34 +06:00
652bc9c471
[Refs #223 ] Fix update_attributes for project
2012-04-13 21:00:43 +04:00
100a166699
[Refs #223 ] Refactoring for pull request
2012-04-13 17:24:43 +04:00
8ffc6be347
Merge branch '223-change_build_lists_new_js_handlers' into 223-build_list_notify_and_duration_updates
...
Conflicts:
app/models/build_list.rb
config/locales/models/build_list.en.yml
config/locales/models/build_list.ru.yml
2012-04-13 17:21:30 +04:00
d8edf8e673
Merge pull request #397 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add build list duration
2012-04-13 05:25:20 -07:00
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
36447051ec
[Refs #223 ] Small refactoring for pull request
2012-04-13 13:48:57 +04: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
65f1cfc822
[refs #223 ] Add current duration and project average build time
2012-04-12 18:55:32 +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
742603ab7e
[refs #223 ] Add build list duration
2012-04-12 14:29:04 +04:00
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
d2612e63b6
Merge pull request #394 from warpc/353-fork_popup
...
[refs #353 ] always show fork popup and disabling fork button after click
2012-04-10 12:03:38 -07:00
7a8de3e1f4
[refs #353 ] disabling fork button after click
2012-04-11 00:48:13 +06:00
27f2be079d
[refs #353 ] always show fork popup
2012-04-11 00:05:06 +06:00
6706d27712
Merge pull request #393 from warpc/263-refactoring
...
Исправление восстановления пароля
2012-04-10 10:29:10 -07:00
68b3446747
Fix password restore routes. Change input field type. Refs #263
2012-04-10 20:12:30 +03:00
442b44a68e
[issue #347 ] Added not_member_of scope. Added ActsLikeMember module
2012-04-10 19:45:38 +04:00
f0b9cabefa
[Refs #223 ] Change order for version select in build list creation page.
2012-04-10 19:45:18 +04:00
4ba17be536
[refs #223 ] fixed rendering fork button
2012-04-10 20:15:15 +06:00
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
f7e09c993d
[refs #223 ] Optimise code by jQuery chains
2012-04-10 17:15:48 +04:00
3cff036508
[refs #223 ] Add new build btn to project page
2012-04-10 17:07:09 +04:00
207be85ff4
[refs #223 ] Add group select to versions
2012-04-10 16:03:33 +04:00
38eb8aeee5
[refs #391 ] fixed bug when creation project
2012-04-10 15:40:38 +06:00
d6dc51ba93
[refs #223 ] Choosen rep auto set
2012-04-10 13:05:42 +04:00
6d4f94e2c4
Merge pull request #389 from warpc/353-fork
...
[Refs #353 ] can fork project to group
2012-04-09 12:46:15 -07:00
5b884e9d40
[refs #223 ] Remove comment
2012-04-09 23:26:22 +04:00
5658707fe1
[refs #353 ] divide long string
2012-04-10 00:13:42 +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
6ccf7e8456
[refs #223 ] Change js handlers and some inputs logics
2012-04-09 18:33:51 +04:00
e491b8bfb4
Merge pull request #382 from warpc/358-git_help_info_div
...
[refs #358 ] Add git clone repo help hint
2012-04-05 13:23:13 -07:00
96b3c831b7
[refs #358 ] br -> p
2012-04-06 02:21:19 +06:00
679765541e
Minor comments controller refactor. Refs #263
2012-04-05 20:21:25 +03: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
4bb8a38fbb
Merge pull request #376 from warpc/263-dj
...
[Refs #295 ] Customized DJ jobs and workers:
* set priority to delayed jobs;
* 4 workers to dj;
* division init bare & fork.
2012-04-05 06:54:28 -07:00
6d5cee2c04
[refs #383 ] added ability to destroy project
2012-04-05 17:36:53 +06:00
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04: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
a6ec36086c
[Refs #263 ] Refactoring ProductBuildList. Add tests
2012-04-04 00:56:21 +04:00
f4937559a6
Merge pull request #378 from warpc/263-product_refactoring
...
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 06:56:46 -07:00
1ef60a3f94
[Refs #263 ] Fix copy-past evil
2012-04-03 17:14:08 +04:00
fe053537c3
[ fixed #377 ] Fixed Group.by_admin scope.
2012-04-03 17:08:22 +04:00
d382732e68
[Refs #263 ] Refactoring product. Add tests.
2012-04-03 16:21:39 +04: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
Alexander Machehin
Pavel Chipiga
Vladimir Sharshov
George Vinogradov
konstantin.grabar
Pasha