Commit Graph

146 Commits

Author SHA1 Message Date
Alexander Machehin b50d9f87d2 [refs #90] clean ability 2012-08-07 23:07:18 +06:00
Alexander Machehin fb66b74019 [refs #90] fixed pull abilities 2012-08-07 00:12:15 +06:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
konstantin.grabar f7f848e878 [refs #441] Merge master into 441-key_pairs 2012-07-31 17:16:07 +04:00
konstantin.grabar 7061696100 [refs #570] Replace :all to :everything for builds filter 2012-07-18 17:49:21 +04:00
konstantin.grabar 6430678c00 [refs #570] Add :all option for build lists visibility 2012-07-18 16:00:40 +04:00
konstantin.grabar b4059c67fc [refs #441] Add key pairs for platform 2012-07-13 15:18:12 +04:00
Alexander Machehin 26617b7739 [refs #90] add close/reopen button 2012-07-12 20:15:28 +06:00
Alexander Machehin 3290adb0b1 [refs #90] fixed merge ability 2012-07-10 22:58:39 +06:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
konstantin.grabar 1de9277e4a [refs #442] Add main? method for platforms 2012-07-10 11:06:08 +04:00
Alexander Machehin dd221cc880 [refs #90] autocomplete 2012-07-06 23:30:01 +06:00
konstantin.grabar 1f2a3b82d3 [refs #442] Add tests for mass builds and attr_accessible. Fix ability 2012-07-06 20:49:21 +04:00
konstantin.grabar 4eac2a232f [refs #442] Ability rights refactor. status_by_human refactor 2012-07-04 15:22:26 +04:00
Alexander Machehin 89abd20c95 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar 6afe8c0375 [refs #442] Merge master into 442-mass_build 2012-07-03 18:41:02 +04:00
konstantin.grabar 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
Alexander Machehin ea8775f1f7 [refs #547] remove mistake condition 2012-07-03 16:42:58 +06:00
konstantin.grabar 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
konstantin.grabar 004f603e02 [refs #442] Add new actions rights. Cancel build list btn rights fix 2012-06-29 23:10:18 +04:00
Alexander Machehin ae4c8a6a5e [refs #90] fixed lost data after merge 2012-06-28 16:44:55 +06:00
Alexander Machehin ce0ff70561 [refs #90] fixed errors 2012-06-27 16:47:08 +06: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
Vladimir Sharshov 96d284d5ee Merge pull request #533 from warpc/531-fix_users_role
[refs #531] Changed the rules for granting user rights in the project
2012-06-26 05:44:16 -07:00
Alexander Machehin 6aa9cfaa50 [refs #90] view pull status 2012-06-25 22:04:43 +06:00
konstantin.grabar baec8a1016 [refs #525] Fix clear action rights 2012-06-25 18:26:01 +04:00
Alexander Machehin d2f4135065 [refs #531] refactoring 2012-06-21 15:49:39 +06:00
Alexander Machehin 93ec9a135d [refs #531] some refactoring and model tests 2012-06-21 00:10:27 +06:00
konstantin.grabar 3ebd36f6fe [refs #525] Erase corrections and refactor 2012-06-20 22:02:42 +04:00
Alexander Machehin 4d91ea1d6e [refs #531] fixed user roles 2012-06-20 23:59:47 +06:00
konstantin.grabar 270dbf2e9b [refs #525] Add erase repository functional 2012-06-20 17:21:32 +04:00
Pavel Chipiga ec21c042dd Fix and refactor active menu. Refs #207 2012-06-09 19:04:06 +03:00
George Vinogradov e7c0eab736 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov 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
konstantin.grabar 526bdbe60f [refs #510] Resque sinatra app secure 2012-05-31 17:36:41 +04:00
Alexander Machehin f44b9631ad [refs #90] add pull requests authorizations 2012-05-31 00:08:07 +06:00
Alexander Machehin 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
konstantin.grabar 43e95b565e [refs #442] Change build_all button to mass_builds 2012-05-23 20:27:06 +04:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06:00
Vladimir Sharshov aceb9e61fc Rename is_rpm to is_package in ability.rb 2012-05-18 01:07:04 +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
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
Alexander Machehin ff016efe1c [refs #90] choose project 2012-05-14 23:09:18 +06:00
Alexander Machehin 944626d59a [refs #455] add ability for build lists 2012-05-14 16:51:08 +06:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +06:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +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
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