Commit Graph

1246 Commits

Author SHA1 Message Date
Vladimir Sharshov 41ce06b36e Merge pull request #722 from warpc/90-error_on_create
[refs #90] Fix error on pull create, create special place for temporary pull request, add cron task for clear temporary pull request, add cron task for clearing activity feed, fix build list pagination error
2012-11-14 10:31:53 -08:00
Alexander Machehin 50ce84bfa9 remove old activity feeds 2012-11-15 00:10:03 +06:00
Alexander Machehin b21046ba50 [refs #90] clean old temporary git 2012-11-14 21:48:20 +06:00
Vladimir Sharshov 34bb256ff1 Merge pull request #715 from warpc/iso-worker
[refs #711] Integration Iso worker
2012-11-14 03:14:28 -08:00
Alexander Machehin 21a32fba6c show expected message after add member error 2012-11-13 20:29:45 +06:00
Vokhmin Alexey V f522fd3cd0 add selecting Arch on create product build 2012-11-13 18:01:06 +04:00
Vokhmin Alexey V 21d8a42072 merge master into the branch 2012-11-12 20:52:33 +04:00
Vokhmin Alexey V 51aff682d4 some refactoring according to Alexander's comments 2012-11-12 20:23:11 +04:00
Vokhmin Alexey V 259eeaecfc add Stop action and time_living for building ISO 2012-11-12 17:22:19 +04:00
Vladimir Sharshov 06421dbdec Merge pull request #714 from warpc/90-fix_orphan_pulls
[refs #90] fixed orphan pulls
2012-11-12 02:34:21 -08:00
Alexander Machehin 6ea04c5ccb Revert "disable auto import by cron"
This reverts commit e3a404adf65767aa5473309aad1d9ebf6fb8907c.
2012-11-12 15:26:24 +06:00
Vokhmin Alexey V 8f9cd0ff8a updated logger on build product page 2012-11-09 21:42:25 +04:00
Alexander Machehin 26af1aa27c Merge branch 'master' into 90-fix_orphan_pulls
Conflicts:
	app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
Alexander Machehin 8e7efac35b disable auto import by cron 2012-11-09 20:43:35 +06:00
Vokhmin Alexey V ef967e97ae small style changes 2012-11-09 17:51:33 +04:00
Vokhmin Alexey V b39ccea0d5 add show logs in real time 2012-11-09 17:08:56 +04:00
Vokhmin Alexey V 3d293b908d added IsoWorkerObserver 2012-11-09 01:39:42 +04:00
Vokhmin Alexey V 4595ce349c Merge branch 'master' into iso-worker 2012-11-08 18:17:35 +04:00
Vokhmin Alexey V fc3dbbf698 added help for creating ISO 2012-11-08 15:11:44 +04:00
Alexander Machehin e9233d362a add new git_path param 2012-11-08 15:13:48 +06:00
Vokhmin Alexey V f21926f7f5 extra style changes 2012-11-07 17:21:08 +04:00
Vokhmin Alexey V eb40fbbbd5 removed unnecessary fields for build ISO 2012-11-07 16:14:31 +04:00
Vokhmin Alexey V 6a7035d551 added #show action for product_build_list 2012-11-06 22:01:54 +04:00
Vokhmin Alexey V 317f672e32 added #new action for create ISO build 2012-11-06 19:08:54 +04:00
Vokhmin Alexey V ecec330b4d added migration, updated models, UI 2012-11-06 18:13:16 +04:00
Alexander Machehin 970da230f2 [refs #90] add validations 2012-10-29 21:33:20 +06:00
Alexander Machehin ab57507f34 [refs #90] make common translation to commits and pulls 2012-10-26 20:12:14 +06:00
Vokhmin Alexey V e9fd2a2df6 Merge branch 'master' into 706-get-list-of-projects-by-repository 2012-10-19 18:51:11 +04:00
Vladimir Sharshov 00e92d9672 Merge pull request #678 from warpc/579-code_line_comments
[refs #579] code line comments
2012-10-19 07:48:50 -07:00
Vokhmin Alexey V 4680e9c62c #706: added #projects action to Repositories API 2012-10-19 17:52:36 +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 d5ad5b1a95 Merge branch 'master' into 698-rest-api-for-advisories 2012-10-18 18:59:00 +04:00
Vokhmin Alexey V 68dbae8c83 #698: added #create and #fork actions for Advisories API 2012-10-18 18:17:50 +04:00
Vokhmin Alexey V b7eff22c23 #698: added API for Advisories 2012-10-18 15:22:31 +04:00
Alexander Machehin 7870ffef7d [refs #579] fixed some bugs 2012-10-18 00:38:42 +06:00
Vokhmin Alexey V 6680265c64 #686: some refactoring of relations 2012-10-17 17:46:16 +04:00
Vokhmin Alexey V 351821912b #686: added API for show list of projects 2012-10-17 14:35:33 +04:00
Vokhmin Alexey V d99a2104ce #692:added index action for Groups API 2012-10-16 15:49:07 +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
Alexander Machehin cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Vokhmin Alexey V f3605a1211 #691: updated routes according to Vladimir's comments 2012-10-15 19:47:42 +04:00
Vokhmin Alexey V 0879a7e46f #691: added #notifiers and #update actions for Users API 2012-10-15 18:06:08 +04:00
Vokhmin Alexey V 2ae671df21 Merge branch 'master' into 691-rest-api-for-users 2012-10-15 17:03:05 +04:00
Vokhmin Alexey V e50bd3a2b5 #691: added #show action for Users API 2012-10-15 13:45:00 +04:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vokhmin Alexey V be8ed0984a #672: added #add_member, #remove_member, #update, #destroy actipns for Repository API 2012-10-14 16:00:49 +04:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Vladimir Sharshov 4f21f0cb88 Add new school adress; change email send method to sendmail; add google check page 2012-10-12 00:16:51 +04:00
Vladimir Sharshov 2e0f4dc2eb Merge pull request #680 from warpc/671-rest-API
[refs #671]: full rest API for Platforms; Add refs_list api for Project
2012-10-11 13:12:32 -07:00
Vokhmin Alexey V 8f3ed58cd8 #671: added Projects#refs_list API action 2012-10-11 20:27:17 +04:00
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Vokhmin Alexey V eef640e82c #671: added API Platforms#create action, updated specs, added validation to platform model 2012-10-10 21:45:56 +04:00
Vokhmin Alexey V 972877bc76 #671: added API Platforms#destroy action and specs 2012-10-10 19:43:14 +04:00
Vokhmin Alexey V d9c583e226 #671: added specs for API Platforms#clone action 2012-10-10 19:13:14 +04:00
Vokhmin Alexey V e5c6707594 #671: added #remove_member action for platforms API, updated specs 2012-10-09 21:07:10 +04:00
Vokhmin Alexey V 30909b281d #671: added #add_member action for platforms API, added new specs 2012-10-09 20:23:48 +04:00
Vokhmin Alexey V 9e6e2de955 #671: added #members action for platforms API 2012-10-09 19:06:27 +04:00
Vokhmin Alexey V feefe8ed89 #374: added #platforms_for_build action for Platforms API 2012-10-08 22:02:44 +04:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Alexander Machehin f12634cee8 [refs #579] add link to comments 2012-10-08 15:14:31 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +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 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Vokhmin Alexey V 4b72501159 #671: added Architectures API 2012-10-04 16:45:49 +04:00
Vokhmin Alexey V 04b2647ef0 #668: added uploading avatars for groups 2012-10-03 20:38:42 +04: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 cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00
Vokhmin Alexey V ba7a7b20a5 #349: updated locales, added shared template 2012-10-02 19:20:58 +04:00
Alexander Machehin f66f80c128 Merge branch 'master' into 90-ui
Conflicts:
	spec/controllers/projects/pull_requests_controller_spec.rb
2012-10-02 19:43:23 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06:00
Vokhmin Alexey V 234615d728 #658: added link to notification center in email 2012-10-01 17:08:02 +04:00
Alexander Machehin e7549635f0 [refs #90] change translation 2012-09-28 23:44:26 +06:00
Vladimir Sharshov 7756f6200d [refs #374] Add http headers for rate limit, restrict rate limit only for api calls. 2012-09-28 01:07:19 +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
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 223aa33604 [refs #374] Add info about API doc site 2012-09-27 17:55:16 +04:00
Vladimir Sharshov 7c4c855341 [refs #374] Small refactoring 2012-09-27 17:41:02 +04:00
Vladimir Sharshov 0dd103b7f4 [refs #374] Fix build list tests, remove unused code. 2012-09-27 03:54:56 +04:00
Vladimir Sharshov 4402f676c3 Increase hourly request limit, remove daily limit 2012-09-27 01:59:31 +04:00
Vokhmin Alexey V 37fbb4632e #90: updated branch 2012-09-26 21:04:12 +04:00
Vokhmin Alexey V 613db04375 #90: added limit for commits into the pull request 2012-09-26 21:00:58 +04:00
Vokhmin Alexey V 37c9a906c4 Merge branch '90-pull' into 90-separate-issues-and-pull-requests 2012-09-26 18:45:26 +04:00
Vokhmin Alexey V 6070c276f6 Merge branch 'master' into 90-pull 2012-09-26 18:33:04 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
Vokhmin Alexey V 397d411252 #90: added #index action, updated routes 2012-09-26 00:50:40 +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
Vladimir Sharshov 06099a15b6 Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
2012-09-25 03:41:11 -07:00
Vladimir Sharshov c426f81abe Merge pull request #656 from warpc/616-issues_and_comments
[refs #616] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
2012-09-25 03:37:44 -07:00
Vokhmin Alexey V 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04:00
Alexander Machehin 51c9375613 [refs #616] change preview translation 2012-09-24 23:40:41 +06:00
Vokhmin Alexey V cee1ee6cb6 #648: small refactoring 2012-09-23 20:22:49 +04:00
konstantin.grabar 7812adfdbc [refs #374] Add custom http basic auth for api 2012-09-21 23:15:56 +04:00
Vokhmin Alexey V ceeae09332 #648: small revert, updated filter name 2012-09-21 22:08:19 +04:00
Vokhmin Alexey V 2406423483 #648: added filters to Projects page 2012-09-21 21:57:22 +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 1dcce7bf92 [refs #616] small fixes 2012-09-20 20:58:14 +06:00
Vokhmin Alexey V 799a1464fb #385: fixed 2012-09-20 18:26:26 +04:00
Alexander Machehin 32e05de186 [refs #616] cheat sheet small i18n 2012-09-20 00:53:40 +06:00
Alexander Machehin a85a95d18a [refs #616] markdown cheat sheet 2012-09-19 23:35:43 +06:00
konstantin.grabar f7d28dd23c [refs #374] Patch Rack::Throttle http_error method. Finish main page
text
2012-09-19 19:02:54 +04:00
Alexander Machehin 4fc9ba7aeb [refs #616] add lost i18n 2012-09-19 15:41:08 +06:00
Vokhmin Alexey V 967c5daaa8 #575: added 'arch' to subject and body of email 2012-09-18 16:03:10 +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 ef923d06c7 #575: added build_list_notification 2012-09-16 21:29:45 +04:00
Vokhmin Alexey V 01576702a0 #575: added migration, updated Settings page 2012-09-14 20:12:48 +04:00
Vladimir Sharshov c690a8446a Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
[refs #633] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
2012-09-13 16:39:19 -07:00
Vladimir Sharshov fc4eb189b5 Add new staging server;
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
Vokhmin Alexey V 4138399ad3 #633: updated message 2012-09-13 20:23:49 +04:00
Vokhmin Alexey V a99bfee4a6 #633: UI has been updated 2012-09-13 20:08:41 +04:00
Vladimir Sharshov 5a699ad379 Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
[refs #638] Repository supervisor
2012-09-12 13:52:42 -07:00
Vokhmin Alexey V 1a75a5a394 #638: updated Relation model, repositories and platforms controllers according to comments 2012-09-12 23:32:51 +04:00
Vladimir Sharshov e3bcd2382e [refs #641] Show only public projects in group profile 2012-09-12 18:49:40 +04:00
Vokhmin Alexey V b468b09529 #638: some refactoring for adding new user 2012-09-12 17:07:34 +04:00
Vokhmin Alexey V 3858bfa6b7 #638: added members to repository model, updated views 2012-09-11 19:30:14 +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 2c1df5cd14 Merge branch 'master' into 263-refactoring
Conflicts:
	config/deploy.rb
	db/schema.rb
2012-09-06 21:14:14 +04:00
Vokhmin Alexey V 0a61ad613a #631: updated messages 2012-09-06 19:50:12 +04:00
Vokhmin Alexey V 71d14e43d6 #631: fixed misprint 2012-09-06 19:39:26 +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
konstantin.grabar b9a622acec [refs #374] Add unixtime search and output. Fix rate limit configuration and 404 status 2012-09-05 17:47:25 +04:00
konstantin.grabar 58d9a972ef [refs #374] Add rate limit 2012-09-04 22:48:14 +04:00
konstantin.grabar ff8f9da14f [refs #374] Refactor api build list create method 2012-09-04 16:44:28 +04:00
Vladimir Sharshov ff20c0b199 Merge pull request #622 from warpc/620-maintainer_db
[refs #620] Maintainer DB
2012-08-31 11:50:02 -07:00
George Vinogradov 1aa5f73192 [issue #620] Fixed typo in localization. 2012-08-31 22:48:06 +04:00
George Vinogradov 68b86ba09a [issue #620] Fixed migration && BuildList#actualize_packages. 2012-08-30 22:32:28 +04:00
konstantin.grabar 0607eedb15 [refs #626] Set invites redirect add register link to top menu 2012-08-30 14:30:07 +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
George Vinogradov f688985814 [issue #620] Changed maintainer assignment.
*  Added `project:maintainer:set_to_owner` task to set projects maintainer
     to its owner
  *  Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
Alexander Machehin de5b7cc6fc [refs #616] add x-diff mime type 2012-08-27 22:52:27 +06:00
George Vinogradov d24a149d9a [issue #620] Added search of maintainer by package 2012-08-24 20:06:59 +04:00
George Vinogradov 2fbb72e537 [issue #620] Changes in Maintainer db:
*  Added maintainer selection on project page (see TODO in sources);
  *  Added `actual` field to BuildList::Package;
  *  Added rake task to set BuildList::Package.actual field.
     Run it after migration (see TODO in sources);
  *  Packages after publising of BuildList becomes actual;
  *  Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
Vladimir Sharshov 96dc76575c Add new deploy server 2012-08-24 14:24:43 +04:00
Pavel Shved 8629d67030 Add javascript callback for "assignee"
To make intrgration with external trackers easier, add JS API for
assignee retrieval.  It returns a script that calls a function that
should act somehow depending on how it was defined.
2012-08-21 23:58:15 +04:00
Pavel Shved e75a676895 Add "assignee" JSON callback
The callback reports the assignee of a package in a platform given.
Used for integration with external bug trackers.
2012-08-21 23:58:15 +04:00
Pavel Shved 388a0028da Add Maintainer Database and list view for it
This commit adds list of maintainers of a platform to page
/platforms/:id/maintainers.  This list is intended to serve as a
counterpart for http://maint.mandriva.com/listpkgs.php.

The commit adds a "view" on a build_list_packages table: it selects only
the latest builds for each package, and summarizes the information about
such packages in "maintainers" table.

This is a testing mode only, so the link to maintainers table is not
shown.
2012-08-21 23:57:39 +04:00
konstantin.grabar 5dc50056df [refs #374] Add repositories, platforms and projects read API 2012-08-21 14:19:38 +04:00
Alexander Machehin e637191a61 [refs #616] fixed caption of the button 2012-08-20 23:27:43 +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
Vladimir Sharshov cada20ed63 Merge branch 'master' into 590-build_list_page_change 2012-08-14 15:46:16 +04:00
George Vinogradov 38e1d0c8ee [issue #590] Added live log to BuildList 2012-08-14 01:41:15 +04:00
Alexander Machehin b2ff7326d1 Merge branch 'master' into 90-pull
Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
2012-08-13 15:01:43 +06:00
Vladimir Sharshov e535ff2fed Merge pull request #611 from warpc/590-build_list_page_change
[refs #590] Dirty hack to fix BuildList#index
2012-08-10 09:26:11 -07:00
George Vinogradov 9030056c1b [issue #590] Changed _build_list partial. 2012-08-10 20:14:45 +04:00
Vladimir Sharshov 45169faf2f Merge pull request #609 from warpc/590-build_list_page_change
[refs #590] add time notification and periodic page update
2012-08-09 14:49:12 -07:00
George Vinogradov cc1a076516 [issue #590] Fixed translations. 2012-08-10 00:24:36 +04:00
George Vinogradov e5e8cc7e7f [issue #590] Changed time representation.
*  Removed buggy jquery.countdown plugin
  *  Page reloads every minute
2012-08-09 20:39:01 +04:00
Alexander Machehin 9bf2f728a7 [refs #90] change new action from post to get 2012-08-08 23:21:49 +06:00
Alexander Machehin 3641b187bc [refs #90] fixed locales 2012-08-08 21:57:33 +06:00
konstantin.grabar 0c9f3540f9 [refs #374] Merge master into 374-rest_api_for_builds 2012-08-08 18:21:56 +04:00
Alexander Machehin a316105e9c Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-07 18:21:04 +06:00
Pavel Chipiga 6b82fb6ac3 Increase unicorn workers 2012-08-06 22:28:23 +03:00
George Vinogradov 710fef1f0b Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
[refs #601] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
Vladimir Sharshov 8934d310a0 Merge pull request #603 from warpc/590-build_list_page_change
[refs #590] On monitoring and build list pages change platform to repository.
2012-08-06 05:36:32 -07:00
George Vinogradov dadbaefea4 [issue #590] On monitoring page platform changed to repository. 2012-08-06 16:31:44 +04:00
Vladimir Sharshov c7a3addfb8 [refs #601] Add statuscheck for destroy action in product build list 2012-08-06 16:06:42 +04:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
George Vinogradov c7d13fd607 [issue #565] Added question description. 2012-08-04 02:28:43 +04:00
George Vinogradov a1b7bcac32 [issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-08-03 23:36:14 +04:00
Pasha 23b4136d05 Merge pull request #598 from warpc/help_info
[refs #597] Add help page for new git repo. Remove link to README in project pages, small refactoring.
2012-08-03 09:24:26 -07:00
George Vinogradov 6eff6bffa5 [issue #590] Merge branch 'master' into 590-build_list_page_change
Conflicts:
	db/schema.rb
2012-08-03 18:37:44 +04:00
Vladimir Sharshov 8bc229f933 [refs #597] Add help page for new git repo. Remove link to README in project pages, small refactoring. 2012-08-03 18:31:04 +04:00
konstantin.grabar f3db00832a [refs #374] Api v1 base functional and specs 2012-08-03 14:05:05 +04:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
George Vinogradov 7f5f147c36 [issue #590] Fixed translation 2012-08-01 09:15:56 +04:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
konstantin.grabar f7f848e878 [refs #441] Merge master into 441-key_pairs 2012-07-31 17:16:07 +04:00
konstantin.grabar 931d4a7db0 [refs #441] Key Pairs fixes and refactoring 2012-07-31 16:50:53 +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
Vladimir Sharshov 73a369ba49 [refs #441] Refactring: part 2. Fix integration with kernel, change view for keys list 2012-07-31 01:24:31 +04:00
George Vinogradov d7e9cefd0b [issue #590] Added validation on repository. 2012-07-30 23:26:51 +04:00
Vladimir Sharshov 89d67f9ea6 [refs #441] Refactring, fix errors 2012-07-30 23:08:14 +04:00
konstantin.grabar 724b36a4b4 Merge master into 570-mass_builds_status_counters_bug 2012-07-30 18:53:18 +04:00
konstantin.grabar f674735c8c [refs #374] Merge master into 374-rest_api_for_builds 2012-07-30 13:31:28 +04:00
George Vinogradov cc66e2ee4a [issue #590] Save repository to save to in BuildList. 2012-07-27 20:01:26 +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
Vladimir Sharshov 5aecdc203b Merge pull request #571 from warpc/263-refactoring
[refs #263] Big git refactoring
2012-07-27 04:51:34 -07:00
Pavel Chipiga fb60dac748 Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-07-27 00:19:36 +03:00
konstantin.grabar 354752f6cb Merge remote-tracking branch 'origin/570-mass_builds_status_counters_bug' into 570-mass_builds_status_counters_bug 2012-07-26 15:47:33 +04:00
konstantin.grabar 48f8c3ad08 [refs #374] Add json responses for build lists api 2012-07-26 13:22:51 +04:00
George Vinogradov f1839f0ad0 [issue #578] Added submit blocking to user creation 2012-07-26 02:12:06 +04:00
Pavel Chipiga e09a9467e2 Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576 2012-07-25 21:05:25 +03:00
konstantin.grabar 15a86c2ecd [refs #576] Add flash notifies 2012-07-23 18:25:37 +04:00
George Vinogradov a69ad0f88a [issue #565] Changed translation. 2012-07-20 20:58:23 +04:00
George Vinogradov c37866d5e6 [issue #565] Added page title. 2012-07-20 20:36:09 +04:00
George Vinogradov f61e9db5c6 [issue #565] Added Support link to bottom menu 2012-07-20 20:23:51 +04:00
George Vinogradov d6c65a1626 [issue #565] Added feedback form.
*  Added web pages to send request
*  Added mailer to send feedback message.
2012-07-20 20:06:31 +04:00
Vladimir Sharshov 71fc19edc8 [refs #570] Change localization for fields 2012-07-18 23:04:26 +04:00
Alexander Machehin b24a4a35b2 [refs #90] modify pull tab urls 2012-07-19 00:02:27 +06: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
Alexander Machehin b903969aa6 [refs #90] changed displaying status message 2012-07-16 23:02:04 +06:00
Alexander Machehin 34e97510cd [refs #90] modify pull headers 2012-07-16 22:27:41 +06:00
konstantin.grabar 70b2d62e52 [refs #441] Some small fixes of locales and code 2012-07-16 13:58:33 +04:00
konstantin.grabar 3cf3546c2e [refs #441] Add secret to filter. Add repository key exist check 2012-07-13 18:16:56 +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
George Vinogradov f83a1ae6c2 [issue #561] Changed translations. 2012-07-10 02:55:34 +04:00
George Vinogradov 7b3c74e97d [issue #561] Changed BuildList pages
*  Removed mass_build, cancel and updated_at fields from list
*  Added link to commit in list (instead of version)
*  Added platform field in list
*  Added filter by main platforms
*  Added cancel button and mass_build field to BuildList#show
2012-07-10 01:09:27 +04:00
Alexander Machehin dd221cc880 [refs #90] autocomplete 2012-07-06 23:30:01 +06:00
George Vinogradov 3c8b77027e [issue #428] Allowed any update_types when build for released platform. 2012-07-06 03:05:47 +04:00
George Vinogradov fa5deed42f [issue #428] Added BuildLists list to Advisory#show 2012-07-04 22:32:10 +04:00
George Vinogradov 1c4c91df5c [issue #428] Fixed attaching projects to advisory. 2012-07-04 21:38:45 +04:00
George Vinogradov a909a92ae8 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-07-04 18:10:03 +04:00
George Vinogradov e00e88340b [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
2012-07-04 03:31:51 +04:00
George Vinogradov 094f25c049 [issue #428] Changed attaching advisory to BuildList.
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +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
Pavel Chipiga b46a7aba39 Fix branch with dots. Refs #263 2012-07-03 15:05:27 +03:00
konstantin.grabar c7232c53e9 [refs #442] Fix some locales. Fix batch_size 2012-07-03 12:44:51 +04: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 6507ad280f [refs #442] Merge master into 442-mass_build 2012-06-29 16:40:54 +04:00
Vladimir Sharshov 7561abca08 [refs #462] refactoring: remove notified_at 2012-06-28 21:40:32 +04:00
Vladimir Sharshov 46161253ab [refs #462] Product status does not change 2012-06-28 19:54:58 +04:00
konstantin.grabar ce163f89a9 [refs #442] Add rep_name field. Add cancel builds ability 2012-06-28 19:23:33 +04:00
Vladimir Sharshov 174c4dab0b Merge pull request #540 from warpc/442-mass_build
[refs #442] Support mass build statistic
2012-06-28 05:02:44 -07:00
konstantin.grabar 10aed58bdd [refs #442] Small refactor. Remove bootstrap collapse 2012-06-28 15:31:25 +04:00
konstantin.grabar b6d769ad66 [refs #442] Change mass builds table 2012-06-27 18:07:05 +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 1ac1e42894 small fix to Russian translation 2012-06-27 15:59:58 +06:00
konstantin.grabar fc00f713b5 [refs #442] Add counters update checking. Add build_error counter 2012-06-27 13:48:54 +04:00
Alexander Machehin 9b41fd50af [refs #90] fixed translation of titles & headers 2012-06-26 15:40:37 +06:00
Alexander Machehin 6aa9cfaa50 [refs #90] view pull status 2012-06-25 22:04:43 +06:00
konstantin.grabar bdb97b8891 [refs #442] Add statistics data to mass builds. Small refactor for report 2012-06-25 19:20:35 +04:00
konstantin.grabar 5e3241a1f5 [refs #525] Rename erase to clear. Fix flash. Replace repository to platform in locales 2012-06-21 11:15:26 +04:00
konstantin.grabar dfb1da97b4 [refs #525] Fix locales 2012-06-20 22:33:49 +04:00
konstantin.grabar 3ebd36f6fe [refs #525] Erase corrections and refactor 2012-06-20 22:02:42 +04:00
George Vinogradov e4f62ea592 [issue #428] Added filter by advisory_id to Advisories 2012-06-20 21:51:08 +04:00
konstantin.grabar 4b9a04e3f7 [refs #525] Set erase route to post 2012-06-20 20:40:50 +04:00
George Vinogradov 3d38adcb94 [issue #428] Added Atom feed to advisories. 2012-06-20 18:44:32 +04:00
konstantin.grabar 270dbf2e9b [refs #525] Add erase repository functional 2012-06-20 17:21:32 +04:00
Pavel Chipiga cb8345a207 Rename and separate queues. Refs #510 2012-06-18 17:16:53 +03:00
Pavel Chipiga b47b4ec075 Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510 2012-06-16 21:27:46 +03:00
Alexander Machehin 682f33a9bf [refs #90] view merged status 2012-06-13 23:52:11 +06:00
Pavel Chipiga d45e95b0e9 Merge branch 'master' into 207-platform_clone
Conflicts:
	app/views/layouts/menu/_top.html.haml
2012-06-09 19:08:55 +03:00
Pavel Chipiga ec21c042dd Fix and refactor active menu. Refs #207 2012-06-09 19:04:06 +03:00
konstantin.grabar cdf2316a76 [refs #510] Add queues to capistrano deploy. Add 4 workers to config 2012-06-09 18:53:00 +04:00
konstantin.grabar f37e0e54a3 [refs #510] Replace dj with resque 2012-06-09 16:52:29 +04:00
konstantin.grabar 26299c234b [refs #510] Add resque to the admin submenu 2012-06-08 19:02:45 +04:00
konstantin.grabar da33173700 [refs #510] Add multiple workers. Change kill and start logic 2012-06-08 16:40:50 +04:00
Alexander Machehin 8fadbf2d41 [refs #90] rewrite diff 2012-06-07 23:23:28 +06:00
konstantin.grabar 597ac65dee [refs #510] Resque deploy refactor. Turn off bluepill 2012-06-07 19:13:58 +04:00
konstantin.grabar da9d7574d1 [refs #510] Return daemonize option back to production.pill 2012-06-07 14:53:21 +04:00
konstantin.grabar ac2e267a8a [refs #510] Remove daemonize option from production.pill 2012-06-07 14:39:32 +04:00
konstantin.grabar 7db11f40c8 [refs #510] Remove children kill from production.pill 2012-06-07 14:25:38 +04:00
konstantin.grabar a266e57219 [refs #510] Add bluepill stop, start and restart to depoy and stop recipe 2012-06-07 13:27:19 +04:00