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
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
855f1f356d
[refs #616 ] remove some inline styles
2012-09-21 18:10:47 +06:00
94c3863e27
[refs #616 ] fixed markdown image example
2012-09-21 16:43:54 +06:00
d25bdb2329
[refs #616 ] fixed preview bug
2012-09-21 16:32:53 +06:00
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
7e28920bc7
Merge pull request #653 from warpc/385-change-name-for-git-archives
...
[refs #385 ] Support download project source code by build clients(rpmbuild)
2012-09-20 06:37:13 -07:00
b398a0e456
#634 : fixed
2012-09-20 16:43:23 +04:00
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +06:00
11c67b7951
[refs #616 ] fixed bug on new issue
2012-09-19 23:59:46 +06:00
fbc5f3a925
[refs #616 ] small refactoring
2012-09-19 23:59:14 +06:00
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
4fc9ba7aeb
[refs #616 ] add lost i18n
2012-09-19 15:41:08 +06:00
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
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
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
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
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
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
8c06b0c18d
[refs #631 ] Fix right for publication build list using publish button
2012-09-07 22:45:03 +04:00
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
3247db53c6
[refs #635 ] Fixed the lack of choice owner on create a project page
2012-09-07 14:25:04 +04:00
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
067615d79f
[refs #616 ] small js fix
2012-08-31 19:18:38 +06:00
3225274425
[refs #616 ] change styles
2012-08-31 19:02:03 +06:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
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
e8d80b849a
[refs #616 ] fixed removing labels from issue
2012-08-25 21:26:24 +06:00
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
3abcb51395
[refs #616 ] simple format for issie body
2012-08-21 00:11:42 +06:00
e637191a61
[refs #616 ] fixed caption of the button
2012-08-20 23:27:43 +06:00
b8c6f0b896
[issue #590 ] Refactored checks for buttons.
2012-08-17 15:49:12 +04:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
99ce249fe6
[issue #590 ] Removed log reloading for not :build_started BuildLists.
2012-08-15 00:49:31 +04:00
6ac0d3c0df
[issue #590 ] Fixed Chrome bug in live log.
2012-08-14 21:05:53 +04:00
5a4c7a8e37
[issue #590 ] Fixed BuildList started check (thnx 2 @alexander-machehin)
2012-08-14 18:57:25 +04:00
0d06f73917
[issue #590 ] Merge branch '590-build_list_page_change' of github.com:warpc/rosa-build into 590-build_list_page_change
2012-08-14 18:46:45 +04:00
dfb6d0da0c
[issue #590 ] Fixed log viewer.
2012-08-14 18:43:05 +04:00
cada20ed63
Merge branch 'master' into 590-build_list_page_change
2012-08-14 15:46:16 +04:00
38e1d0c8ee
[issue #590 ] Added live log to BuildList
2012-08-14 01:41:15 +04:00
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +04:00
Alexander Machehin
Vladimir Sharshov
Vokhmin Alexey V
Pavel Chipiga
George Vinogradov