Commit Graph

303 Commits

Author SHA1 Message Date
Alexander Machehin dcea458198 [refs #719] add some specs 2013-01-28 22:42:00 +06:00
Alexander Machehin 643e163652 [refs #847] refactoring 2013-01-24 19:09:26 +06:00
Vokhmin Alexey V 26a37c2516 #794: fix for failed specs, refactoring 2013-01-18 20:14:10 +04:00
Vokhmin Alexey V 5c9b3b5acc #794: add spec for ProjectToRepository model 2013-01-18 19:42:32 +04:00
Vokhmin Alexey V 04b71106ab #794: fix for specs 2013-01-18 16:57:45 +04:00
Vokhmin Alexey V 097ffacf61 #794: merge master into branch 2013-01-16 19:07:39 +04:00
Alexander Machehin 02839c8cff [refs #829] fix & add specs 2013-01-11 20:01:10 +06:00
Vokhmin Alexey V b2b16950c0 #814: refactoring of specs 2012-12-26 21:30:27 +04:00
Vokhmin Alexey V 0d03ebcdab #814: update secs 2012-12-26 18:02:56 +04:00
Vokhmin Alexey V 1d2956419e #814: add validation for checking that repository contains project, update specs 2012-12-26 17:06:17 +04:00
Vokhmin Alexey V f0b9d23bc2 Merge branch 'master' into 794-move-all-keys-into-abf-bd 2012-12-25 18:24:01 +04:00
Alexander Machehin 4893817dc7 fix broken test because of 9cf84c045a 2012-12-25 19:11:24 +06:00
Vokhmin Alexey V 577b71a62e #794: rename errors: "contains_<secret|public>_key" to "wrong_<secret|public>_key" 2012-12-24 17:58:46 +04:00
Vokhmin Alexey V 597fb03374 #794: small fix, update specs 2012-12-24 14:53:20 +04:00
Vokhmin Alexey V 0ad9932561 #794: fixes for failed specs 2012-12-20 22:50:55 +04:00
Vokhmin Alexey V c72968ba2a #794: add validation for length of key 2012-12-20 21:36:32 +04:00
Vokhmin Alexey V 09731e041e #794: add specs for KeyPair model 2012-12-20 20:21:43 +04:00
Vokhmin Alexey V a09699fc03 #794: merge master into branch 2012-12-20 19:33:14 +04:00
Alexander Machehin b5069e6582 [refs #777] fix models specs (bug with gap_repo.git) 2012-12-18 23:53:00 +06:00
Alexander Machehin 30a467a3e1 [refs #777] add issue specs 2012-12-17 16:39:53 +06:00
Vokhmin Alexey V c08d99ffbb #778: update TimeLiving class 2012-12-13 23:23:34 +04:00
Vokhmin Alexey V 7528b05715 #778: some refactoring, fix specs 2012-12-13 23:14:18 +04:00
Alexander Machehin f779ae417b fixed comment specs 2012-12-13 17:30:49 +06:00
Alexander Machehin e9ac67de5f Fix validations for groups, platforms, projects, repositories,
users
2012-11-07 16:25:43 +06:00
Alexander Machehin 36ac66303a fixed user uname validation 2012-11-07 15:30:34 +06:00
Vokhmin Alexey V fae5d3ff2b #690: truncate project name before validation 2012-10-15 12:28:18 +04:00
Alexander Machehin 5bc59ad365 [refs #90] fixed pull tests 2012-10-03 18:18:02 +06:00
Vokhmin Alexey V cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00
Vokhmin Alexey V 96165b9e87 #90: fixed specs for pull request model 2012-10-01 16:29:36 +04:00
Alexander Machehin abafbc6ef5 Merge again-and-again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-09-28 00:09:34 +06:00
Vladimir Sharshov a20e1552cc [refs #374] Fix test, small refactoring. 2012-09-27 16:13:59 +04:00
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Vokhmin Alexey V 17bdcf9a3c updated model according to last comments, added new specs 2012-09-19 23:52:18 +04:00
Vokhmin Alexey V 45a72d4797 fiexed unnecessary output to console 2012-09-19 18:30:35 +04:00
Vokhmin Alexey V 426eb72d5f moved #notify_users method from observer to model, updated specs 2012-09-19 17:55:17 +04:00
Vokhmin Alexey V 127a1bd942 fix build_list_observer spec 2012-09-18 18:26:02 +04:00
Vokhmin Alexey V 97fcb0fcff #575: extra change 2012-09-18 13:32:07 +04:00
Vokhmin Alexey V 7fab337b7d #575: added new spec, updated comments 2012-09-18 13:29:10 +04:00
Vokhmin Alexey V 9c801e04b0 #575: small refactoring specs 2012-09-18 13:11:23 +04:00
Vokhmin Alexey V 7ea856686e #575: added some specs 2012-09-18 01:11:28 +04:00
Vokhmin Alexey V 4a071f88a3 #641: added specs 2012-09-12 19:36:00 +04:00
Vladimir Sharshov 29f5ef5f2e Refactoring tests 2012-09-07 13:41:49 +04:00
Vladimir Sharshov 5a2827c433 [refs #263] Refactoring maintainers controller spec 2012-09-06 22:48:36 +04:00
Vladimir Sharshov 698e55e3e8 [refs #263] Test refactoring 2012-09-06 14:53:03 +04:00
Pavel Chipiga 0ff8f92b62 Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263 2012-08-15 16:52:32 +03:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
konstantin.grabar 8e05c0222d [refs #374] Fix key pairs tests 2012-07-31 20:06:57 +04:00
Vladimir Sharshov 43309d86e6 Merge branch 'master' into 441-key_pairs, fix schema, add migration
Conflicts:
	db/schema.rb
2012-07-31 02:02:15 +04:00
Alexander Machehin 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
Pavel Chipiga fb60dac748 Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-07-27 00:19:36 +03:00
Vladimir Sharshov 606609dea6 Merge pull request #580 from warpc/576-flash_notifies
[refs #576] Add flash notifies
2012-07-25 12:18:44 -07:00
Pavel Chipiga 03509e714c Merge branch 'master' into 263-refactoring 2012-07-25 21:42:48 +03:00
Alexander Machehin a0a4c8b100 [refs #581] dont destroy child projects 2012-07-24 22:02:02 +06:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
konstantin.grabar 3a183e0dc3 [refs #441] Remove unused files. Add mass assigment specs 2012-07-17 13:31:32 +04:00
Pavel Chipiga 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
konstantin.grabar b4059c67fc [refs #441] Add key pairs for platform 2012-07-13 15:18:12 +04:00
Alexander Machehin 89abd20c95 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-07-03 21:22:10 +06:00
Alexander Machehin ea8775f1f7 [refs #547] remove mistake condition 2012-07-03 16:42:58 +06:00
Vladimir Sharshov 7561abca08 [refs #462] refactoring: remove notified_at 2012-06-28 21:40:32 +04:00
Alexander Machehin 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
Alexander Machehin d5a6b47be3 [refs #531] user best role tests 2012-06-21 20:19:44 +06:00
Alexander Machehin a033e3192e [refs #531] fixed tests 2012-06-21 16:35:02 +06:00
Alexander Machehin 93ec9a135d [refs #531] some refactoring and model tests 2012-06-21 00:10:27 +06:00
Alexander Machehin 9af3d22153 [refs #90] auto close after manual merge 2012-06-09 15:09:38 +06:00
Alexander Machehin f6bfb38e79 [refs #90] fixed tests 2012-06-08 18:44:44 +06:00
Alexander Machehin e211fa2fc3 [refs #90] fixed errors, add validations & tests 2012-05-23 22:09:11 +06:00
Alexander Machehin 0c89ca6575 [refs #90] broken tests 2012-05-23 00:23:00 +06:00
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06:00
konstantin.grabar cd3564bb81 [refs #442] Add mass build model and new build_all fixes 2012-05-18 19:12:51 +04:00
Alexander Machehin 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
konstantin.grabar da70a11aab [refs #438] Repair arch factory and rename rsync stub method 2012-05-16 19:29:28 +04:00
George Vinogradov 9a0f582a16 [issue #428] Fixed typo in PlatformsHelper 2012-05-10 20:04:48 +04:00
Vladimir Sharshov 8819d0845a [refs 428] Fix tests and merges missing 2012-05-05 23:26:34 +04:00
George Vinogradov 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
George Vinogradov 8350fc8fb1 [issue 428] Added advisory. 2012-05-04 21:12:51 +04: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
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
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06: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 598c072a80 [refs #90] add already state 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
Alexander Machehin 71fdaa4e4d [refs #90] initial 2012-04-23 23:34:10 +06:00
Alexander Machehin 5dc8a4ead1 [refs #90] add already state 2012-04-20 22:23:28 +06:00
Alexander Machehin b1365fc567 [refs #90] some tests and questions 2012-04-20 01:09:00 +06:00
Alexander Machehin c66931d347 [refs #90] fixing pull methods 2012-04-19 21:57:42 +06:00
Alexander Machehin d48a3413cc [refs #90] initial 2012-04-19 21:57:41 +06:00
Vladimir Sharshov dcdea4b8d3 [Refs #404] Remove downloads statistics functional (db and tests) 2012-04-17 17:56:44 +04:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
konstantin.grabar 742603ab7e [refs #223] Add build list duration 2012-04-12 14:29:04 +04:00
Pavel Chipiga 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
Vladimir Sharshov a6ec36086c [Refs #263] Refactoring ProductBuildList. Add tests 2012-04-04 00:56:21 +04:00
Vladimir Sharshov d382732e68 [Refs #263] Refactoring product. Add tests. 2012-04-03 16:21:39 +04:00
Vladimir Sharshov d31d0c9672 [Refs #263] Refactoring repository. Add tests 2012-04-02 19:43:59 +04:00
Vladimir Sharshov 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
Pavel Chipiga 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
Pavel Chipiga 050398c39f Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-03-30 00:02:59 +03:00
Pavel Chipiga 583918fa68 Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263 2012-03-29 23:34:22 +03:00
Vladimir Sharshov 4dd97d8c63 [Refs #263] Remove xml-rpc gem, clear CanCan abilities and tests 2012-03-30 00:24:45 +04:00
Vladimir Sharshov 66c285c796 [Refs #263] Delete AutoBuildList 2012-03-29 22:22:48 +04:00
Alexander Machehin c2960b7083 [refs #263] fixed commentable accessibility 2012-03-27 22:45:07 +06:00
Alexander Machehin a0b7f243d6 [refs #263] changed and fixed comment tests; some refactoring 2012-03-27 21:09:04 +06:00
Vladimir Sharshov 115c90f03b Merge pull request #331 from warpc/263-refactoring
[Refs #263] Fix broken tests
2012-03-23 13:49:20 -07:00
konstantin.grabar 1680b949f5 [refs #263] Fix personal repositories and CanCan platform tests 2012-03-23 15:29:25 +04:00
Pavel Chipiga 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
konstantin.grabar 16c9e6aa24 [refs #263] Fix most of the failed tests 2012-03-22 19:48:28 +04:00
Alexander Machehin 6d330d9164 [refs #265] fixed tests to issue comments 2012-03-22 16:16:31 +06:00
konstantin.grabar 72c02282aa [refs #232] Add mass-assignment fixes. Add create and mass-assig tests. 2012-03-21 17:52:35 +04:00
konstantin.grabar aa4bd2c1bc [refs #232] Add groups tests 2012-03-20 19:40:49 +04:00
Pavel Chipiga 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
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
George Vinogradov fe46e53ad8 [issue #195] Many changes.
*  Base presenter moved to lib
  *  Added diff display
  *  Changes in some views

TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
Alexander Machehin 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
Pavel Chipiga 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
Pavel Chipiga 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
Alexander Machehin 027012d3e5 [refs #194] some refactotring 2012-02-23 21:57:51 +06:00
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
Alexander Machehin ecb29d1762 [refs #194] tags -> labels 2012-02-22 02:28:04 +06:00
Pavel Chipiga 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
Alexander Machehin 0ce76207af [refs #194] Add issue tags 2012-02-21 00:41:40 +06:00
Alexander Machehin da0d791f74 [refs #96] fixed commentable & subscribeable ids 2012-02-15 02:28:01 +06:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Alexander Machehin aa9652409c [refs #114] clean 2012-02-01 01:15:53 +06:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin 119c378149 [refs #114] change subsrcibe status to boolean 2012-01-30 17:59:57 +06:00
Alexander Machehin 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
Alexander Machehin 8962e85b2d [refs #114] fix reverting 2012-01-30 12:38:31 +06:00
Alexander Machehin 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
Alexander Machehin 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
Alexander Machehin dc39eefe62 Revert "[refs #114] add js"
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin ea7cbe1908 Revert "[refs #114] fix emails uniqueness"
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.

Conflicts:

	app/models/subscribe.rb
	app/models/user_email.rb
2012-01-30 12:15:33 +06:00
Alexander Machehin 2e2e7e43d3 [refs #114] some refactoring 2012-01-30 02:18:14 +06:00
Alexander Machehin 39a4479fa3 [refs #114] fix emails uniqueness 2012-01-29 22:27:46 +06:00
Pavel Chipiga 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
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
2012-01-26 14:55:16 +06:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
Alexander Machehin 4cca8f7bb1 [refs #114] some refactoring 2012-01-25 23:33:26 +06:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 61be317b21 [refs #114] i18n 2012-01-25 01:00:51 +06:00
Alexander Machehin 6582a9afa5 [refs #114] fix tests 2012-01-24 18:15:56 +06:00