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
Vokhmin Alexey V
e055d0080b
#29 : removed hack for encoding
2013-03-18 15:36:16 +04: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
Alexander Machehin
28329bbe5b
[refs #90 ] fixed ref link
2012-07-18 17:17:15 +06:00
Alexander Machehin
dc521f5844
[refs #90 ] link to refs
2012-07-17 22:40:48 +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
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
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
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
George Vinogradov
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +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
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
6aa9cfaa50
[refs #90 ] view pull status
2012-06-25 22:04:43 +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
afc8572b35
[refs #90 ] remove redirection to pull
2012-06-06 00:08:32 +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
26baf999f4
[refs #90 ] diff stats
2012-05-29 23:09:43 +06:00
konstantin.grabar
82b5999e32
[refs #442 ] Add sidebar
2012-05-28 14:28:19 +04: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
konstantin.grabar
c74de8b84d
[refs #442 ] Add new page for mass rebuild, new fields and new functional
2012-05-23 18:08:11 +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
George Vinogradov
9a0f582a16
[issue #428 ] Fixed typo in PlatformsHelper
2012-05-10 20:04:48 +04:00
George Vinogradov
f8d32495b8
[issue #428 ] Added title. Changed BuildListsController#update
2012-05-10 19:15:50 +04:00
George Vinogradov
26a643eed1
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/controllers/projects/build_lists_controller.rb
db/schema.rb
2012-05-05 21:33:39 +04:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
Pavel Chipiga
614f8cd5f9
Refactor active menu detection. Refs #433
2012-05-05 19:15:49 +03: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
George Vinogradov
de093d7065
[issue #425 ] Changed object to actor in Relation and to eventable in
...
EventLog
2012-04-26 05:38:33 +04: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
Vladimir Sharshov
5b5aec490a
Merge pull request #409 from warpc/396-rss_atom_feed
...
[refs #396 ] Add atom feed for activity feed
2012-04-19 07:08:59 -07:00
George Vinogradov
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
konstantin.grabar
8d723ee0be
[refs #396 ] Fix title truncate and strip. Add feed main title.
2012-04-17 19:38:02 +04:00
George Vinogradov
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
George Vinogradov
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
Pavel Chipiga
20e5936d0c
Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263
2012-04-05 00:43:06 +03:00
Vladimir Sharshov
fef3affc07
[Refs #263 ] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action
2012-04-01 19:19:54 +04:00
Vladimir Sharshov
0c2850b455
[Refs #367 ] Fix hardcoded protocol for git repo urls
2012-03-31 20:36:32 +04:00
Alexander Machehin
a113efad3e
[refs #340 ] title -> set_meta_tags
2012-03-30 22:37:54 +06:00
Alexander Machehin
d18e55f180
[refs #340 ] titles - part2
2012-03-30 22:37:54 +06:00
Alexander Machehin
e14e2db6c3
[refs #340 ] first part of titles
2012-03-30 22:36:20 +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
Pavel Chipiga
4553affa56
Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190 , #134
2012-03-22 19:11:12 +02: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
Vladimir Sharshov
abe06b5068
Merge pull request #305 from warpc/223-monitoring_design
...
[Refs #223 ] monitoring design for current task
2012-03-19 03:28:30 -07:00
Alexander Machehin
30038f4c9c
[refs #265 ] show 10 symbols of the commit hash
2012-03-19 15:58:30 +06:00
konstantin.grabar
348fd40daf
[refs #223 ] Fix build status color helpers
2012-03-19 12:39:46 +04:00
konstantin.grabar
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +04:00
konstantin.grabar
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
George Vinogradov
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
Alexander Machehin
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
George Vinogradov
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
Vladimir Sharshov
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
George Vinogradov
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
Alexander Machehin
6a7d9636f5
[refs #265 ] fixed user avatars
2012-03-11 23:06:41 +06:00
Alexander Machehin
6d5120e5cc
Merge branch '3.2-master' into 265-new_design_for_activity_feed
2012-03-11 22:44:25 +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
George Vinogradov
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
Alexander Machehin
7588a318da
Merge branch '3.2-master' into 265-new_design_for_activity_feed
...
Conflicts:
app/models/user.rb
2012-03-07 03:58:35 +06:00
Pavel Chipiga
7308c4a0d2
Merge branch '3.2-master' into 255-search
...
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
2012-03-06 20:59:29 +02:00
konstantin.grabar
9565d58e8f
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-06 20:13:53 +04:00
Vladimir Sharshov
9d8eb8a3f2
Merge pull request #269 from warpc/195-new_design_for_projects
...
[Refs #195 ] Add blane functions. Fixed syntax highlighting. Stub for rpm-specs.
2012-03-05 09:07:36 -08:00
George Vinogradov
93e2caccc8
[issue #195 ] Added blame view.
2012-03-05 19:29:05 +04:00
konstantin.grabar
73296059eb
[refs #257 ] Merge 3.2-master into 257-new_design_for_profiles
2012-03-05 13:42:39 +04:00
konstantin.grabar
c176304088
Add first version of new design to activity feed. Add new scope to BuildList model. Fix one moment into observer.
2012-03-05 13:11:50 +04:00
konstantin.grabar
9b68752ffd
[refs #257 ] Change avatar helper and logic. Add paperclip avatar to users
2012-03-03 22:05:02 +04:00
Pavel Chipiga
56a12dc9ea
Merge branch 'master' into 3.2-master
...
Conflicts:
app/models/comment.rb
app/models/issue.rb
config/locales/en.yml
2012-03-03 01:38:43 +02:00
George Vinogradov
6522650c5a
[issue #195 ] Merge branch '3.2-master' into 195-new_design_for_projects
...
Conflicts:
app/views/git/blobs/_show.html.haml
2012-03-02 20:58:28 +04:00
George Vinogradov
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
Alexander Machehin
7164dd580e
[refs #230 ] fix error messages + some refactoring
2012-03-02 18:27:38 +06:00
George Vinogradov
6cfb5d0c3d
[issue #195 ] Fixed bug with encodings. Added avatar. Stubbed blame.
2012-03-02 04:39:43 +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
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
George Vinogradov
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
konstantin.grabar
bc75b318ce
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-29 21:37:28 +04:00
konstantin.grabar
c5d8041296
[refs #195 ] Add global fixes to projects and collaborators logic
2012-02-29 18:45:04 +04:00
Pavel Chipiga
cefaa902b1
Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223
2012-02-29 16:04:38 +02: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
e9ae923b60
[refs #195 ] Merge 3.2-master into 195-new_design_for_projects
2012-02-28 20:10:31 +04:00
Alexander Machehin
bc4a157703
Merge branch '3.2-master' into 194-tracker
...
Conflicts:
app/assets/stylesheets/application.scss
app/views/issues/_form.html.haml
app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin
27c85d32df
[refs #194 ] create page; index pagination; some bugs
2012-02-27 22:10:12 +06:00
George Vinogradov
f7b496bb39
Some fixes:
...
* Changed default visibility to personal platforms to 'open'
* Changed 'Erase' button to simple link in comments partial
* Probably added domain name to links in mail notifications
* Fixed protocol in repo links form 'http' to 'https'
2012-02-24 19:27:56 +04:00
George Vinogradov
1bc4efcdc4
[issue #64 ] Fixed encodings bugs
2012-02-24 19:27:54 +04:00
George Vinogradov
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
George Vinogradov
5dac20bac5
Some fixes:
...
* Changed default visibility to personal platforms to 'open'
* Changed 'Erase' button to simple link in comments partial
* Probably added domain name to links in mail notifications
* Fixed protocol in repo links form 'http' to 'https'
2012-02-15 20:30:56 +04:00
George Vinogradov
85723f7da6
[issue #64 ] Fixed encodings bugs
2012-02-14 18:54:18 +04:00
konstantin.grabar
5039907431
Merge branch 'master' into 123-activity-feed
2012-02-14 14:30:27 +04:00
George Vinogradov
99ee490e94
[issue #64 ] Added callback for notifications + some minor changes
2012-02-14 03:30:17 +04:00
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
konstantin.grabar
96d3b35bdf
[refs #123 ] Merge master into 123-activity-feed
2012-02-06 19:46:32 +04:00
Alexander Machehin
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
Alexander Machehin
a79a081fd1
Merge branch 'master' into 151-grit_encodings_problems
2012-02-06 19:55:59 +06:00
George Vinogradov
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
George Vinogradov
0591ba4378
[ fix #158 ] Fixed bug with render in BlobController#raw
2012-02-04 22:03:29 +04:00
George Vinogradov
e05f391f8e
[issue #64 ] Write User.uname instead of User.name to commit
2012-02-03 04:04:20 +04:00
George Vinogradov
8733c4dc34
[issue #64 ] Some dirty hacks.
...
Diff for file with russian name don't work yet.
2012-02-01 03:20:42 +04:00
George Vinogradov
6f78e5456c
[issue #64 ] Changes for ruby 1.9.3 compatibility.
2012-01-31 20:40:46 +04:00
George Vinogradov
24124766f4
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
config/locales/en.yml
db/schema.rb
2012-01-31 02:07:11 +04:00
George Vinogradov
07e71c2dfc
[issue #64 ] Changed find_by to where
2012-01-31 01:20:03 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
George Vinogradov
2a27cd3662
[issue #64 ] Some fixes.
2012-01-30 19:27:54 +04:00
George Vinogradov
5f40030e30
[issue #64 ] Fixed bug with cloning wiki repository
2012-01-30 18:17:00 +04:00
George Vinogradov
706c052a5e
[issue #64 ] User names are clickable.
2012-01-29 22:03:42 +04:00
George Vinogradov
acdd1f22b6
[issue #64 ] Fixed bug with revert all wiki.
2012-01-28 16:10:43 +04:00
George Vinogradov
324e9a294f
[issue #64 ] Fixed some bugs.
2012-01-27 22:30:45 +04:00
George Vinogradov
549f0a55e8
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
Gemfile.lock
app/models/project.rb
app/models/user.rb
app/views/projects/_form.html.haml
config/locales/ru.yml
db/schema.rb
2012-01-27 18:27:23 +04:00
konstantin.grabar
0eb0eb9713
[refs #123 ] Activity Feed logic global refactoring.
2012-01-26 21:04:58 +04:00
konstantin.grabar
990a46018c
[refs #123 ] Add base logic for activity feed
2012-01-25 12:31:49 +04:00
konstantin.grabar
f46b179486
[refs #113 ] Add json to mime types list
2012-01-20 22:40:00 +04:00
konstantin.grabar
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
George Vinogradov
011efb0c4b
[issue #64 ] Added git access to Wiki.
2012-01-20 19:01:59 +04:00
George Vinogradov
364f2e40c0
[issue #64 ] Added Wiki history, compare, revert.
2012-01-20 03:25:15 +04:00
George Vinogradov
0c527af291
[issue #64 ] Added revisions comparsion.
2012-01-19 17:49:32 +04:00
George Vinogradov
7afcc3a617
[issue #64 ] Some fixes.
2012-01-18 18:33:09 +04:00
George Vinogradov
2522dd3c63
[issue #64 ] Added page history views.
2012-01-18 03:30:54 +04:00
George Vinogradov
1e1dab369b
[issue #64 ] Added some views, styles and scripts.
...
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
2012-01-17 01:48:38 +04:00
George Vinogradov
729bd94045
[issue #64 ] Merge branch 'master' into 64-project_wiki
...
Conflicts:
config/routes.rb
db/schema.rb
2012-01-13 18:05:42 +04:00
konstantin.grabar
2b8aca5f09
[refs #54 ] Add settings notifier
2012-01-11 17:58:13 +04:00
George Vinogradov
81378478ca
[issue #64 ] Added Wiki controller and some methods in Project
2011-12-26 21:07:07 +04:00
konstantin.grabar
ce6746f7a9
[refs #54 ] Add subscribes and notifications
2011-12-26 19:48:57 +04:00
konstantin.grabar
d20d43eb2b
[refs #54 ] Base logic and templates for issues and comments to them
2011-12-19 19:30:14 +04:00
Pavel Chipiga
796ff75857
Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249
2011-11-24 23:48:58 +02:00
Pavel Chipiga
a9026bd6f8
Change git_repo_url logic. Refs #2261
2011-11-22 20:58:23 +02:00
Pavel Chipiga
3b36943b91
Remove gitolite and it callbacks. Add git repo create, destroy callbacks. Improve grack wrappers: separate read/write requests, ask password for push even for public repo, prepare for cancan, apply hooks, refactor. Fix auto_build_lists order. Refactor auto_build - move to model. Redo git_repo_url. Improve and test project import script. Fix bugs, refactor and cleanup. Refs #2243
2011-11-17 23:57:30 +02:00
Pavel Chipiga
7996740ae7
Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161
2011-11-11 19:13:09 +02:00
Pavel Chipiga
da784b0bc2
Improve git_repo_url helper. Refs #2162
2011-11-10 11:04:24 +02:00
konstantin.grabar
92011e493b
[refs #2161 ] Add new titles to application
2011-11-02 00:18:52 +04:00
George Vinogradov
b9ee6e365b
Added collaborators management.
2011-10-31 02:59:03 +04:00
konstantin.grabar
30564e8e17
[refs #2161 ] Add auto build lists functional
2011-10-29 23:09:50 +04:00
Pavel Chipiga
f66216fa6a
Change project redirect rules. Fux git repo clone port. Refs #2136
2011-10-28 01:44:02 +03:00
konstantin.grabar
89312375fd
Merge master and personal_repos
2011-10-27 17:13:53 +04:00
konstantin.grabar
3114eb1ecc
[refs #2106 ] Add personal repos to project. Some changes of private repos controller and logic
2011-10-27 17:04:03 +04:00
Pavel Chipiga
7b9fa26ac8
Remove git_projects_path application config var. usr root_path instead. Fix bugs. Improve links, usability, refactor. Refs #2136
2011-10-27 15:49:26 +03:00
Pavel Chipiga
0171a0a42a
Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136
2011-10-26 23:57:51 +03:00
konstantin.grabar
d04de6e2fc
[refs #1832 ] Fixed git repos web interface routes
2011-10-24 14:19:04 +04:00
George Vinogradov
1659ad5805
Merge branch 'private_repos'
...
Conflicts:
config/application.yml.sample
config/locales/ru.yml
config/routes.rb
db/schema.rb
2011-10-20 19:49:35 +04:00
santaux
5f17928423
[refs #1923 ] Add private repositories to project
2011-10-18 17:47:17 +04:00
santaux
8103b14e15
[refs #1861 ] Add downloads statistics
2011-10-14 10:35:25 +04:00
Alexey Nayden
cd6e7ade15
Product Builder xml-rpc and Product model
2011-04-11 12:35:08 +04:00
Timothy N. Tsvetkov
6120547800
AwEsOmE blame + minor fixes
2011-04-04 15:28:33 +04:00
Timothy N. Tsvetkov
efbd64e924
the aWeSOME commit view (with REALLY AWESOME view for git diffs)
2011-04-01 07:44:21 +04:00
Timothy N. Tsvetkov
5135f048a5
some views for git
2011-04-01 04:36:34 +04:00
Alexey Nayden
c116f23b7e
even more minor ui fixes
2011-03-31 16:13:04 +04:00
Alexey Nayden
002dc417b5
Container/Arch/Rpm
2011-03-16 00:52:27 +03:00
Timothy N. Tsvetkov
5bc5638934
friday fixes lets drink vodka for your money very well
2011-03-11 20:19:47 +03:00
Timothy N. Tsvetkov
5d4ca333da
commit and diff helpers
2011-03-10 16:33:50 +03:00
Alexey Nayden
0a7c0e4e9b
Platforms list + UI enchancements
2011-03-10 14:35:46 +03:00
Alexey Nayden
af3c9b52be
Hoptoad + blank platforms#index
2011-03-09 22:27:51 +03:00