Commit Graph

2256 Commits

Author SHA1 Message Date
Pavel Chipiga 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
Vladimir Sharshov 6f246b5684 Bringing the block 'My today builds' in utc 2012-04-29 01:55:20 +04:00
Alexander Machehin 3acd38790f Merge pull request #427 from warpc/universal-mass-rebuild
Universal mass rebuildfor platform onwer without hardcoded main repository or architecture
2012-04-26 03:28:15 -07:00
Vladimir Sharshov 77414b3092 Universal mass rebuildfor platform onwer without hardcoded main repository or architecture 2012-04-26 13:18:11 +04:00
Vladimir Sharshov 86328b6318 Merge pull request #426 from warpc/425-relation_refactoring
[issue #425] Changed object to actor in Relation and to eventable in EventLog (Prevent redefinition of ruby base method object_id)
2012-04-26 01:38:12 -07:00
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in
EventLog
2012-04-26 05:38:33 +04:00
Vladimir Sharshov 2a24997eb4 Allow set custom priority for mass rebuild 2012-04-24 23:03:45 +04:00
Vladimir Sharshov 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
Alexander Machehin 843ebecf71 [refs #416] fixed tests for anonymous access 2012-04-25 00:34:36 +06:00
Alexander Machehin f1cf96baab [refs #385] fixed security bug & added some tests for project archive 2012-04-25 00:10:41 +06:00
Alexander Machehin cb9588619a [refs #416] dont show zip menu for empty project 2012-04-24 22:36:52 +06:00
Pavel Chipiga cf907c19e8 Merge branch 'master' into 263-refactoring
Conflicts:
	app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
Alexander Machehin 1934d5b553 Merge pull request #423 from warpc/347-javascript_refactoring
Fixed CollaboratorsController specs
2012-04-24 08:51:49 -07:00
Alexander Machehin 064dfcae54 [refs #347] refactoring collaborator tests 2012-04-24 21:38:50 +06:00
George Vinogradov ffe94f2ba6 [issue #347] Fixed typo 2012-04-24 19:18:55 +04:00
George Vinogradov 9c9e4d8738 [issue #347] Removed unnecessary comment 2012-04-24 19:07:40 +04:00
George Vinogradov f4e23bca14 [issue #347] Fixed CollaboratorsController spec. 2012-04-24 19:02:51 +04:00
George Vinogradov 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
Vladimir Sharshov e9473f4a8a Fix static date field in build list show page 2012-04-24 18:49:46 +04:00
Vladimir Sharshov 93daa25a62 [Refs #421] Fix bug: autopublish build list in released platform 2012-04-24 15:15:04 +04:00
Vladimir Sharshov 29750da420 [Refs #396] Change name to nickname in Atom feed title 2012-04-24 15:11:03 +04:00
konstantin.grabar 90c615d373 [refs #420] Add Yandex Metrika counter 2012-04-24 13:57:03 +04:00
Pavel Chipiga 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
Pavel Chipiga 9cae595d77 Merge branch 'master' into 263-refactoring 2012-04-23 22:22:24 +03:00
Pasha 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
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
Vladimir Sharshov 64ba44ccab Merge pull request #418 from warpc/417-fix_devise_action_mailer_host_set
[refs #417] Set host for devise action mailer in application.yml
2012-04-23 07:44:14 -07:00
konstantin.grabar e984402068 [refs #417] Rename pingwinsoft configs to school 2012-04-23 18:37:12 +04:00
konstantin.grabar 95c795e3ab [refs #417] Remove http and slash symbols from action mailer hosts 2012-04-23 17:37:15 +04:00
konstantin.grabar 0ca6c76ce2 [refs #417] Make changes for devise action mailer host set 2012-04-23 16:53:30 +04:00
konstantin.grabar 89bfa8d0a9 [refs #415] Fix radio button click handler 2012-04-23 13:50:42 +04:00
George Vinogradov af18f4404f [issue #347] Fixed artefacts in Add Collaborators form. 2012-04-22 13:17:33 +04:00
Vladimir Sharshov 5431eec07d Merge branch 'master' of github.com:warpc/rosa-build 2012-04-20 22:56:06 +04:00
Vladimir Sharshov 1684f4a1fc Fix bug: could not update description in personal platform 2012-04-20 22:55:40 +04:00
Alexander Machehin 37b98e3015 [refs #396] fixing rollback 2012-04-20 22:51:12 +06:00
Vladimir Sharshov 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
George Vinogradov 678f7cc0ed [issue #347] Changed search field. 2012-04-20 00:35:31 +04:00
Pavel Chipiga 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
Pavel Chipiga 5efabc9d4e Fix atom feed urls. Refs #396 2012-04-19 20:35:35 +03:00
George Vinogradov 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
George Vinogradov f9d2baef5a [issue #347] Added filter. 2012-04-19 19:27:16 +04:00
Vladimir Sharshov 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
konstantin.grabar 714fe34883 [refs #396] Hide atom feed link from anonymus users 2012-04-19 18:37:20 +04:00
Vladimir Sharshov 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
konstantin.grabar be3daca1e6 [refs #396] Fix atom feed link tag 2012-04-19 18:06:54 +04:00
konstantin.grabar 799ba33766 [refs #396] Add token to atom feed link tag 2012-04-19 17:57:22 +04:00
konstantin.grabar def76d134d [refs #396] Fix some atom locales 2012-04-19 15:05:17 +04:00
konstantin.grabar 2fc4e2db61 [refs #396] Fix token migration. Fix atom link tag title 2012-04-19 14:50:43 +04:00
Vladimir Sharshov 0324ead59b Merge pull request #412 from warpc/408-frozen_platform
[issue #408] Fixed bug with selectbox
2012-04-18 10:39:59 -07:00
George Vinogradov 618d1ecb49 [issue #408] Fixed bug with selectbox 2012-04-18 21:31:11 +04:00