77d3a01614
#907 : add #branches, #tags actions
2013-02-12 20:35:14 +04:00
0c69326e80
Merge pull request #900 from warpc/898-publish-i686-packages-into-x86_64-repository
...
[refs #898 ]: publish i686 packages into x86 64 repository
2013-02-07 06:57:09 -08:00
e0de8e7df4
#898 : remove "publish_i686_into_x86_64" field from #new and #create pages
2013-02-07 15:47:50 +04:00
e9c023f273
#898 : add "publish_i686_into_x86_64" field into Project, update UI
2013-02-07 15:11:57 +04:00
8629ae8ca3
#756 : update UI
2013-02-06 13:42:34 +04:00
6e440d56ff
#880 : fix UI for creating container
2013-02-04 17:54:09 +04:00
c8ae6053af
Merge branch 'master' into 880-add-publish-again-option-for-build-list
2013-02-04 17:48:34 +04:00
27251a38be
Merge pull request #884 from warpc/881-disable-personal-repository-on-creating-build-list
...
[refs #881 ]: Ability do not conntect personal repository as packages source.
2013-02-04 05:30:14 -08:00
cfdd905306
#881 : move "use_save_to_repository" field on #new page
2013-02-04 17:04:59 +04:00
973fabb31f
#880 : add option "Publish again" for build list
2013-02-01 18:39:17 +04:00
871976af26
#881 : update UI, API of #show action
2013-02-01 14:14:11 +04:00
e9d666877c
#881 : add "use_save_to_repository" into BuildList
2013-02-01 14:00:56 +04:00
8860238da4
[refs #878 ] fix some bugs when no master branch
2013-01-31 22:26:49 +06:00
ad08a31e5f
#860 : merge master into branch
2013-01-29 23:23:52 +04:00
fed1c76ca2
#860 : update logic for creating build list container
2013-01-28 18:44:06 +04:00
3e0efd8973
Merge pull request #855 from warpc/765-form_resize
...
[refs #765 ] add CodeMirror resizable ability for git edit fields
2013-01-28 01:24:49 -08:00
421fa2880c
[refs #765 ] add CodeMirror resizable ability
2013-01-28 14:15:01 +06:00
f4c3d23d7c
create container for BuildList
2013-01-25 21:24:46 +04:00
d8b1d68ea9
#851 : hot fix
2013-01-25 15:51:16 +04:00
bf445d9e5e
Merge pull request #850 from warpc/848-add-status-information-for-product-build-lists
...
[refs #848 ]: add status information about servers for ProductBuildLists
2013-01-25 03:37:41 -08:00
6c6882a710
#851 : change message
2013-01-25 15:31:00 +04:00
3c21ef6272
#851 : update #show view
2013-01-25 15:01:55 +04:00
b46c1e963f
#848 : update StatusInspector, UI
2013-01-24 14:42:03 +04:00
f0928badc8
#836 : update build_lists UI, API
2013-01-22 19:28:59 +04:00
d2a876c9cb
#843 : remove 'latest_' prefix
2013-01-21 21:08:19 +04:00
86034c5da4
#843 : update pages for using only new_core
2013-01-21 19:52:20 +04:00
c521e5d77e
#780 : add sha1 field into build_list_packages table, update models, views
2013-01-10 15:16:08 +04:00
e27c01a711
Merge pull request #824 from warpc/712-refactoring-css
...
[issue #795 ] The wrong time to be displayed on the page assembly jobs when user have incorect local time
2012-12-28 11:44:18 -08:00
079d6578d3
[issue #795 ] output server time
...
reduction to a single style
2012-12-28 20:34:10 +04:00
87a6134da0
[issue #795 ] output server time
...
hot fix
2012-12-28 18:03:17 +04:00
dcc936fdb6
[issue #795 ] output server time
...
fix
2012-12-28 17:50:40 +04:00
5e28b81046
[issue #795 ] output server time
...
Time change from local to server
2012-12-28 15:02:59 +04:00
ea14f541fe
#784 : merge master into the branch
2012-12-24 18:11:27 +04:00
f25a988730
#784 : remove "build_requires" from BuildList
2012-12-24 17:17:21 +04:00
ac762388a4
#800 : enable "new_core" for personal platforms
2012-12-24 16:35:29 +04:00
6526106d9e
#755 : enable "publish" button on #show page
2012-12-11 16:06:41 +04:00
62a761a7c9
#766 : add filter to /build_lists page
2012-12-10 16:15:22 +04:00
e3e228de33
#759 : add tester role for user
2012-12-06 22:04:39 +04:00
128b4104f1
#751 : update link to version of BuildList::Item
2012-12-04 20:13:55 +04:00
5defd009d3
#751 : show link to diff in "Items" section
2012-12-04 19:48:30 +04:00
b4472a1403
#751 : open logs of (Product)BuildList in new window
2012-12-04 19:20:59 +04:00
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
51bf88c892
[refs #674 ] rename column
2012-12-04 16:24:28 +06:00
bff88e86e3
[refs #674 ] small diff message for build lists
2012-12-04 00:04:03 +06:00
b132a56937
Merge branch 'master' into 674-diff_between_commits
...
Conflicts:
db/schema.rb fresh
2012-12-04 00:02:45 +06:00
3ef841184c
fill packages of BuildList when use new_core
2012-12-03 21:17:20 +04:00
0669fb2789
[refs #674 ] small changes
2012-12-03 22:52:11 +06:00
d325838b1f
Merge branch 'master' into 735-package-build-server
2012-12-03 15:38:03 +04:00
ee73df5d3a
disable auto_publish for new_core, some refactoring
2012-12-03 15:28:27 +04:00
611402c4c2
[refs #674 ] add stats
2012-12-03 17:11:55 +06:00
bc1ab2f8aa
show results-table only for BuildList with new_core
2012-11-30 14:55:14 +04:00
fcdbfd4538
add new column to build_lists table, some refactoring
2012-11-30 14:41:39 +04:00
791f77dfd5
add 'New core' option for creating build_list
2012-11-29 19:12:24 +04:00
76606036cb
[refs #737 ] remove branch from commit message
2012-11-28 19:15:15 +06:00
8ed71e0f03
[refs #674 ] fixed undefined method 'binary?' for nil:NilClass when rename the file
2012-11-27 23:35:58 +06:00
3d6269da9b
add results column to build_lists table
2012-11-27 18:22:17 +04:00
7be2df7578
[refs #674 ] first step of the diff between commits
2012-11-20 01:15:15 +06:00
21d8a42072
merge master into the branch
2012-11-12 20:52:33 +04:00
8f9cd0ff8a
updated logger on build product page
2012-11-09 21:42:25 +04:00
26af1aa27c
Merge branch 'master' into 90-fix_orphan_pulls
...
Conflicts:
app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
c6a0dfee97
[refs #90 ] fixed orphan pulls
2012-10-28 00:04:28 +06:00
95e5804358
[refs #90 ] fixed git timeout error on the big diff
2012-10-26 20:03:46 +06:00
ecf8e7e5ee
[refs #579 ] fixed wiki & refactoring
2012-10-18 18:51:28 +06:00
c6f45956cc
[refs #90 ] fixed error by 24fd99b2d5cab
2012-10-18 18:50:43 +06:00
7870ffef7d
[refs #579 ] fixed some bugs
2012-10-18 00:38:42 +06:00
3868fbf4f3
[refs #579 ] forgot change to the pull.repo
2012-10-16 19:22:19 +06:00
9579734506
[refs #579 ] some optimization by getting pull repo
2012-10-16 16:19:53 +06:00
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
cef112efc3
[refs #579 ] first version of the outdated diff
2012-10-16 00:14:43 +06:00
ef37180825
[refs #579 ] small activity refactoring
2012-10-15 22:50:21 +06:00
fb1288e382
[refs #579 ] ugly sorting common pull comments
2012-10-15 22:33:16 +06:00
a7a442c4e1
[refs #90 ] fixed rendering diff
2012-10-15 21:24:29 +06:00
00323cec82
[refs #579 ] grouped commits
2012-10-15 16:03:35 +06:00
c5d6707b8f
[refs #579 ] fixed commit comments errors
2012-10-13 01:57:54 +06:00
bb47567628
[refs #579 ] small improvements of the discussion
2012-10-13 00:12:04 +06:00
6981a7f238
[refs #648 ] disable submiting the project filter form
2012-10-12 16:24:51 +06:00
993454fc29
[refs #579 ] alpha version of the pull discussion
2012-10-11 23:50:40 +06:00
a7bb5f48ba
[refs #90 ] fixed wiki diff
2012-10-11 01:16:47 +06:00
548f698526
[refs #579 ] add a line comment button
2012-10-08 20:42:38 +06:00
f12634cee8
[refs #579 ] add link to comments
2012-10-08 15:14:31 +06:00
ed7aec602f
[refs #579 ] alpha version of the pull inline comments
2012-10-06 01:19:05 +06:00
2360a25a42
[refs #579 ] fixed many errors
2012-10-05 17:02:25 +06:00
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
a24ea9a4b1
[refs #579 ] fixed & refactoring markdown help
2012-10-05 14:16:27 +06:00
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
d2c338e4e4
Merge pull request #665 from warpc/90-ui
...
[refs #90 ] pull request ui + fixes
2012-10-02 10:41:06 -07:00
cb994c6fd6
#349 : created autocompletes_controller, refactoring, updated specs
2012-10-02 20:54:55 +04:00
f66f80c128
Merge branch 'master' into 90-ui
...
Conflicts:
spec/controllers/projects/pull_requests_controller_spec.rb
2012-10-02 19:43:23 +06:00
f92f209323
[refs #90 ] fixed changing base project
2012-10-01 23:43:15 +06:00
948e0892bf
[refs #90 ] markdown in create pull
2012-10-01 22:48:26 +06:00
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
9b9295ba4f
[refs #90 ] change ui on create pull
2012-09-28 23:46:02 +06:00
fb8d1ded5f
#90 : added some specs for pull requests
2012-09-28 19:08:51 +04:00
e310f5607c
#90 : removed unnecessary code
2012-09-27 23:30:59 +04:00
dfada7a270
#90 : fixed NoMethodError on #show page for guest
2012-09-27 21:21:10 +04:00
3fdca32e0e
#90 : updated styles
2012-09-27 20:59:48 +04:00
da006871ba
#90 : small refactoring, moved views
2012-09-27 20:32:28 +04:00
f41aaecd72
#90 : added commits and comments for commits to pull-request discussion
2012-09-27 19:40:19 +04:00
a994e7dd74
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 23:10:45 +06:00
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
0ebc545b01
#90 : small refactoring of views
2012-09-26 19:16:34 +04:00
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
eba6a14e0b
[refs #90 ] very small refactoring
2012-09-26 15:27:24 +06:00
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
47a73a4ddb
[refs #90 ] fixed existing project name
2012-09-25 21:47:08 +06:00
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
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
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
d15094f128
#648 : moved 'Create' button
2012-09-25 00:03:33 +04:00
91f215351c
#648 : small refactoring according to comment
2012-09-24 23:27:00 +04:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04: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
8c07e5a516
[issue #590 ] Fixed bug in JS timeparser.
2012-08-11 22:46:39 +04:00
2ad94139af
[issue #590 ] Fixed bug in JS timeparser.
2012-08-11 22:15:11 +04:00
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
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
9030056c1b
[issue #590 ] Changed _build_list partial.
2012-08-10 20:14:45 +04:00
e7407ae28f
[issue #590 ] Dirty hack to fix BuildList#index
2012-08-10 19:08:26 +04:00
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
e5e8cc7e7f
[issue #590 ] Changed time representation.
...
* Removed buggy jquery.countdown plugin
* Page reloads every minute
2012-08-09 20:39:01 +04:00
5cb2853c66
[issue #590 ] Added timers to BuildList index page.
2012-08-09 01:10:39 +04:00
ec7d132a3f
[refs #90 ] fixed update commits button
2012-08-08 23:57:03 +06:00
9bf2f728a7
[refs #90 ] change new action from post to get
2012-08-08 23:21:49 +06:00
910aac939e
[refs #90 ] fixed changing tabs & anchors
2012-08-08 21:47:58 +06:00
35642102dd
[refs #90 ] fixed show merge button
2012-08-07 19:25:08 +06:00
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
be71f7e22f
[issue #590 ] Fixed translation. Added repository link to container
2012-08-06 17:05:05 +04:00
b48762f174
[issue #590 ] Fixed translation. Added repository link to container
2012-08-06 17:04:05 +04:00
73e9e0be94
[issue #590 ] Changed BuildList show page.
2012-08-06 16:44:44 +04:00
cef621d6ae
[issue #590 ] Changed BuildList show page.
2012-08-06 16:42:58 +04:00
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
dadbaefea4
[issue #590 ] On monitoring page platform changed to repository.
2012-08-06 16:31:44 +04:00
0e3e5c0ce1
Merge pull request #600 from warpc/590-build_list_page_change
...
[refs #590 ] build list page change:
* Fix migration;
* Repository rights checking moved to controller;
* Repository fetches through project and platform.
2012-08-06 04:18:26 -07:00
b963c9342a
[issue #590 ] Repository fetches through project and platform
2012-08-06 14:59:07 +04:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
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
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
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
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
1269806aae
Hide another raw link for huge blobs. Refs #263
2012-07-31 22:24:27 +03:00
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
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
6c11597de6
Merge branch 'master' into 90-pull
2012-07-30 16:53:59 +06:00
63801e2676
[issue #590 ] Platform fetches through repository.
2012-07-27 23:37:56 +04:00
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
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
5aecdc203b
Merge pull request #571 from warpc/263-refactoring
...
[refs #263 ] Big git refactoring
2012-07-27 04:51:34 -07:00
bc2eb541f3
[refs #583 ] Change and to &&
2012-07-27 03:17:37 +04:00
3e4c03dd6a
[issue #583 ] Added missing check to BuildList page
2012-07-27 01:44:15 +04:00
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
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
35b953ac11
[refs #90 ] add commit/pull lines ref
2012-07-19 22:42:37 +06:00
2cc3798cdc
Merge branch 'master' into 263-refactoring
2012-07-19 18:58:47 +03:00
1f0887ac97
[refs #570 ] Change localization for fields(part 2)
2012-07-18 23:26:13 +04:00
c5686c76d3
Merge branch '570-mass_builds_status_counters_bug' of github.com:warpc/rosa-build into 570-mass_builds_status_counters_bug
2012-07-18 23:08:57 +04:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
b7911f3585
[refs #90 ] fixed create pull button text
2012-07-18 16:29:55 +06:00
08534810f6
[refs #569 ] tuning fork modal
2012-07-17 20:25:02 +06:00
cd681ab0ae
[refs #569 ] fixed fork modal
2012-07-17 19:49:13 +06:00
966368a660
[refs #90 ] show same title and body for issues and pulls
2012-07-17 16:50:40 +06:00
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
5b4c9b0948
[refs #90 ] remove reduntant information
2012-07-16 23:38:45 +06:00
b903969aa6
[refs #90 ] changed displaying status message
2012-07-16 23:02:04 +06:00
34e97510cd
[refs #90 ] modify pull headers
2012-07-16 22:27:41 +06:00
56db0fffd0
[refs #90 ] small refactoring
2012-07-16 14:46:44 +06:00
26617b7739
[refs #90 ] add close/reopen button
2012-07-12 20:15:28 +06:00
3290adb0b1
[refs #90 ] fixed merge ability
2012-07-10 22:58:39 +06:00
10b828c644
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
cfb16f8118
[issue #561 ] Fixed bug on BuildList#show page
2012-07-10 03:57:25 +04:00
f83a1ae6c2
[issue #561 ] Changed translations.
2012-07-10 02:55:34 +04:00
3195969aab
[issue #561 ] Added bs_id to BuildList#show
2012-07-10 02:14:31 +04:00
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
8c5a8c884d
[issue #561 ] Some DB query optimization.
2012-07-10 01:13:55 +04:00
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
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
d7ee0fe938
Merge pull request #559 from warpc/428-advisory
...
[refs #428 ] Advisory: new look
2012-07-09 08:44:13 -07:00
2839dc14b6
[issue #428 ] Using #name_with_owner in projects pages.
2012-07-09 19:19:30 +04:00
dd221cc880
[refs #90 ] autocomplete
2012-07-06 23:30:01 +06:00
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
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
7b0c135a24
[refs #90 ] fixed pull button
2012-07-04 20:22:23 +06:00
a909a92ae8
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
db/schema.rb
2012-07-04 18:10:03 +04:00
07372dd1a3
[refs #442 ] Fix mass_builds link
2012-07-04 18:09:59 +04:00
8c88e7a0da
[issue #428 ] Some code simplification.
2012-07-04 15:42:43 +04:00
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
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
004f603e02
[refs #442 ] Add new actions rights. Cancel build list btn rights fix
2012-06-29 23:10:18 +04:00
01db786728
[refs #442 ] remove double checking
2012-06-29 17:39:54 +06:00
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
8768317323
[refs #90 ] fix issue path
2012-06-26 15:52:20 +06:00
Vokhmin Alexey V
Vladimir Sharshov
Alexander Machehin
Julea Pikareva
Pavel Chipiga
George Vinogradov
Pasha
konstantin.grabar