Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,333 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

303 Commits

Author SHA1 Message Date
Alexander Machehin 914a2967c3 Merge branch 'master' into 19-gfm 
Conflicts:
	app/views/projects/issues/_issue.html.haml
 2013-04-08 17:04:59 +06:00
Alexander Machehin 7a6facd316 [#19] small avatar refactoring 2013-04-02 21:14:32 +06:00
Alexander Machehin cac49cf96d Merge branch '19-attach_issue_to_issue' into 19-gfm 2013-04-01 16:31:21 +06:00
Alexander Machehin 05c39da5e2 [#19] removed old code 2013-04-01 16:29:50 +06:00
warpc eefe15d600 Merge pull request #63 from abf/rosa-build:52-highlighting-the-line-which-have-followed-by-link 
#52: Highlighting the line which have followed by link
 2013-03-29 16:44:31 +04:00
Alexander Machehin e78e73cae8 [#19] add gitlabhq markdown 2013-03-29 00:22:24 +06:00
Vokhmin Alexey V 4f40327293 #52: updated JS and rendering discussion in pull_request 2013-03-28 15:04:07 +04:00
Alexander Machehin 70e37925c6 Merge branch 'master' into 19-attach_issue_to_issue 
Conflicts:
	app/assets/stylesheets/design/custom.scss
	db/schema.rb
 2013-03-28 00:19:59 +06:00
Vokhmin Alexey V a171be9f53 #31: add project_version into product 2013-03-27 16:18:24 +04:00
Alexander Machehin d737960913 [#19] add issues link from comment 2013-03-26 16:47:42 +06:00
Alexander Machehin 8f18d0a874 [#19] fix showing discussion in pull requests && small refactoring 2013-03-22 23:17:10 +06:00
Alexander Machehin d85039d5be Support git over ssh: hooks, support gitlab-shell api, UI, refactroing 2013-03-07 14:09:08 +06:00
Vladimir Sharshov bbc699cb6d Merge pull request #947 from warpc/757-enable-extra-containers-for-main-platforms 
[refs #757]: Enable extra containers for main platforms
 2013-02-25 07:43:28 -08:00
Vladimir Sharshov f0a1fac070 Merge pull request #949 from warpc/946-wrong_links 
[refs #946] fixed wrong user links in activity feed
 2013-02-25 01:06:27 -08:00
Alexander Machehin 87f16a6b69 #946 small refactoring 2013-02-25 13:50:53 +06:00
Vokhmin Alexey V ff522d9ef4 #757: revert changes in #can_publish? method 2013-02-22 18:29:22 +04:00
Vladimir Sharshov 96abcad5ce Merge pull request #950 from warpc/944-fix_branch_errors 
[refs #944] disable selecting tag on branches page, new way to check empty project and fix undefined method `name' for nil:NilClass
 2013-02-22 03:24:48 -08:00
Alexander Machehin 5f97791dc2 #944 small refactoring 2013-02-22 16:26:06 +06:00
Alexander Machehin 00639963cb #944 disable tags at branches 2013-02-22 15:34:12 +06:00
Alexander Machehin 3dda72a0ac Merge branch 'master' into 921-task-monitoring 
Conflicts:
	app/assets/javascripts/extra/build_list.js
 2013-02-21 00:54:04 +06:00
Alexander Machehin e5db61197e [refs #921] add new filter to the build list monitoring 2013-02-20 21:07:11 +06:00
Vokhmin Alexey V 067f06526a #757: some refactoring 2013-02-19 23:29:13 +04:00
Vokhmin Alexey V 65b98a2d00 #757: update name of methods, API 2013-02-19 19:22:38 +04:00
Alexander Machehin d585978550 #921 modify task monitoring page 2013-02-14 22:59:52 +06:00
Vokhmin Alexey V 3c39013d98 #908: update #container_url method 2013-02-11 20:36:56 +04:00
Vokhmin Alexey V c46ee80e7a #908: update path to container for MDV platforms 2013-02-11 18:15:26 +04:00
Alexander Machehin d159948830 [refs #901] add anchor to lines 2013-02-08 16:25:05 +06:00
Vokhmin Alexey V 8629ae8ca3 #756: update UI 2013-02-06 13:42:34 +04:00
Alexander Machehin 6473b73859 [refs #90] fix bug with long-name branches on creating pull request 2013-01-31 19:23:07 +06:00
Vokhmin Alexey V 52cd67e1c3 #860: small refactoring 2013-01-29 01:50:27 +04:00
Vokhmin Alexey V fed1c76ca2 #860: update logic for creating build list container 2013-01-28 18:44:06 +04:00
Vokhmin Alexey V f4c3d23d7c create container for BuildList 2013-01-25 21:24:46 +04:00
Alexander Machehin 10d6173780 [refs #847] remove platform_not_found status 2013-01-25 17:18:28 +06:00
Alexander Machehin 090f40caee [refs #847] removed PLATFORM_PENDING & PROJECT_NOT_FOUND statuses 2013-01-24 23:55:24 +06:00
Alexander Machehin 643e163652 [refs #847] refactoring 2013-01-24 19:09:26 +06:00
Vokhmin Alexey V d2a876c9cb #843: remove 'latest_' prefix 2013-01-21 21:08:19 +04:00
Vokhmin Alexey V 62a761a7c9 #766: add filter to /build_lists page 2012-12-10 16:15:22 +04:00
Alexander Machehin dc1525b85e [refs #762] add mass build from list 2012-12-06 23:59:17 +06:00
Vokhmin Alexey V 128b4104f1 #751: update link to version of BuildList::Item 2012-12-04 20:13:55 +04:00
Vladimir Sharshov d39c07475f Merge pull request #748 from warpc/735-fetch-data-for-container 
[refs #735]: fill packages of BuildList when use new_core
 2012-12-04 03:36:47 -08:00
Alexander Machehin 42e76f5fa6 [refs #674] fix undefined method 'last_published_commit_hash' for product build list 2012-12-04 09:33:04 +06:00
Alexander Machehin 5019d27b50 [refs #674] small helper refactoring 2012-12-04 00:09:36 +06:00
Alexander Machehin bff88e86e3 [refs #674] small diff message for build lists 2012-12-04 00:04:03 +06:00
Alexander Machehin ec6279d803 [refs #674] add diff to build lists 2012-12-03 23:43:24 +06:00
Vokhmin Alexey V 3ef841184c fill packages of BuildList when use new_core 2012-12-03 21:17:20 +04:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06: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
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
Vokhmin Alexey V 6a7035d551 added #show action for product_build_list 2012-11-06 22:01:54 +04:00
Alexander Machehin 217a92b443 [refs #90] fix pull header 2012-10-28 00:45:24 +06:00
Alexander Machehin c6a0dfee97 [refs #90] fixed orphan pulls 2012-10-28 00:04:28 +06:00
Alexander Machehin 95e5804358 [refs #90] fixed git timeout error on the big diff 2012-10-26 20:03:46 +06:00
Alexander Machehin 54f462f408 [refs #579] small refactoring 2012-10-19 15:50:15 +06:00
Alexander Machehin ecf8e7e5ee [refs #579] fixed wiki & refactoring 2012-10-18 18:51:28 +06:00
Alexander Machehin 7870ffef7d [refs #579] fixed some bugs 2012-10-18 00:38:42 +06:00
Alexander Machehin f060d919d9 [refs #579] add new helper 2012-10-16 19:20:55 +06:00
Alexander Machehin fb1288e382 [refs #579] ugly sorting common pull comments 2012-10-15 22:33:16 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin 548f698526 [refs #579] add a line comment button 2012-10-08 20:42:38 +06:00
Alexander Machehin ed7aec602f [refs #579] alpha version of the pull inline comments 2012-10-06 01:19:05 +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 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06: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
Alexander Machehin 9b9295ba4f [refs #90] change ui on create pull 2012-09-28 23:46:02 +06:00
Alexander Machehin 64ee8b6845 [refs #90] change pull header 2012-09-28 21:49:10 +06:00
Vokhmin Alexey V da006871ba #90: small refactoring, moved views 2012-09-27 20:32:28 +04:00
Vokhmin Alexey V 6070c276f6 Merge branch 'master' into 90-pull 2012-09-26 18:33:04 +04:00
Vokhmin Alexey V 0299c069c6 #90: style changes for header, increase performanse for #autocomplete_base_project action 2012-09-25 19:18:22 +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
Vokhmin Alexey V 40999debbf #648: updated projects_helper 2012-09-25 13:50:28 +04:00
Vokhmin Alexey V 0bb9f38b66 #648: collor for labels has been changed 2012-09-24 22:44:06 +04:00
Vokhmin Alexey V 1e468b5073 #648: updated styles, added icons for filters 2012-09-24 22:36:02 +04: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 2c6d4bae9e [refs #616] add error messages to ajax 2012-09-24 23:34:14 +06:00
Alexander Machehin 1f63fec004 Revert "[refs #616] dont filter html" 
This reverts commit 68eac7a9de083d6a29503ac2900b3dd404e22c0c.
 2012-09-21 19:22:27 +06:00
Alexander Machehin 96f8a9a43f [refs #616] dont filter html 2012-09-20 23:48:20 +06:00
Alexander Machehin a85a95d18a [refs #616] markdown cheat sheet 2012-09-19 23:35:43 +06:00
Alexander Machehin a492367a17 [refs #616] some fixes and refactoring 2012-09-18 16:00:21 +06:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
George Vinogradov 84328742e4 [issue #590] Log returns through Rails with `tail -n` 2012-08-17 12:23:49 +04: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 910aac939e [refs #90] fixed changing tabs & anchors 2012-08-08 21:47:58 +06:00
Alexander Machehin ea930308df [refs #90] small pull helper refactoring 2012-08-07 23:02:58 +06:00
Alexander Machehin 7a16bac06a [refs #90] fixed error after merging with master 2012-08-07 22:35:15 +06: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 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
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull 
Conflicts:
	db/schema.rb
 2012-08-01 13:06:41 +06:00
Pavel Chipiga 01a3572de0 Minor update. Fix helper bug. Minor refactor. Refs #263 2012-07-31 17:35:18 +03: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 35e673d44e Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263 2012-07-27 00:15:57 +03: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
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Alexander Machehin b24a4a35b2 [refs #90] modify pull tab urls 2012-07-19 00:02:27 +06:00