Commit Graph

325 Commits

Author SHA1 Message Date
Alexander Machehin cd681ab0ae [refs #569] fixed fork modal 2012-07-17 19:49:13 +06:00
Alexander Machehin 966368a660 [refs #90] show same title and body for issues and pulls 2012-07-17 16:50:40 +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 5b4c9b0948 [refs #90] remove reduntant information 2012-07-16 23:38:45 +06: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
Alexander Machehin 56db0fffd0 [refs #90] small refactoring 2012-07-16 14:46:44 +06: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 cfb16f8118 [issue #561] Fixed bug on BuildList#show page 2012-07-10 03:57:25 +04:00
George Vinogradov f83a1ae6c2 [issue #561] Changed translations. 2012-07-10 02:55:34 +04:00
George Vinogradov 3195969aab [issue #561] Added bs_id to BuildList#show 2012-07-10 02:14:31 +04:00
George Vinogradov f997e50905 [issue #561] Some cosmethic changes.
*  Reordered columns in BuildLists table
*  Reordered rows in BuildLists filter
*  Removed created_at filter (Commented. See TODOs)
2012-07-10 01:49:19 +04:00
George Vinogradov 8c5a8c884d [issue #561] Some DB query optimization. 2012-07-10 01:13:55 +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 07e02d9a17 [refs #90] modified Update commits button 2012-07-10 00:41:39 +06:00
Vladimir Sharshov d7ee0fe938 Merge pull request #559 from warpc/428-advisory
[refs #428] Advisory: new look
2012-07-09 08:44:13 -07:00
George Vinogradov 2839dc14b6 [issue #428] Using #name_with_owner in projects pages. 2012-07-09 19:19:30 +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
Vladimir Sharshov ce1c1ff403 Merge pull request #528 from warpc/428-advisory
[issue #428] Advisories: final version:

* Added Many2Many relation between advisories and projects;
* Added autocompletion to build list's advisory;
* Bootstrap's JS moved to vendor;
* Added Atom feed for advisories;
* Added search in advisories page.
2012-07-04 07:29:30 -07:00
Alexander Machehin 7b0c135a24 [refs #90] fixed pull button 2012-07-04 20:22:23 +06:00
George Vinogradov a909a92ae8 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-07-04 18:10:03 +04:00
konstantin.grabar 07372dd1a3 [refs #442] Fix mass_builds link 2012-07-04 18:09:59 +04:00
George Vinogradov 8c88e7a0da [issue #428] Some code simplification. 2012-07-04 15:42:43 +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 004f603e02 [refs #442] Add new actions rights. Cancel build list btn rights fix 2012-06-29 23:10:18 +04:00
Alexander Machehin 01db786728 [refs #442] remove double checking 2012-06-29 17:39:54 +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
Alexander Machehin 8768317323 [refs #90] fix issue path 2012-06-26 15:52:20 +06: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
Alexander Machehin 4d91ea1d6e [refs #531] fixed user roles 2012-06-20 23:59:47 +06:00
George Vinogradov 735afaea15 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	db/schema.rb
2012-06-19 02:57:39 +04:00
George Vinogradov ecd4498484 [issue #428] Changes in advisories.
*  Added Many2Many relation between advisories and projects.
*  Added autocompletion to build list's advisory
*  Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Alexander Machehin 8542c60838 [refs #522] to fork check own projects 2012-06-15 00:12:44 +06:00
Alexander Machehin 682f33a9bf [refs #90] view merged status 2012-06-13 23:52:11 +06:00
Alexander Machehin 724868e495 [refs #90] fixed view with #repo-wrapper 2012-06-08 14:28:23 +06:00
Alexander Machehin 29d01f33a5 [refs #90] dont redirect in tracker 2012-06-08 14:11:46 +06:00
Alexander Machehin bf11afca4c [refs #90] fixed diff view 2012-06-08 13:53:30 +06:00
Alexander Machehin 5f50bacbe6 [refs #90] some refactoring with rtruncate method 2012-06-08 13:38:24 +06:00
Alexander Machehin 62128d2c72 [refs #90] change diff anchors to digits 2012-06-08 01:20:06 +06:00
Alexander Machehin 0b9c0fdd07 [refs #90] fixed rendering file rename 2012-06-08 01:19:18 +06:00
Alexander Machehin 8fadbf2d41 [refs #90] rewrite diff 2012-06-07 23:23:28 +06:00
Alexander Machehin 65fd4a8340 [refs #90] add anchor to commits list 2012-06-06 00:13:20 +06:00
Alexander Machehin 614691a737 [refs #90] removed index action 2012-06-05 18:10:51 +06:00
Alexander Machehin 91bf65d65d [refs #90] comments for pull requests (slow version) 2012-06-05 18:08:52 +06: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
Alexander Machehin 4b8def5bd0 [refs #90] add pulls to tracker 2012-06-04 23:00:19 +06:00
Alexander Machehin 8ed8e10cd6 [refs #90] moved update form lower 2012-05-31 23:30:10 +06:00
Alexander Machehin 60aba754ae [refs #90] pull title/body update 2012-05-31 22:57:52 +06:00
Alexander Machehin 3c3448e26f [refs #90] new/show views refactoring 2012-05-31 17:16:54 +06:00
Alexander Machehin 26baf999f4 [refs #90] diff stats 2012-05-29 23:09:43 +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
Alexander Machehin 780cc351d5 [refs #263] use user fullname 2012-05-28 16:22:18 +06:00
Alexander Machehin bc3212a374 fixed assignee uname for issue sidebar 2012-05-28 15:38:57 +06:00
konstantin.grabar a79d946b6b [refs #442] Mass build refactor and fixes 2012-05-25 19:56:26 +04:00
Alexander Machehin df610931d7 [refs #90] commits tab 2012-05-25 16:48:44 +06:00
Alexander Machehin 4f1d23a2a4 [refs #90] branch, merge validation 2012-05-24 23:10:49 +06:00
Vladimir Sharshov 568df37570 Merge pull request #500 from warpc/478-project_build_failed
[refs #478] Change js handler logic for creating build build list for frozen platform
2012-05-24 06:11:36 -07:00
konstantin.grabar 0958299f51 [refs #478] Change js handler logic 2012-05-24 16:51:39 +04:00
Vladimir Sharshov 0d3e06b5d9 Merge pull request #499 from warpc/478-project_build_failed
[refs #478] Add js handler to disable frozen platforms and their reps
2012-05-24 03:39:55 -07:00
konstantin.grabar 3d2bcdd019 [refs #478] Add js handler to disable frozen platforms and their reps 2012-05-24 14:21:57 +04:00
konstantin.grabar a83927c812 [refs #442] Fix mass_build_id locales 2012-05-23 18:19:04 +04:00
konstantin.grabar 7c45263799 [refs #442] Add mass build select to monitoring. Remove build lists from build_all action 2012-05-22 17:40:27 +04:00
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06: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 f96990bd25 [refs #90] change view 2012-05-16 22:50:30 +06:00
konstantin.grabar 1385133ed5 [refs #461] Merge master into 461-rename_is_rpm_to_is_package 2012-05-16 14:37:35 +04:00
Pavel Chipiga c1b4a0639d Fix build list display 2012-05-15 13:12:07 +03:00
konstantin.grabar 1f088c0cfc [refs #461] Rename is_rpm to is_package 2012-05-15 14:00:57 +04:00
Pavel Chipiga 8470674c62 Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444 2012-05-14 22:08:31 +03:00
Alexander Machehin ff016efe1c [refs #90] choose project 2012-05-14 23:09:18 +06:00
konstantin.grabar 8060a9b8a9 [refs #451] Fix partial name 2012-05-14 12:16:37 +04:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +06:00
Alexander Machehin 3e0ebdc929 [refs #90] change route 2012-05-10 22:57:59 +06:00
George Vinogradov 9a0f582a16 [issue #428] Fixed typo in PlatformsHelper 2012-05-10 20:04:48 +04:00
Alexander Machehin 4040a486fe [refs #90] fix diff 2012-05-10 18:32:54 +06:00
Pavel Chipiga 52f5e01575 Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428 2012-05-06 00:43:04 +03:00
George Vinogradov 05ef799fa4 [issue #428] Added advisories list. Added translations. 2012-05-05 21:18:29 +04:00
Alexander Machehin 381ae0a8b9 [refs #90] diff - dont work 2012-05-05 22:57:12 +06:00
George Vinogradov 6fe0e5b530 [issue #428] Added AdvisoriesController & show view. 2012-05-05 02:53:45 +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
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
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
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
Alexander Machehin cb9588619a [refs #416] dont show zip menu for empty project 2012-04-24 22:36:52 +06:00
Pavel Chipiga 9cae595d77 Merge branch 'master' into 263-refactoring 2012-04-23 22:22:24 +03:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
George Vinogradov af18f4404f [issue #347] Fixed artefacts in Add Collaborators form. 2012-04-22 13:17:33 +04:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
Alexander Machehin f31b243ae9 [refs #385] zip image 2012-04-17 18:06:04 +06:00
George Vinogradov 871c8ed1f4 [issue #347] Fixed bugs. Some changes. 2012-04-16 23:22:08 +04:00
Alexander Machehin 5cfadcd723 [refs #385] add dropdown menu to choose archive format 2012-04-13 17:24:24 +06:00
Alexander Machehin b281cdf65b [refs #385] changed archive 2012-04-12 17:27:15 +06:00
Alexander Machehin 770030e180 [refs #385] zip archive 2012-04-12 00:29:08 +06:00
Alexander Machehin 96b3c831b7 [refs #358] br -> p 2012-04-06 02:21:19 +06:00
konstantin.grabar 39dd53ff9b [refs #358] Add git clone repo help hint 2012-04-05 11:26:03 +04:00
George Vinogradov fe053537c3 [fixed #377] Fixed Group.by_admin scope. 2012-04-03 17:08:22 +04:00
George Vinogradov 1e8021fe35 [issue #369] Added TOS page. 2012-03-31 17:18:22 +04:00
Vladimir Sharshov 0f597ad544 Merge pull request #368 from warpc/195-new_design_for_projects
[issue #195] Fixed access string in repo block
2012-03-31 03:39:52 -07:00
George Vinogradov eb4679de0e [issue #195] Fixed access string in repo block 2012-03-31 14:27:20 +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
Alexander Machehin d18e55f180 [refs #340] titles - part2 2012-03-30 22:37:54 +06:00
Vladimir Sharshov 897c4b730b Merge pull request #360 from warpc/195-new_design_for_projects
[Refs #195] Added legend for projects table. Added titles.
2012-03-30 09:20:22 -07:00
George Vinogradov 78943fdc04 [issue #195] Added legend for projects table. Added titles. 2012-03-30 18:51:57 +04:00
Vladimir Sharshov 0c2d0f4612 [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00
George Vinogradov c03ae5015e [issue #195] Fixed leave button. Added participant icons. 2012-03-29 20:27:33 +04:00
George Vinogradov baf35da99c [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov 9bb1d80172 [issue #195] Added AJAX to /projects list. 2012-03-27 19:50:00 +04:00
George Vinogradov d03f364b18 Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects 2012-03-25 01:38:32 +04:00
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04:00
Pavel Chipiga d44de9f2bb Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195 2012-03-23 22:37:17 +02:00
Alexander Machehin 35c466820e [refs #195] add lock/unlock icon 2012-03-23 23:36:37 +06:00
George Vinogradov efd46249ed [issue #195] Fixed merge artefact 2012-03-22 18:53:06 +04:00
George Vinogradov 9f23cf7727 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
George Vinogradov 401e570dc7 [issue #195] Change projects/sidebar to be more standart. 2012-03-22 04:42:56 +04:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Alexander Machehin fc465a4647 [refs #195] onfocus -> onclick 2012-03-12 20:46:11 +06:00
Vladimir Sharshov 19bcdf94d9 [Refs #195] More space for project url 2012-03-12 18:31:25 +04:00
Alexander Machehin 26e80af8cb [refs #195] one click select 2012-03-12 16:13:34 +06:00
Pavel Chipiga 41cd1ddaf3 Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195 2012-03-07 23:34:49 +02:00
Alexander Machehin db8e1881ba [refs #195] change repo url to readonly 2012-03-07 20:56:25 +06:00
Alexander Machehin e5d5ef11e3 [refs #194] fix submenu highlight 2012-03-05 20:00:49 +06:00
George Vinogradov 7e5e3ca609 [issue #195] Fixed another creating bug...
I feel like a slipper-man...
2012-03-03 04:24:57 +04:00
George Vinogradov 9ee3942702 [issue #195] Fixed bug with project creating 2012-03-03 03:25:20 +04:00
George Vinogradov b3750f8644 [issue #195] Fixed branch selector. 2012-03-02 20:48:19 +04:00
Pavel Chipiga 036dfb6dd5 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-02 02:04:04 +02:00
George Vinogradov 318dc72d29 [issue #195] Fixes.
*  Added border to gutter in file preview
  *  Added "empty repo" message
  *  Fixed one of bugs with tree/branch selector
2012-03-02 02:23:53 +04:00
George Vinogradov 4b024d1728 [issue #195] Fixes.
*  Fixed translations
  *  Fixed blob display
  *  Fixed routes
2012-03-01 21:37:24 +04:00
George Vinogradov 6eb239385a [issue #195] Fixed bug with creating project 2012-03-01 17:37:35 +04:00
konstantin.grabar 55ff2c7f6b [refs #195] Change new project route and some other changes 2012-03-01 16:10:12 +04:00
konstantin.grabar 5b25ea221b [refs #195] Add default value to is_rpm field for projects 2012-02-29 22:27:57 +04:00
George Vinogradov c3d7221f97 [issue #195] Fixed bugs
*  Highlighting in submenu
  *  File history
2012-02-29 21:53:14 +04:00
konstantin.grabar c5d8041296 [refs #195] Add global fixes to projects and collaborators logic 2012-02-29 18:45:04 +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
konstantin.grabar b586c5ddf0 [refs #195] Add js hack for sections bigpadding div class 2012-02-29 01:17:04 +04:00
konstantin.grabar 577eadbc7c [refs #195] Fix project form submit tag 2012-02-29 00:12:37 +04:00