Alexander Machehin
a24ea9a4b1
[refs #579 ] fixed & refactoring markdown help
2012-10-05 14:16:27 +06:00
Alexander Machehin
21a5115137
[refs #579 ] fixed destroing comments
2012-10-05 12:13:14 +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
b3123a752e
#671 : updated build list api
2012-10-04 19:38:33 +04:00
Vokhmin Alexey V
21a0d982f1
#671 : updated arch field in json for build_lists API
2012-10-04 19:30:31 +04:00
Vokhmin Alexey V
f5d0d9f20b
#671 : added filter platforms by type
2012-10-04 17:34:30 +04:00
Vokhmin Alexey V
df0251282d
#671 : updated API arches controller, added specs
2012-10-04 17:13:55 +04:00
Vokhmin Alexey V
4b72501159
#671 : added Architectures API
2012-10-04 16:45:49 +04:00
Vladimir Sharshov
f10640695e
Merge pull request #670 from warpc/624-wrong-files-on-raw-downloading
...
[refs #624 ]: Fixed downloading RAW files
2012-10-04 02:44:14 -07:00
Vokhmin Alexey V
ad50934bab
#624 : fixed downloading RAW files
2012-10-04 01:20:07 +04:00
Vladimir Sharshov
ca697c0c4b
Merge pull request #669 from warpc/668-create-uploading-avatar-for-group
...
[refs #668 ]: Ability to upload avatar for group
2012-10-03 13:29:28 -07:00
Vokhmin Alexey V
33209e7200
hotfix for downloading 'tar' archives
2012-10-04 00:27:13 +04:00
Vokhmin Alexey V
04b2647ef0
#668 : added uploading avatars for groups
2012-10-03 20:38:42 +04:00
Alexander Machehin
bf7bc8787a
[refs #90 ] small controller refactoring
2012-10-03 17:59:18 +06:00
Alexander Machehin
94029c3cda
[refs #90 ] base -> to, head -> from
2012-10-03 17:58:34 +06:00
Alexander Machehin
1d424b463c
[refs #90 ] fix when creating new pull
2012-10-03 09:21:16 +06:00
Vladimir Sharshov
d2c338e4e4
Merge pull request #665 from warpc/90-ui
...
[refs #90 ] pull request ui + fixes
2012-10-02 10:41:06 -07:00
Vokhmin Alexey V
ecae06db81
#349 : removed duplicate of ability
2012-10-02 21:16:55 +04:00
Vokhmin Alexey V
cb994c6fd6
#349 : created autocompletes_controller, refactoring, updated specs
2012-10-02 20:54:55 +04:00
Alexander Machehin
f699add7b4
[refs #90 ] clean ability
2012-10-02 22:46:51 +06:00
Alexander Machehin
b3fd95d7fa
[refs #90 ] always redirect to pull on update action
2012-10-02 21:27:15 +06:00
Vokhmin Alexey V
ba7a7b20a5
#349 : updated locales, added shared template
2012-10-02 19:20:58 +04:00
Alexander Machehin
53b421d8e5
[refs #90 ] fixed pull ability for project writers & changing tests
2012-10-02 21:19:50 +06:00
Vokhmin Alexey V
c7fda1a810
#349 : updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page
2012-10-02 19:14:08 +04:00
Alexander Machehin
f66f80c128
Merge branch 'master' into 90-ui
...
Conflicts:
spec/controllers/projects/pull_requests_controller_spec.rb
2012-10-02 19:43:23 +06:00
Alexander Machehin
d36155ec7f
[refs #90 ] remove useless abilities
2012-10-02 19:24:53 +06:00
Vokhmin Alexey V
ffe38b0a08
#349 : updated Users::ProfileController and Groups::ProfileController
2012-10-02 16:04:26 +04:00
Alexander Machehin
35c965a796
[refs #90 ] add all ancestors to base project choise
2012-10-02 15:20:48 +06:00
Alexander Machehin
d948949532
[refs #90 ] new pull optimization
2012-10-02 15:14:31 +06:00
Vladimir Sharshov
226f1b592c
Merge pull request #663 from warpc/90-add-specs-for-pull-requests
...
[refs #90 ]: add specs for pull requests
2012-10-01 11:12:01 -07:00
Alexander Machehin
8f011316c3
[refs #90 ] possible fix for nil commom ancestor commit
2012-10-01 23:52:18 +06:00
Alexander Machehin
f92f209323
[refs #90 ] fixed changing base project
2012-10-01 23:43:15 +06:00
Alexander Machehin
948e0892bf
[refs #90 ] markdown in create pull
2012-10-01 22:48:26 +06:00
Alexander Machehin
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
Vokhmin Alexey V
3271fd8479
#658 : small refactoring
2012-10-01 17:33:46 +04:00
Vokhmin Alexey V
234615d728
#658 : added link to notification center in email
2012-10-01 17:08:02 +04:00
Vokhmin Alexey V
c4e974a89e
Merge branch 'master' into 90-add-specs-for-pull-requests
2012-10-01 15:42:06 +04:00
Alexander Machehin
9b9295ba4f
[refs #90 ] change ui on create pull
2012-09-28 23:46:02 +06:00
Alexander Machehin
90069b2fb6
[#refs #90 ] fix pull flashes
2012-09-28 23:45:27 +06:00
Alexander Machehin
64ee8b6845
[refs #90 ] change pull header
2012-09-28 21:49:10 +06:00
Alexander Machehin
fbc537174e
[refs #90 ] search base project by fullname
2012-09-28 21:39:45 +06:00
Vokhmin Alexey V
fb8d1ded5f
#90 : added some specs for pull requests
2012-09-28 19:08:51 +04:00
Alexander Machehin
8cb9171c17
[refs #90 ] final fix to merge
2012-09-28 20:31:21 +06:00
Alexander Machehin
0069dfffc7
[refs #90 ] catch error
2012-09-28 18:26:12 +06:00
Vladimir Sharshov
847ecc2a15
[refs #374 ] Remove unused data from build list api
2012-09-28 14:38:01 +04:00
Vokhmin Alexey V
e310f5607c
#90 : removed unnecessary code
2012-09-27 23:30:59 +04:00
Vokhmin Alexey V
7e09f17b58
Merge branch 'master' into 90-create-discussion-in-the-pull-requests-like-github
2012-09-27 22:37:54 +04:00
Alexander Machehin
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +06:00
Alexander Machehin
f579fc007a
[refs #90 ] fixed ability for pulls
2012-09-28 00:00:04 +06:00
Vokhmin Alexey V
bd04e8ea75
#90 : revert changes in the controller
2012-09-27 21:54:40 +04:00
Vokhmin Alexey V
dfada7a270
#90 : fixed NoMethodError on #show page for guest
2012-09-27 21:21:10 +04:00
Vokhmin Alexey V
3fdca32e0e
#90 : updated styles
2012-09-27 20:59:48 +04:00
Vokhmin Alexey V
da006871ba
#90 : small refactoring, moved views
2012-09-27 20:32:28 +04:00
Vokhmin Alexey V
f41aaecd72
#90 : added commits and comments for commits to pull-request discussion
2012-09-27 19:40:19 +04:00
Alexander Machehin
2b4e2f03e5
Merge pull request #585 from warpc/374-rest_api_for_builds
...
[refs #374 ] Add json responses for build lists api
2012-09-27 07:00:19 -07:00
Vladimir Sharshov
223aa33604
[refs #374 ] Add info about API doc site
2012-09-27 17:55:16 +04:00
Vladimir Sharshov
7c4c855341
[refs #374 ] Small refactoring
2012-09-27 17:41:02 +04:00
Vladimir Sharshov
a20e1552cc
[refs #374 ] Fix test, small refactoring.
2012-09-27 16:13:59 +04:00
Vladimir Sharshov
0dd103b7f4
[refs #374 ] Fix build list tests, remove unused code.
2012-09-27 03:54:56 +04:00
Vladimir Sharshov
77b57cce11
[refs #374 ] Fix support http basic auth, fix tests, fix abilities.
2012-09-26 21:15:11 +04:00
Alexander Machehin
a994e7dd74
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 23:10:45 +06:00
Alexander Machehin
4100b875bd
[refs #90 ] fixed access
2012-09-26 23:10:04 +06:00
Alexander Machehin
cc05fa695a
[refs #90 ] fixed pull abilities part 2
2012-09-26 23:09:29 +06:00
Vokhmin Alexey V
37fbb4632e
#90 : updated branch
2012-09-26 21:04:12 +04:00
Vokhmin Alexey V
613db04375
#90 : added limit for commits into the pull request
2012-09-26 21:00:58 +04:00
Vokhmin Alexey V
5f0e683711
#90 : moved code
2012-09-26 19:41:00 +04:00
Vokhmin Alexey V
6f889b15a9
#90 : added access to show pull requests
2012-09-26 19:39:47 +04:00
Vokhmin Alexey V
0ebc545b01
#90 : small refactoring of views
2012-09-26 19:16:34 +04:00
Vokhmin Alexey V
37c9a906c4
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
2012-09-26 18:45:26 +04:00
Vokhmin Alexey V
6070c276f6
Merge branch 'master' into 90-pull
2012-09-26 18:33:04 +04:00
Vokhmin Alexey V
efe8b1ffdb
#90 : small refactoring
2012-09-26 18:20:46 +04:00
Vokhmin Alexey V
07b27b934f
#90 : updated #index page for pull-requests
2012-09-26 15:46:23 +04:00
Alexander Machehin
ccb004bc03
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-09-26 16:27:46 +06:00
Alexander Machehin
dbf1a5f8ca
Merge remote-tracking branch 'origin/90-pull' into 90-pull
2012-09-26 15:27:54 +06:00
Alexander Machehin
eba6a14e0b
[refs #90 ] very small refactoring
2012-09-26 15:27:24 +06:00
Alexander Machehin
3491492c8d
[refs #90 ] fixed pull authorization
2012-09-26 15:24:46 +06:00
Vokhmin Alexey V
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +04:00
Alexander Machehin
47a73a4ddb
[refs #90 ] fixed existing project name
2012-09-25 21:47:08 +06:00
Vokhmin Alexey V
d54a50e2e0
#90 : added line-height style
2012-09-25 19:31:06 +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
Vladimir Sharshov
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
Vokhmin Alexey V
40999debbf
#648 : updated projects_helper
2012-09-25 13:50:28 +04:00
Alexander Machehin
06e15cf3fa
[refs #616 ] remove unneeded code
2012-09-25 15:47:12 +06:00
Alexander Machehin
a29a2f8fe9
[refs #616 ] change ability for preview
2012-09-25 15:46:19 +06:00
Vokhmin Alexey V
84378afc3d
#648 : small code optimization
2012-09-25 13:36:50 +04:00
Vokhmin Alexey V
d15094f128
#648 : moved 'Create' button
2012-09-25 00:03:33 +04:00
Vokhmin Alexey V
91f215351c
#648 : small refactoring according to comment
2012-09-24 23:27:00 +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
768f4b1dfb
#648 : renamed parametr
2012-09-24 22:07:53 +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
f4bbeaaa46
[refs #616 ] fixed 500 when failed to create comment
2012-09-24 23:01:04 +06:00
Alexander Machehin
fc672451c6
[refs #616 ] small changes in styles
2012-09-24 21:19:50 +06:00
Alexander Machehin
eaf71f9cc0
[refs #652 ] set url options for mailer
2012-09-24 19:02:21 +06:00
Vokhmin Alexey V
cee1ee6cb6
#648 : small refactoring
2012-09-23 20:22:49 +04:00
konstantin.grabar
11c428ec20
[refs #374 ] Fix failed tests after http basic auth
2012-09-21 23:48:30 +04:00
konstantin.grabar
7812adfdbc
[refs #374 ] Add custom http basic auth for api
2012-09-21 23:15:56 +04:00
Vokhmin Alexey V
ceeae09332
#648 : small revert, updated filter name
2012-09-21 22:08:19 +04:00
Vokhmin Alexey V
c14f2851e3
#648 : revert changes
2012-09-21 22:04:58 +04:00
Vokhmin Alexey V
2406423483
#648 : added filters to Projects page
2012-09-21 21:57:22 +04:00
konstantin.grabar
5bcebcf384
[refs #374 ] Add publish_without_qa field, fix some specs, update docs for auth
2012-09-21 18:30:40 +04:00
Alexander Machehin
b5bee35275
Revert "[refs #616 ] add table styles"
...
This reverts commit 1818f25de28de0e9efa8d1ae9e22649445d3953d.
2012-09-21 19:23:41 +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
855f1f356d
[refs #616 ] remove some inline styles
2012-09-21 18:10:47 +06:00
Alexander Machehin
651be997b3
[refs #616 ] add table styles
2012-09-21 17:46:44 +06:00
Alexander Machehin
94c3863e27
[refs #616 ] fixed markdown image example
2012-09-21 16:43:54 +06:00
Alexander Machehin
d25bdb2329
[refs #616 ] fixed preview bug
2012-09-21 16:32:53 +06:00
Alexander Machehin
b65ca14131
[refs #616 ] small js refactoring
2012-09-21 16:31:55 +06:00
konstantin.grabar
e94c6f4f00
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-09-21 13:20:04 +04:00
Alexander Machehin
96f8a9a43f
[refs #616 ] dont filter html
2012-09-20 23:48:20 +06:00
Alexander Machehin
378fe5847e
[refs #616 ] ugly replaces
2012-09-20 23:10:50 +06:00
konstantin.grabar
e027eee40c
[refs #374 ] Update api platforms list docs and code
2012-09-20 19:07:06 +04:00
Vokhmin Alexey V
799a1464fb
#385 : fixed
2012-09-20 18:26:26 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
b398a0e456
#634 : fixed
2012-09-20 16:43:23 +04:00
Vokhmin Alexey V
07f5224e76
#385 : removed before_filter
2012-09-20 15:21:54 +04:00
Vokhmin Alexey V
c76618441e
#385 : revert some changes according to discussion
2012-09-20 15:10:52 +04:00
Vokhmin Alexey V
805521c486
Merge branch 'master' into 385-change-name-for-git-archives
2012-09-20 14:53:29 +04:00
Vladimir Sharshov
0acc4ce1c7
Improve invite email(prevent falling into the spam)
2012-09-20 12:29:07 +04:00
Vokhmin Alexey V
7a8b68b90b
small refactoring
2012-09-20 00:54:15 +04:00
Vokhmin Alexey V
9d2c9ae2b3
#385 : added rsa to name of archives for git branches
2012-09-20 00:38:40 +04:00
Vokhmin Alexey V
17bdcf9a3c
updated model according to last comments, added new specs
2012-09-19 23:52:18 +04:00
Vokhmin Alexey V
f39adfd2f7
#385 : fixed specs, updated controller, view
2012-09-19 23:29:36 +04:00
Alexander Machehin
32e05de186
[refs #616 ] cheat sheet small i18n
2012-09-20 00:53:40 +06:00
Alexander Machehin
11c67b7951
[refs #616 ] fixed bug on new issue
2012-09-19 23:59:46 +06:00
Alexander Machehin
fbc5f3a925
[refs #616 ] small refactoring
2012-09-19 23:59:14 +06:00
Alexander Machehin
a85a95d18a
[refs #616 ] markdown cheat sheet
2012-09-19 23:35:43 +06:00
Vokhmin Alexey V
426eb72d5f
moved #notify_users method from observer to model, updated specs
2012-09-19 17:55:17 +04:00
Alexander Machehin
4fc9ba7aeb
[refs #616 ] add lost i18n
2012-09-19 15:41:08 +06:00
Alexander Machehin
daf845705a
[refs #616 ] comment update
2012-09-19 00:42:22 +06:00
Vokhmin Alexey V
7fbf17a824
updated email templates
2012-09-18 19:34:39 +04:00
Vokhmin Alexey V
967c5daaa8
#575 : added 'arch' to subject and body of email
2012-09-18 16:03:10 +04:00
Alexander Machehin
a492367a17
[refs #616 ] some fixes and refactoring
2012-09-18 16:00:21 +06:00
Vokhmin Alexey V
7ea856686e
#575 : added some specs
2012-09-18 01:11:28 +04:00
Vokhmin Alexey V
5dd352887d
#575 : removed unnecessary method
2012-09-17 21:17:22 +04:00
Vokhmin Alexey V
6b62615a3e
#575 : did some refactoring according to comments
2012-09-17 20:17:43 +04:00
Vokhmin Alexey V
8788db12c0
#575 : added notification for users
2012-09-17 19:18:02 +04:00
Vokhmin Alexey V
15a75077db
Merge branch 'master' into 575-email-notification-for-build-tasks
2012-09-17 17:49:43 +04:00
Alexander Machehin
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
Vokhmin Alexey V
2681a1c676
#575 : added logic for BuildList notification
2012-09-16 22:18:41 +04:00
Vokhmin Alexey V
5326098884
#575 : updated email template
2012-09-16 22:02:28 +04:00
Vokhmin Alexey V
ef923d06c7
#575 : added build_list_notification
2012-09-16 21:29:45 +04:00
Vokhmin Alexey V
01576702a0
#575 : added migration, updated Settings page
2012-09-14 20:12:48 +04:00
Vokhmin Alexey V
7bb0ced8cb
#645 : fixed.
2012-09-14 18:49:08 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
6bdaf06d86
#633 : removed unnecessary code
2012-09-14 02:30:54 +04:00
Vokhmin Alexey V
bdb3eb288c
#633 : removed checkbox from name of platform
2012-09-14 02:22:10 +04:00
Vladimir Sharshov
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
Vokhmin Alexey V
fe20814b5a
#633 : hot fix
2012-09-13 20:18:09 +04:00
Vokhmin Alexey V
ba6805598f
#633 : small refactoring
2012-09-13 20:16:13 +04:00
Vokhmin Alexey V
a99bfee4a6
#633 : UI has been updated
2012-09-13 20:08:41 +04:00
Vladimir Sharshov
5a699ad379
Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
...
[refs #638 ] Repository supervisor
2012-09-12 13:52:42 -07:00
Vokhmin Alexey V
1c9a9e803e
#638 : some refactoring
2012-09-13 00:47:39 +04:00
Vladimir Sharshov
87b71cf611
Merge pull request #643 from warpc/641-enable-disable-project-from-private-repository
...
[refs #641 ] Include/exclude project from personal owner repository according to value of option project is package
2012-09-12 13:39:56 -07:00
Vokhmin Alexey V
1a75a5a394
#638 : updated Relation model, repositories and platforms controllers according to comments
2012-09-12 23:32:51 +04:00
Vokhmin Alexey V
8d35786183
#641 : added is_package checkbox to #new page, updated model
2012-09-12 19:06:34 +04:00
Vladimir Sharshov
e3bcd2382e
[refs #641 ] Show only public projects in group profile
2012-09-12 18:49:40 +04:00
Vokhmin Alexey V
3b622f54b9
#638 : added before_filter to repositories_controller
2012-09-12 17:43:02 +04:00
Vokhmin Alexey V
bc4043e558
#638 : hot fix
2012-09-12 17:25:46 +04:00
Vokhmin Alexey V
b468b09529
#638 : some refactoring for adding new user
2012-09-12 17:07:34 +04:00
Vokhmin Alexey V
aadfb39682
#638 : added access to add/remove member to repository for owner and local_admin
2012-09-12 16:17:51 +04:00
Vokhmin Alexey V
1f32e72508
#638 : added access to remove_project for members of repository
2012-09-12 00:43:08 +04:00
Vokhmin Alexey V
96466b808b
#638 : fixed ability model
2012-09-12 00:40:16 +04:00
Vokhmin Alexey V
b4c2c368e4
#638 : added permissions to add new project for members of repository
2012-09-12 00:27:28 +04:00
Vokhmin Alexey V
1e40b9fb06
#638 : some refactoring
2012-09-12 00:08:25 +04:00
Vokhmin Alexey V
405c09fc72
#638 : created table of users as shared
2012-09-11 20:03:43 +04:00
Vokhmin Alexey V
3858bfa6b7
#638 : added members to repository model, updated views
2012-09-11 19:30:14 +04:00
Vokhmin Alexey V
bff32c27c4
#637 : removed comments
2012-09-11 12:36:33 +04:00
Vokhmin Alexey V
1768df5010
#637 : removed unnecessary lines
2012-09-10 15:19:13 +04:00
Vokhmin Alexey V
e530fa5b74
#637 : updated message
2012-09-10 15:16:55 +04:00
Vokhmin Alexey V
5f941844f2
#637 : added migration, updated approve_notification
2012-09-10 15:08:53 +04:00
Vladimir Sharshov
8c06b0c18d
[refs #631 ] Fix right for publication build list using publish button
2012-09-07 22:45:03 +04:00
Vladimir Sharshov
216559024c
[refs #631 ] Change list repositories view, add button for edit and delete action
2012-09-07 21:59:34 +04:00
Pavel Chipiga
7570f1cab7
Set publish_without_qa to false for all platform repos when released. Fix mgration. Refs #631
2012-09-07 18:41:42 +03:00
Pavel Chipiga
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
Vladimir Sharshov
3247db53c6
[refs #635 ] Fixed the lack of choice owner on create a project page
2012-09-07 14:25:04 +04:00
Vladimir Sharshov
29f5ef5f2e
Refactoring tests
2012-09-07 13:41:49 +04:00
Vladimir Sharshov
4828aa24f8
Merge branch 'master' into 349-anonymous_access
...
Conflicts:
spec/controllers/platforms/maintainers_controller_spec.rb
spec/factories/build_lists.rb
2012-09-07 00:36:06 +04:00
Vladimir Sharshov
71e28cf3f3
Merge branch 'master' into 349-anonymous_access
2012-09-07 00:31:28 +04:00
Pasha
9247a1c850
Merge pull request #613 from warpc/263-refactoring
...
[#263 ] Исправление и рефакторинг тестов
2012-09-06 13:23:23 -07:00
Vladimir Sharshov
2c1df5cd14
Merge branch 'master' into 263-refactoring
...
Conflicts:
config/deploy.rb
db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov
54c6ba55be
[refs #349 ] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules
2012-09-06 21:09:10 +04:00
Vokhmin Alexey V
c1d87a36da
#631 : fixed misprint in model and controller
2012-09-06 19:43:07 +04:00
Vokhmin Alexey V
71d14e43d6
#631 : fixed misprint
2012-09-06 19:39:26 +04:00
Vokhmin Alexey V
4d1166e6b3
#631 : updated UI and JS validation for build_lists, rewrote migration
2012-09-06 19:34:33 +04:00
Vokhmin Alexey V
f0f11cb9dc
#631 : added #edit #update actions to platforms/repositories_controller, wrote migration, updated models
2012-09-06 17:43:50 +04:00
Vladimir Sharshov
698e55e3e8
[refs #263 ] Test refactoring
2012-09-06 14:53:03 +04:00
Pavel Chipiga
a2d87c9228
Fix autocomplete_maintainers for local admins. Refs #620
2012-09-06 13:31:31 +03:00
konstantin.grabar
b9a622acec
[refs #374 ] Add unixtime search and output. Fix rate limit configuration and 404 status
2012-09-05 17:47:25 +04:00
Vladimir Sharshov
ec32cf7fa0
[refs #630 ] swap tour conten for porject and build pages
2012-09-04 18:30:02 +04:00
konstantin.grabar
ff8f9da14f
[refs #374 ] Refactor api build list create method
2012-09-04 16:44:28 +04:00
konstantin.grabar
5d0d972a0d
[refs #374 ] Refactor api build lists create logic
2012-09-03 17:49:11 +04:00
George Vinogradov
3e69d7d0f4
[issue #349 ] Guest user can show open platforms.
2012-09-01 02:00:39 +04:00
Vladimir Sharshov
ff20c0b199
Merge pull request #622 from warpc/620-maintainer_db
...
[refs #620 ] Maintainer DB
2012-08-31 11:50:02 -07:00
George Vinogradov
decd4bf293
[issue #620 ] Removed scope from BuildList::Package && small refactoring.
2012-08-31 21:47:52 +04:00
Alexander Machehin
067615d79f
[refs #616 ] small js fix
2012-08-31 19:18:38 +06:00
Alexander Machehin
3225274425
[refs #616 ] change styles
2012-08-31 19:02:03 +06:00
konstantin.grabar
6229daf137
[refs #374 ] Add paginate restriction for API
2012-08-31 16:23:44 +04:00
George Vinogradov
16e101cc05
[issue #620 ] Fixed BuildList#actualize_packages
2012-08-31 01:20:30 +04:00
George Vinogradov
68b86ba09a
[issue #620 ] Fixed migration && BuildList#actualize_packages.
2012-08-30 22:32:28 +04:00
konstantin.grabar
0607eedb15
[refs #626 ] Set invites redirect add register link to top menu
2012-08-30 14:30:07 +04:00
Alexander Machehin
d775fa0d08
[refs #616 ] ugly md preview
2012-08-29 21:24:06 +06:00
konstantin.grabar
03986b7c21
[refs #374 ] Remove index actions from projects and reps. Add projects#get_id. Update tests. Fix build list show template
2012-08-28 20:57:12 +04:00
George Vinogradov
88d0e358ce
[issue #620 ] Set maintainer for new and forked project
2012-08-28 19:00:04 +04:00
George Vinogradov
6c4b13f0da
[issue #620 ] Removed project_maintainer & assignee
2012-08-28 18:25:57 +04:00
George Vinogradov
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
Vladimir Sharshov
6bcff5ad6f
Merge pull request #623 from warpc/616-issues_and_comments
...
[refs #616 ] Refactoring and fixed bugs with issue:
* could not remove all labels from issue;
* after update issue body now no need reload page to view changes;
* refactoring issues controller.
2012-08-27 03:46:27 -07:00
Alexander Machehin
1c3ca85f03
[refs #616 ] add comment for clarity
2012-08-27 15:43:44 +06:00
Alexander Machehin
2c0826a77d
[refs #616 ] fixed showing body after update
2012-08-25 23:40:51 +06:00
Alexander Machehin
4b4007651d
[refs #616 ] small refactoring issues controller
2012-08-25 23:38:11 +06:00
Alexander Machehin
e8d80b849a
[refs #616 ] fixed removing labels from issue
2012-08-25 21:26:24 +06:00
George Vinogradov
7572562cad
[issue #620 ] Changed packages actualization.
2012-08-25 00:27:10 +04:00
George Vinogradov
f6cc919f2f
[issue #620 ] Removed MaintainersController#assignee
2012-08-24 23:45:58 +04:00
George Vinogradov
d24a149d9a
[issue #620 ] Added search of maintainer by package
2012-08-24 20:06:59 +04:00
George Vinogradov
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
Pavel Shved
629e227d9a
Fix Maintainers spec for anons
...
it doesn't create guest user now, and relies on anonymous_access
config variable instead.
2012-08-22 00:02:34 +04:00
Pavel Shved
a4b03b53ce
Refactor maintainer-db spec and model
2012-08-22 00:02:33 +04:00
Pavel Shved
028e511409
Remove 'heavy' rescues from maintainer-db api
2012-08-22 00:02:33 +04:00
Pavel Shved
8629d67030
Add javascript callback for "assignee"
...
To make intrgration with external trackers easier, add JS API for
assignee retrieval. It returns a script that calls a function that
should act somehow depending on how it was defined.
2012-08-21 23:58:15 +04:00
Pavel Shved
e75a676895
Add "assignee" JSON callback
...
The callback reports the assignee of a package in a platform given.
Used for integration with external bug trackers.
2012-08-21 23:58:15 +04:00
Pavel Shved
5317427662
Remove excessive if-s from maintainers view
2012-08-21 23:58:14 +04:00
Pavel Shved
388a0028da
Add Maintainer Database and list view for it
...
This commit adds list of maintainers of a platform to page
/platforms/:id/maintainers. This list is intended to serve as a
counterpart for http://maint.mandriva.com/listpkgs.php .
The commit adds a "view" on a build_list_packages table: it selects only
the latest builds for each package, and summarizes the information about
such packages in "maintainers" table.
This is a testing mode only, so the link to maintainers table is not
shown.
2012-08-21 23:57:39 +04:00
konstantin.grabar
5dc50056df
[refs #374 ] Add repositories, platforms and projects read API
2012-08-21 14:19:38 +04:00
Vladimir Sharshov
c392a4efd4
Merge pull request #618 from warpc/590-build_list_page_change
...
[issue #590 ] Fix error with render select "version" in FireFox on build list new page
2012-08-20 15:07:14 -07:00
George Vinogradov
edd7bcdb6d
[issue #590 ] JS hack to force SelectBox to render.
2012-08-21 01:33:54 +04:00
Alexander Machehin
3abcb51395
[refs #616 ] simple format for issie body
2012-08-21 00:11:42 +06:00
Alexander Machehin
a70f9b9ecb
[refs #616 ] allow create issue for public projects
2012-08-20 23:54:55 +06:00
Alexander Machehin
1142f9ee8c
[refs #616 ] fixed searching collaboratots to assignment
2012-08-20 23:37:22 +06:00
Alexander Machehin
e637191a61
[refs #616 ] fixed caption of the button
2012-08-20 23:27:43 +06:00
Vladimir Sharshov
656892afe3
Merge pull request #612 from warpc/590-build_list_page_change
...
[refs #590 ] Add auto updatable log block in build list page. Added forecast assembly time in monitoring page.
2012-08-17 15:30:48 -07:00
George Vinogradov
269fcb4a48
[issue #374 ] Changed BuildLists#index in api
2012-08-17 18:07:56 +04:00
George Vinogradov
9e4175a6a3
[issue #374 ] Changed BuildList#show action in api.
2012-08-17 18:01:10 +04:00
George Vinogradov
b8c6f0b896
[issue #590 ] Refactored checks for buttons.
2012-08-17 15:49:12 +04:00
George Vinogradov
84328742e4
[issue #590 ] Log returns through Rails with `tail -n`
2012-08-17 12:23:49 +04:00
konstantin.grabar
6d4e369322
[refs #374 ] Change project_version set method
2012-08-16 15:11:46 +04:00
konstantin.grabar
554950a14c
[refs #374 ] Fix some tests. Comment 500 error cautch
2012-08-15 19:58:22 +04:00
Pavel Chipiga
0ff8f92b62
Upgrade gems. Fix and refactor some specs. Fix deprecation warnings. Add capistrano task to dump remote db. Refs #263
2012-08-15 16:52:32 +03:00
Alexander Machehin
f2565c4877
[refs #90 ] remove Baden-Baden
2012-08-15 19:50:26 +06:00
George Vinogradov
99ce249fe6
[issue #590 ] Removed log reloading for not :build_started BuildLists.
2012-08-15 00:49:31 +04:00
George Vinogradov
6ac0d3c0df
[issue #590 ] Fixed Chrome bug in live log.
2012-08-14 21:05:53 +04:00
George Vinogradov
5a4c7a8e37
[issue #590 ] Fixed BuildList started check (thnx 2 @alexander-machehin)
2012-08-14 18:57:25 +04:00
George Vinogradov
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
George Vinogradov
dfb6d0da0c
[issue #590 ] Fixed log viewer.
2012-08-14 18:43:05 +04:00
konstantin.grabar
9712683c62
[refs #374 ] Change commit_hash save on create. Continue specs refactor
2012-08-14 17:45:21 +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
konstantin.grabar
7fba004858
[refs #374 ] Api tests refactor
2012-08-13 13:58:26 +04:00
Alexander Machehin
b2ff7326d1
Merge branch 'master' into 90-pull
...
Conflicts:
config/locales/en.yml
config/locales/ru.yml
2012-08-13 15:01:43 +06:00
George Vinogradov
efa08933fd
[issue #590 ] Added average build time to :build_started BuildLists
2012-08-12 02:08:28 +04:00
George Vinogradov
8c07e5a516
[issue #590 ] Fixed bug in JS timeparser.
2012-08-11 22:46:39 +04:00
George Vinogradov
2ad94139af
[issue #590 ] Fixed bug in JS timeparser.
2012-08-11 22:15:11 +04:00
Alexander Machehin
ab939253df
[refs #90 ] optimization?
2012-08-10 23:06:34 +06:00
Alexander Machehin
11e5f4dd99
[refs #90 ] try use grit to clone
2012-08-10 22:42:34 +06:00
Alexander Machehin
c1c9f9680e
[refs #90 ] remove code duplication
2012-08-10 22:40:09 +06:00
Vladimir Sharshov
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
George Vinogradov
9030056c1b
[issue #590 ] Changed _build_list partial.
2012-08-10 20:14:45 +04:00
George Vinogradov
e7407ae28f
[issue #590 ] Dirty hack to fix BuildList#index
2012-08-10 19:08:26 +04:00
Vladimir Sharshov
f7b61ec154
Merge branch 'master' of github.com:warpc/rosa-build
2012-08-10 18:52:50 +04:00
Vladimir Sharshov
5759a53fae
Temporarily transfer path for the git repository via NFS
2012-08-10 18:50:30 +04:00
Vladimir Sharshov
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
Alexander Machehin
1d5470b7d6
[refs #90 ] small fixes
2012-08-09 23:56:55 +06:00
Vladimir Sharshov
d8da0d8c60
Inform the kernel about project git address(part 3): add protocol
2012-08-09 20:46:09 +04:00
George Vinogradov
e5e8cc7e7f
[issue #590 ] Changed time representation.
...
* Removed buggy jquery.countdown plugin
* Page reloads every minute
2012-08-09 20:39:01 +04:00
konstantin.grabar
134b386631
[refs #374 ] Fix api and build_lists tests
2012-08-09 18:38:41 +04:00
Vladimir Sharshov
f4b3c53362
Inform the kernel about project git address
2012-08-09 17:56:45 +04:00
George Vinogradov
7961bd5fc1
[issue #590 ] Added missed style.
2012-08-09 01:19:43 +04:00
George Vinogradov
5cb2853c66
[issue #590 ] Added timers to BuildList index page.
2012-08-09 01:10:39 +04:00
konstantin.grabar
1728148d38
[refs #374 ] Small api actions refactor
2012-08-08 23:16:27 +04:00
Alexander Machehin
ec7d132a3f
[refs #90 ] fixed update commits button
2012-08-08 23:57:03 +06:00
Alexander Machehin
9bf2f728a7
[refs #90 ] change new action from post to get
2012-08-08 23:21:49 +06:00
Alexander Machehin
910aac939e
[refs #90 ] fixed changing tabs & anchors
2012-08-08 21:47:58 +06:00
konstantin.grabar
0c9f3540f9
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-08-08 18:21:56 +04:00
konstantin.grabar
7f475948f6
[refs #374 ] Uncomment 404/500/503 rescues
2012-08-08 18:08:56 +04:00
konstantin.grabar
e0ee7bd086
[refs #374 ] Add jbuilder responses for api
2012-08-08 17:02:51 +04:00
Alexander Machehin
4c02d4be19
[refs #90 ] fixed error
2012-08-08 16:33:48 +06:00
Alexander Machehin
0ddb960b8b
[refs #90 ] remove commits from pull refs
2012-08-08 00:23:17 +06:00
Alexander Machehin
edf882f2a1
[refs #90 ] remove unneeded method
2012-08-08 00:17:10 +06:00
Alexander Machehin
5cb1f4e7e9
[refs #90 ] small delegate refactoring
2012-08-08 00:08:02 +06:00
Alexander Machehin
a7f926bbdf
[refs #90 ] forgot dependent destroy
2012-08-08 00:07:26 +06:00
Alexander Machehin
6225410720
[refs #90 ] enable check for uniq pull requests
2012-08-08 00:06:49 +06:00
Alexander Machehin
61b02ce1e8
[refs #90 ] fixed error on create
2012-08-08 00:05:43 +06:00
Alexander Machehin
37a0b4efe8
[refs #90 ] fixed error with / in branch name
2012-08-07 23:40:40 +06:00
Alexander Machehin
b50d9f87d2
[refs #90 ] clean ability
2012-08-07 23:07:18 +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
e97c3dc645
[refs #90 ] small controller refactor
2012-08-07 22:34:22 +06:00
Alexander Machehin
2a6b08c269
[refs #90 ] fixed error with wrong treeish
2012-08-07 22:24:47 +06:00
Alexander Machehin
35642102dd
[refs #90 ] fixed show merge button
2012-08-07 19:25:08 +06:00
Alexander Machehin
a316105e9c
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-07 18:21:04 +06:00
George Vinogradov
61ca25a820
[issue #590 ] Eager loading of BuildList's owner and repository.
2012-08-07 01:41:57 +04:00
Vladimir Sharshov
30efe134ef
[refs #604 ] Remove old and empty mass builds
2012-08-07 01:07:54 +04:00
Vladimir Sharshov
f35d4cd873
Merge branch 'master' into #604-Remove_old_buildlist_created_more_than_3_month_ago
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-08-07 00:53:43 +04:00
Vladimir Sharshov
69fb368911
merger stash
2012-08-07 00:48:29 +04:00
Vladimir Sharshov
38aa39743a
[refs #590 ] Fix mass build(part 2)
2012-08-07 00:22:16 +04:00
Vladimir Sharshov
ea16c47105
[refs #590 ] Fix mass build
2012-08-07 00:04:52 +04:00
Alexander Machehin
be6179b2ad
[refs #90 ] clean comment
2012-08-07 00:24:31 +06:00
Alexander Machehin
02214dda09
[refs #90 ] fixed merge with master
2012-08-07 00:17:04 +06:00
Alexander Machehin
c268930a45
[refs #90 ] small refactoring
2012-08-07 00:13:07 +06:00
Alexander Machehin
fb66b74019
[refs #90 ] fixed pull abilities
2012-08-07 00:12:15 +06:00
Alexander Machehin
09a5180c22
[refs #90 ] remove Baden-Baden
2012-08-06 23:53:55 +06:00
George Vinogradov
710fef1f0b
Merge pull request #602 from warpc/601-add_status_check_for_product_bl_remove
...
[refs #601 ] Add status check for destroy action in product build list
2012-08-06 08:40:43 -07:00
Vladimir Sharshov
08c58a84df
[refs #604 ] Remove old build list after 3 month
2012-08-06 19:35:11 +04:00
Vladimir Sharshov
dd1bf7719f
[refs #601 ] Add statuscheck for destroy action in product build list(small fix)
2012-08-06 17:08:13 +04:00
George Vinogradov
be71f7e22f
[issue #590 ] Fixed translation. Added repository link to container
2012-08-06 17:05:05 +04:00
George Vinogradov
b48762f174
[issue #590 ] Fixed translation. Added repository link to container
2012-08-06 17:04:05 +04:00
George Vinogradov
73e9e0be94
[issue #590 ] Changed BuildList show page.
2012-08-06 16:44:44 +04:00
George Vinogradov
cef621d6ae
[issue #590 ] Changed BuildList show page.
2012-08-06 16:42:58 +04:00
Vladimir Sharshov
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
George Vinogradov
dadbaefea4
[issue #590 ] On monitoring page platform changed to repository.
2012-08-06 16:31:44 +04:00
konstantin.grabar
43d8e2020c
[refs #374 ] Remove states check logic from ability.rb. Small api reject answer fix
2012-08-06 16:21:19 +04:00
Vladimir Sharshov
c7a3addfb8
[refs #601 ] Add statuscheck for destroy action in product build list
2012-08-06 16:06:42 +04:00
Vladimir Sharshov
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
George Vinogradov
94178c6ee3
[issue #590 ] Removed unnecessary check from controller.
2012-08-06 15:03:10 +04:00
George Vinogradov
b963c9342a
[issue #590 ] Repository fetches through project and platform
2012-08-06 14:59:07 +04:00
konstantin.grabar
36da0cf808
[refs #374 ] Continue tests fix
2012-08-06 14:43:04 +04:00
George Vinogradov
36de270fad
[issue #590 ] Moved repository check to controller.
2012-08-06 14:21:33 +04: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
c7d13fd607
[issue #565 ] Added question description.
2012-08-04 02:28:43 +04: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
Pasha
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
George Vinogradov
6eff6bffa5
[issue #590 ] Merge branch 'master' into 590-build_list_page_change
...
Conflicts:
db/schema.rb
2012-08-03 18:37:44 +04:00
Vladimir Sharshov
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
konstantin.grabar
f3db00832a
[refs #374 ] Api v1 base functional and specs
2012-08-03 14:05:05 +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
1269806aae
Hide another raw link for huge blobs. Refs #263
2012-07-31 22:24:27 +03:00
Pavel Chipiga
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
Pavel Chipiga
01a3572de0
Minor update. Fix helper bug. Minor refactor. Refs #263
2012-07-31 17:35:18 +03:00
konstantin.grabar
f7f848e878
[refs #441 ] Merge master into 441-key_pairs
2012-07-31 17:16:07 +04:00
konstantin.grabar
6c4a574f49
[refs #441 ] self.key_id and stub result fix
2012-07-31 17:05:25 +04:00
konstantin.grabar
931d4a7db0
[refs #441 ] Key Pairs fixes and refactoring
2012-07-31 16:50:53 +04:00
Vladimir Sharshov
43309d86e6
Merge branch 'master' into 441-key_pairs, fix schema, add migration
...
Conflicts:
db/schema.rb
2012-07-31 02:02:15 +04:00
Vladimir Sharshov
73a369ba49
[refs #441 ] Refactring: part 2. Fix integration with kernel, change view for keys list
2012-07-31 01:24:31 +04:00
George Vinogradov
ef25bb502a
[issue #565 ] refactoring, proposed by @alexander-machehin
2012-07-31 00:42:32 +04:00
George Vinogradov
d7e9cefd0b
[issue #590 ] Added validation on repository.
2012-07-30 23:26:51 +04:00
Vladimir Sharshov
89d67f9ea6
[refs #441 ] Refactring, fix errors
2012-07-30 23:08:14 +04:00
Alexander Machehin
6e598ad5f9
[refs #565 ] fixed feedback image
2012-07-30 20:59:50 +06:00
konstantin.grabar
724b36a4b4
Merge master into 570-mass_builds_status_counters_bug
2012-07-30 18:53:18 +04:00
konstantin.grabar
dd13b38da3
[refs #570 ] Add status variable
2012-07-30 18:49:40 +04:00
Alexander Machehin
6c11597de6
Merge branch 'master' into 90-pull
2012-07-30 16:53:59 +06:00
konstantin.grabar
f674735c8c
[refs #374 ] Merge master into 374-rest_api_for_builds
2012-07-30 13:31:28 +04:00
George Vinogradov
63801e2676
[issue #590 ] Platform fetches through repository.
2012-07-27 23:37:56 +04:00
George Vinogradov
cc66e2ee4a
[issue #590 ] Save repository to save to in BuildList.
2012-07-27 20:01:26 +04:00
konstantin.grabar
33e6cdc285
[refs #570 ] Remove mass build counters logs and transactions
2012-07-27 19:17:07 +04:00
Vladimir Sharshov
255bd3a73a
Merge pull request #589 from warpc/551-old_bugs_with_by_object
...
[refs #551 ] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
Alexander Machehin
25bdbb01d6
[refs #90 ] project fullname
2012-07-27 18:52:31 +06:00
Vladimir Sharshov
2105457d62
Merge pull request #587 from warpc/586-datatables_json_fixes
...
[refs #586 ] Custom JSON generators changed to JBuilder
2012-07-27 05:45:23 -07:00
George Vinogradov
bbb03d3243
[issue #586 ] Removed @total_project & @total_user.
2012-07-27 16:40:13 +04: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
konstantin.grabar
548fb99ebe
[refs #570 ] Try to do counters change into transaction with locking
2012-07-27 16:28:08 +04:00
Vladimir Sharshov
5aecdc203b
Merge pull request #571 from warpc/263-refactoring
...
[refs #263 ] Big git refactoring
2012-07-27 04:51:34 -07:00
George Vinogradov
40b0bb4b58
[issue #551 ] by_object changed to by_actor.
2012-07-27 08:12:09 +04:00
Vladimir Sharshov
95f1e13b96
Merge pull request #588 from warpc/583-build_list_page_fix
...
[refs #583 ] Remove control publication block from public vision
2012-07-26 16:26:48 -07:00
Vladimir Sharshov
bc2eb541f3
[refs #583 ] Change and to &&
2012-07-27 03:17:37 +04:00
George Vinogradov
3e4c03dd6a
[issue #583 ] Added missing check to BuildList page
2012-07-27 01:44:15 +04:00
Pavel Chipiga
fb60dac748
Merge branch 'master' into 263-refactoring
...
Conflicts:
db/schema.rb
2012-07-27 00:19:36 +03: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
03cc4668dc
[issue #586 ] Custom JSON generators changed to JBuilder
2012-07-27 00:25:44 +04:00
konstantin.grabar
354752f6cb
Merge remote-tracking branch 'origin/570-mass_builds_status_counters_bug' into 570-mass_builds_status_counters_bug
2012-07-26 15:47:33 +04:00
konstantin.grabar
f9b217379d
[refs #570 ] Add mass build counters logs
2012-07-26 15:45:23 +04:00
konstantin.grabar
91dddd5dac
Merge branch 'master' into 570-mass_builds_status_counters_bug
2012-07-26 15:06:09 +04:00
konstantin.grabar
48f8c3ad08
[refs #374 ] Add json responses for build lists api
2012-07-26 13:22:51 +04:00
George Vinogradov
f1839f0ad0
[issue #578 ] Added submit blocking to user creation
2012-07-26 02:12:06 +04:00
George Vinogradov
6f4f48cbce
[issue #578 ] Fixed error handling in PresonalRepository.
2012-07-26 01:49:55 +04:00
Vladimir Sharshov
606609dea6
Merge pull request #580 from warpc/576-flash_notifies
...
[refs #576 ] Add flash notifies
2012-07-25 12:18:44 -07:00
Pavel Chipiga
03509e714c
Merge branch 'master' into 263-refactoring
2012-07-25 21:42:48 +03:00
Pavel Chipiga
e3ee41294d
Use current locale for message body display. Refs #576
2012-07-25 21:21:52 +03:00
Pavel Chipiga
1362ee87c5
Add submenu for notifies section. Refs #576
2012-07-25 21:14:22 +03:00
Pavel Chipiga
e09a9467e2
Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576
2012-07-25 21:05:25 +03:00
Alexander Machehin
9c4db595cb
[refs #579 ] new line comment icon
2012-07-25 22:24:58 +06:00
konstantin.grabar
c0036a1bb5
[refs #576 ] Fix should_show? method and template offsets
2012-07-25 16:41:12 +04:00
Alexander Machehin
a0a4c8b100
[refs #581 ] dont destroy child projects
2012-07-24 22:02:02 +06:00
konstantin.grabar
931e7a22b4
[refs #576 ] Merge master into 576-flash_notifies
2012-07-24 14:08:34 +04:00
konstantin.grabar
3d19a4f23e
[refs #576 ] Optimize tests, views and model
2012-07-24 13:19:22 +04:00
konstantin.grabar
15a86c2ecd
[refs #576 ] Add flash notifies
2012-07-23 18:25:37 +04:00
George Vinogradov
ee15ca26ca
[issue #565 ] Refactoring. Fixed html mail template.
2012-07-20 23:59:32 +04:00
George Vinogradov
0d9a32a1c0
[issue #565 ] Fixed bug in mailer.
2012-07-20 20:56:47 +04:00
George Vinogradov
c37866d5e6
[issue #565 ] Added page title.
2012-07-20 20:36:09 +04:00
George Vinogradov
f61e9db5c6
[issue #565 ] Added Support link to bottom menu
2012-07-20 20:23:51 +04:00
George Vinogradov
6d046764ef
[issue #565 ] Merge branch 'master' into 565-feedback_form
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 20:15:55 +04: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
d130409640
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
Alexander Machehin
35b953ac11
[refs #90 ] add commit/pull lines ref
2012-07-19 22:42:37 +06:00
Pavel Chipiga
2cc3798cdc
Merge branch 'master' into 263-refactoring
2012-07-19 18:58:47 +03:00
Vladimir Sharshov
1f0887ac97
[refs #570 ] Change localization for fields(part 2)
2012-07-18 23:26:13 +04:00
Vladimir Sharshov
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
Alexander Machehin
b24a4a35b2
[refs #90 ] modify pull tab urls
2012-07-19 00:02:27 +06:00
konstantin.grabar
7061696100
[refs #570 ] Replace :all to :everything for builds filter
2012-07-18 17:49:21 +04:00
konstantin.grabar
6430678c00
[refs #570 ] Add :all option for build lists visibility
2012-07-18 16:00:40 +04:00
Alexander Machehin
28329bbe5b
[refs #90 ] fixed ref link
2012-07-18 17:17:15 +06:00
konstantin.grabar
778b76e5ff
[refs #570 ] Fix mass builds counters update. Fix mass build and failed_build_list links
2012-07-18 14:31:49 +04:00
Alexander Machehin
b7911f3585
[refs #90 ] fixed create pull button text
2012-07-18 16:29:55 +06:00
Alexander Machehin
3c4975ddf0
[refs #183 ] do not track dev
2012-07-18 16:11:24 +06:00
Alexander Machehin
0ac1f52e31
[refs #569 ] fixed hr style
2012-07-17 23:43:13 +06:00
Alexander Machehin
b9e1f44fe8
[refs #90 ] remove old code
2012-07-17 23:02:55 +06:00
Alexander Machehin
dc521f5844
[refs #90 ] link to refs
2012-07-17 22:40:48 +06:00
Alexander Machehin
08534810f6
[refs #569 ] tuning fork modal
2012-07-17 20:25:02 +06:00
Alexander Machehin
cd681ab0ae
[refs #569 ] fixed fork modal
2012-07-17 19:49:13 +06:00