Commit Graph

265 Commits

Author SHA1 Message Date
Vokhmin Alexey V 973fabb31f #880: add option "Publish again" for build list 2013-02-01 18:39:17 +04:00
Alexander Machehin 18d0af9749 [refs #868] add ability to create a container to admins of the platform 2013-01-30 14:55:09 +06:00
Vokhmin Alexey V 0de439e9cb hot fix 2013-01-25 21:42:33 +04:00
Vokhmin Alexey V eec4ec95a7 update ability.rb 2013-01-25 21:41:48 +04:00
Vokhmin Alexey V f4c3d23d7c create container for BuildList 2013-01-25 21:24:46 +04:00
Vokhmin Alexey V c6f13c60b7 #794: small refactoring 2013-01-16 19:16:42 +04:00
Vokhmin Alexey V da4860bc45 #794: add #key_pair action, add new specs 2012-12-20 23:46:16 +04:00
Vladimir Sharshov c677e37c20 Merge pull request #763 from warpc/759-stop-and-delete-action-for-build-list
[refs #759]: cancel ProductBuildList and BuildList;
refactroing ProductBuildList; add new user role "tester"; set timeout for workers to 12 hours; refactoring worker_observers
2012-12-07 03:58:57 -08:00
Alexander Machehin dc1525b85e [refs #762] add mass build from list 2012-12-06 23:59:17 +06:00
Vokhmin Alexey V ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04:00
Vokhmin Alexey V abbbacdf7f update ability.rb, add new specs 2012-11-13 15:11:33 +04:00
Vokhmin Alexey V e9fd2a2df6 Merge branch 'master' into 706-get-list-of-projects-by-repository 2012-10-19 18:51:11 +04:00
Vokhmin Alexey V ba968cc5a0 #706: updated Ability model, Repositories controller, added specs 2012-10-19 18:49:01 +04:00
Alexander Machehin 6c8c1ca880 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
Vokhmin Alexey V 97590f06a0 #686: added specs for projects API 2012-10-17 21:08:21 +04:00
Vokhmin Alexey V c36ae5413b #692: added specs for Group API 2012-10-16 18:44:21 +04:00
Alexander Machehin 938a8a0ad1 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/views/projects/pull_requests/_pull_diff.html.haml
	app/views/projects/wiki/_diff_data.html.haml
2012-10-16 00:19:22 +06:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vokhmin Alexey V 07bf8f1d0f fixed missprint 2012-10-09 17:54:17 +04:00
Vokhmin Alexey V 1e2d41b183 updated Ability model 2012-10-09 17:50:09 +04:00
Vokhmin Alexey V d83243a3a3 hot fix for API 2012-10-09 17:47:05 +04:00
Alexander Machehin 80a91b21a9 [refs #579] fixed bug with new_line access 2012-10-05 18:32:56 +06:00
Alexander Machehin 2360a25a42 [refs #579] fixed many errors 2012-10-05 17:02:25 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
Alexander Machehin 21a5115137 [refs #579] fixed destroing comments 2012-10-05 12:13:14 +06:00
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Alexander Machehin 94029c3cda [refs #90] base -> to, head -> from 2012-10-03 17:58:34 +06:00
Vladimir Sharshov d2c338e4e4 Merge pull request #665 from warpc/90-ui
[refs #90] pull request ui + fixes
2012-10-02 10:41:06 -07:00
Vokhmin Alexey V ecae06db81 #349: removed duplicate of ability 2012-10-02 21:16:55 +04:00
Vokhmin Alexey V cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00
Alexander Machehin f699add7b4 [refs #90] clean ability 2012-10-02 22:46:51 +06:00
Alexander Machehin 53b421d8e5 [refs #90] fixed pull ability for project writers & changing tests 2012-10-02 21:19:50 +06:00
Vokhmin Alexey V c7fda1a810 #349: updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page 2012-10-02 19:14:08 +04:00
Alexander Machehin d36155ec7f [refs #90] remove useless abilities 2012-10-02 19:24:53 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06: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
Alexander Machehin f579fc007a [refs #90] fixed ability for pulls 2012-09-28 00:00:04 +06:00
Alexander Machehin 2b4e2f03e5 Merge pull request #585 from warpc/374-rest_api_for_builds
[refs #374] Add json responses for build lists api
2012-09-27 07:00:19 -07:00
Vladimir Sharshov 77b57cce11 [refs #374] Fix support http basic auth, fix tests, fix abilities. 2012-09-26 21:15:11 +04:00
Alexander Machehin cc05fa695a [refs #90] fixed pull abilities part 2 2012-09-26 23:09:29 +06:00
Alexander Machehin 3491492c8d [refs #90] fixed pull authorization 2012-09-26 15:24:46 +06: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
Alexander Machehin a29a2f8fe9 [refs #616] change ability for preview 2012-09-25 15:46:19 +06:00
konstantin.grabar 11c428ec20 [refs #374] Fix failed tests after http basic auth 2012-09-21 23:48:30 +04:00
konstantin.grabar e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +04:00
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Vokhmin Alexey V aadfb39682 #638: added access to add/remove member to repository for owner and local_admin 2012-09-12 16:17:51 +04:00
Vokhmin Alexey V 1f32e72508 #638: added access to remove_project for members of repository 2012-09-12 00:43:08 +04:00
Vokhmin Alexey V 96466b808b #638: fixed ability model 2012-09-12 00:40:16 +04:00
Vokhmin Alexey V b4c2c368e4 #638: added permissions to add new project for members of repository 2012-09-12 00:27:28 +04:00
Vladimir Sharshov 8c06b0c18d [refs #631] Fix right for publication build list using publish button 2012-09-07 22:45:03 +04:00
Pavel Chipiga 768e40ee2a Merge branch 'master' into 631-publish-to-the-repository-without-qa
Conflicts:
	app/models/ability.rb
2012-09-07 16:38:21 +03:00
Vladimir Sharshov 29f5ef5f2e Refactoring tests 2012-09-07 13:41:49 +04:00
Vladimir Sharshov 4828aa24f8 Merge branch 'master' into 349-anonymous_access
Conflicts:
	spec/controllers/platforms/maintainers_controller_spec.rb
	spec/factories/build_lists.rb
2012-09-07 00:36:06 +04:00
Vladimir Sharshov 71e28cf3f3 Merge branch 'master' into 349-anonymous_access 2012-09-07 00:31:28 +04:00
Pasha 9247a1c850 Merge pull request #613 from warpc/263-refactoring
[#263] Исправление и рефакторинг тестов
2012-09-06 13:23:23 -07:00
Vladimir Sharshov 2c1df5cd14 Merge branch 'master' into 263-refactoring
Conflicts:
	config/deploy.rb
	db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov 54c6ba55be [refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules 2012-09-06 21:09:10 +04:00
Vokhmin Alexey V f0f11cb9dc #631: added #edit #update actions to platforms/repositories_controller, wrote migration, updated models 2012-09-06 17:43:50 +04:00
Pavel Chipiga a2d87c9228 Fix autocomplete_maintainers for local admins. Refs #620 2012-09-06 13:31:31 +03:00
George Vinogradov 3e69d7d0f4 [issue #349] Guest user can show open platforms. 2012-09-01 02:00:39 +04:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
konstantin.grabar 03986b7c21 [refs #374] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template 2012-08-28 20:57:12 +04:00
Alexander Machehin a70f9b9ecb [refs #616] allow create issue for public projects 2012-08-20 23:54:55 +06:00
George Vinogradov 84328742e4 [issue #590] Log returns through Rails with `tail -n` 2012-08-17 12:23:49 +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
konstantin.grabar 0c9f3540f9 [refs #374] Merge master into 374-rest_api_for_builds 2012-08-08 18:21:56 +04:00
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
konstantin.grabar 43d8e2020c [refs #374] Remove states check logic from ability.rb. Small api reject answer fix 2012-08-06 16:21:19 +04:00
konstantin.grabar 36da0cf808 [refs #374] Continue tests fix 2012-08-06 14:43:04 +04: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