87f16a6b69
#946 small refactoring
2013-02-25 13:50:53 +06:00
ff522d9ef4
#757 : revert changes in #can_publish? method
2013-02-22 18:29:22 +04:00
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
5f97791dc2
#944 small refactoring
2013-02-22 16:26:06 +06:00
00639963cb
#944 disable tags at branches
2013-02-22 15:34:12 +06:00
3dda72a0ac
Merge branch 'master' into 921-task-monitoring
...
Conflicts:
app/assets/javascripts/extra/build_list.js
2013-02-21 00:54:04 +06:00
e5db61197e
[refs #921 ] add new filter to the build list monitoring
2013-02-20 21:07:11 +06:00
067f06526a
#757 : some refactoring
2013-02-19 23:29:13 +04:00
65b98a2d00
#757 : update name of methods, API
2013-02-19 19:22:38 +04:00
d585978550
#921 modify task monitoring page
2013-02-14 22:59:52 +06:00
3c39013d98
#908 : update #container_url method
2013-02-11 20:36:56 +04:00
c46ee80e7a
#908 : update path to container for MDV platforms
2013-02-11 18:15:26 +04:00
d159948830
[refs #901 ] add anchor to lines
2013-02-08 16:25:05 +06:00
8629ae8ca3
#756 : update UI
2013-02-06 13:42:34 +04:00
6473b73859
[refs #90 ] fix bug with long-name branches on creating pull request
2013-01-31 19:23:07 +06:00
52cd67e1c3
#860 : small refactoring
2013-01-29 01:50:27 +04:00
fed1c76ca2
#860 : update logic for creating build list container
2013-01-28 18:44:06 +04:00
f4c3d23d7c
create container for BuildList
2013-01-25 21:24:46 +04:00
10d6173780
[refs #847 ] remove platform_not_found status
2013-01-25 17:18:28 +06:00
090f40caee
[refs #847 ] removed PLATFORM_PENDING & PROJECT_NOT_FOUND statuses
2013-01-24 23:55:24 +06:00
643e163652
[refs #847 ] refactoring
2013-01-24 19:09:26 +06:00
d2a876c9cb
#843 : remove 'latest_' prefix
2013-01-21 21:08:19 +04:00
62a761a7c9
#766 : add filter to /build_lists page
2012-12-10 16:15:22 +04:00
dc1525b85e
[refs #762 ] add mass build from list
2012-12-06 23:59:17 +06:00
128b4104f1
#751 : update link to version of BuildList::Item
2012-12-04 20:13:55 +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
42e76f5fa6
[refs #674 ] fix undefined method 'last_published_commit_hash' for product build list
2012-12-04 09:33:04 +06:00
5019d27b50
[refs #674 ] small helper refactoring
2012-12-04 00:09:36 +06:00
bff88e86e3
[refs #674 ] small diff message for build lists
2012-12-04 00:04:03 +06:00
ec6279d803
[refs #674 ] add diff to build lists
2012-12-03 23:43:24 +06:00
3ef841184c
fill packages of BuildList when use new_core
2012-12-03 21:17:20 +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
51aff682d4
some refactoring according to Alexander's comments
2012-11-12 20:23:11 +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
6a7035d551
added #show action for product_build_list
2012-11-06 22:01:54 +04:00
217a92b443
[refs #90 ] fix pull header
2012-10-28 00:45:24 +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
54f462f408
[refs #579 ] small refactoring
2012-10-19 15:50:15 +06:00
ecf8e7e5ee
[refs #579 ] fixed wiki & refactoring
2012-10-18 18:51:28 +06:00
7870ffef7d
[refs #579 ] fixed some bugs
2012-10-18 00:38:42 +06:00
f060d919d9
[refs #579 ] add new helper
2012-10-16 19:20:55 +06:00
fb1288e382
[refs #579 ] ugly sorting common pull comments
2012-10-15 22:33:16 +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
993454fc29
[refs #579 ] alpha version of the pull discussion
2012-10-11 23:50:40 +06:00
548f698526
[refs #579 ] add a line comment button
2012-10-08 20:42:38 +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
527dd210bf
[refs #579 ] alpha version of inline comments for commit
2012-10-05 00:40:12 +06:00
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
9b9295ba4f
[refs #90 ] change ui on create pull
2012-09-28 23:46:02 +06:00
64ee8b6845
[refs #90 ] change pull header
2012-09-28 21:49:10 +06:00
da006871ba
#90 : small refactoring, moved views
2012-09-27 20:32:28 +04:00
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
0299c069c6
#90 : style changes for header, increase performanse for #autocomplete_base_project action
2012-09-25 19:18:22 +04: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
40999debbf
#648 : updated projects_helper
2012-09-25 13:50:28 +04:00
0bb9f38b66
#648 : collor for labels has been changed
2012-09-24 22:44:06 +04:00
1e468b5073
#648 : updated styles, added icons for filters
2012-09-24 22:36:02 +04:00
9be978eb68
#648 : updated models, JS, controller according to comments and discussions
2012-09-24 22:04:53 +04:00
2c6d4bae9e
[refs #616 ] add error messages to ajax
2012-09-24 23:34:14 +06:00
1f63fec004
Revert "[refs #616 ] dont filter html"
...
This reverts commit 68eac7a9de083d6a29503ac2900b3dd404e22c0c.
2012-09-21 19:22:27 +06:00
96f8a9a43f
[refs #616 ] dont filter html
2012-09-20 23:48:20 +06:00
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +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
910aac939e
[refs #90 ] fixed changing tabs & anchors
2012-08-08 21:47:58 +06:00
ea930308df
[refs #90 ] small pull helper refactoring
2012-08-07 23:02:58 +06:00
7a16bac06a
[refs #90 ] fixed error after merging with master
2012-08-07 22:35:15 +06:00
6a04f4ad7a
Merge again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-06 11:19:06 +06:00
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
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
01a3572de0
Minor update. Fix helper bug. Minor refactor. Refs #263
2012-07-31 17:35:18 +03: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
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
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
35b953ac11
[refs #90 ] add commit/pull lines ref
2012-07-19 22:42:37 +06:00
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
28329bbe5b
[refs #90 ] fixed ref link
2012-07-18 17:17:15 +06:00
dc521f5844
[refs #90 ] link to refs
2012-07-17 22:40:48 +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
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
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
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
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +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
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
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +06:00
5f50bacbe6
[refs #90 ] some refactoring with rtruncate method
2012-06-08 13:38:24 +06:00
62128d2c72
[refs #90 ] change diff anchors to digits
2012-06-08 01:20:06 +06:00
Alexander Machehin
Vokhmin Alexey V
Vladimir Sharshov
George Vinogradov
Pavel Chipiga