Commit Graph

2190 Commits

Author SHA1 Message Date
Alexander Machehin 381ae0a8b9 [refs #90] diff - dont work 2012-05-05 22:57:12 +06:00
Alexander Machehin 813afe53cf [refs #90] minor interface changes 2012-05-04 23:13:41 +06:00
Alexander Machehin c5731ff8dd [refs #90] fixed merging errors 2012-05-04 16:56:11 +06:00
Alexander Machehin 178dbdc5f0 [refs #90] move files 2012-05-03 23:55:08 +06:00
Alexander Machehin 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
Pavel Chipiga 72e3eaf1a1 Minor design fix. Refs #263 2012-05-03 18:56:33 +03:00
Alexander Machehin 4def449a6d Merge pull request #431 from warpc/263-refactoring
Github style URLs and refactor
2012-05-03 08:43:29 -07:00
Pavel Chipiga 45cb90463a Minor members controller refactor. Refs #263 2012-05-03 17:43:23 +03:00
Pavel Chipiga 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
Alexander Machehin f3cc6a03a5 [refs #263] dont show owner in the group members list 2012-05-03 18:34:30 +06:00
Alexander Machehin 377035c911 [refs #263] dont change/remove owner from group && tests 2012-05-03 18:25:06 +06:00
Alexander Machehin 9e5db741d3 Merge branch 'master' into 90-pull
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-05-02 23:08:24 +06:00
Alexander Machehin eec083dc8b [refs #90] fixed tests 2012-05-02 21:36:39 +06:00
Alexander Machehin 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
Pavel Chipiga 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
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 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06: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
Alexander Machehin e29a4f30bb [refs #194] fixed checking for AJAX requests 2012-04-25 16:42:36 +06: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
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
Alexander Machehin 598c072a80 [refs #90] add already state 2012-04-23 23:34:11 +06:00
Alexander Machehin a37bf7b50a Revert "[refs #90] more security"
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
2012-04-23 23:34:11 +06:00
Alexander Machehin c75ebc4896 [refs #90] removed task 2012-04-23 23:34:11 +06:00
Alexander Machehin 41fb4f2700 [refs #90] more security 2012-04-23 23:34:11 +06:00
Alexander Machehin fda1a847f5 [refs #90] some tests and questions 2012-04-23 23:34:10 +06:00
Alexander Machehin 58776a6e9e [refs #90] fixing pull methods 2012-04-23 23:34:10 +06:00