c969d82c94
fix ru translate
2012-11-28 19:06:31 +06:00
c42fcc824a
add to api maintainers index method
2012-11-26 15:32:23 +04:00
6b842bb51a
add Search API, some refactoring
2012-11-21 16:09:01 +04:00
6fe07d83d6
add validation for build_for_platform field
2012-11-20 20:14:51 +04:00
0f74aaedc1
#727 : remove unnecessary fields
2012-11-20 16:33:29 +04:00
7be2df7578
[refs #674 ] first step of the diff between commits
2012-11-20 01:15:15 +06:00
2203bb8ad0
update locales
2012-11-19 21:02:08 +04:00
894f8651d9
rename BUILD_IN_QUEUE to BUILD_PENDING
2012-11-19 20:38:08 +04:00
edc6638b1e
update statuses
2012-11-19 20:05:12 +04:00
846aedf49d
add canceling status
2012-11-19 19:41:59 +04:00
ebbf47f818
show file size, and in_queue status for ProductBuildList
2012-11-19 19:11:07 +04:00
41ce06b36e
Merge pull request #722 from warpc/90-error_on_create
...
[refs #90 ] Fix error on pull create, create special place for temporary pull request, add cron task for clear temporary pull request, add cron task for clearing activity feed, fix build list pagination error
2012-11-14 10:31:53 -08:00
50ce84bfa9
remove old activity feeds
2012-11-15 00:10:03 +06:00
b21046ba50
[refs #90 ] clean old temporary git
2012-11-14 21:48:20 +06:00
34bb256ff1
Merge pull request #715 from warpc/iso-worker
...
[refs #711 ] Integration Iso worker
2012-11-14 03:14:28 -08:00
21a32fba6c
show expected message after add member error
2012-11-13 20:29:45 +06:00
f522fd3cd0
add selecting Arch on create product build
2012-11-13 18:01:06 +04: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
259eeaecfc
add Stop action and time_living for building ISO
2012-11-12 17:22:19 +04:00
06421dbdec
Merge pull request #714 from warpc/90-fix_orphan_pulls
...
[refs #90 ] fixed orphan pulls
2012-11-12 02:34:21 -08:00
6ea04c5ccb
Revert "disable auto import by cron"
...
This reverts commit e3a404adf65767aa5473309aad1d9ebf6fb8907c.
2012-11-12 15:26:24 +06: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
8e7efac35b
disable auto import by cron
2012-11-09 20:43:35 +06:00
ef967e97ae
small style changes
2012-11-09 17:51:33 +04:00
b39ccea0d5
add show logs in real time
2012-11-09 17:08:56 +04:00
3d293b908d
added IsoWorkerObserver
2012-11-09 01:39:42 +04:00
4595ce349c
Merge branch 'master' into iso-worker
2012-11-08 18:17:35 +04:00
fc3dbbf698
added help for creating ISO
2012-11-08 15:11:44 +04:00
e9233d362a
add new git_path param
2012-11-08 15:13:48 +06:00
f21926f7f5
extra style changes
2012-11-07 17:21:08 +04:00
eb40fbbbd5
removed unnecessary fields for build ISO
2012-11-07 16:14:31 +04:00
6a7035d551
added #show action for product_build_list
2012-11-06 22:01:54 +04:00
317f672e32
added #new action for create ISO build
2012-11-06 19:08:54 +04:00
ecec330b4d
added migration, updated models, UI
2012-11-06 18:13:16 +04:00
970da230f2
[refs #90 ] add validations
2012-10-29 21:33:20 +06:00
ab57507f34
[refs #90 ] make common translation to commits and pulls
2012-10-26 20:12:14 +06:00
e9fd2a2df6
Merge branch 'master' into 706-get-list-of-projects-by-repository
2012-10-19 18:51:11 +04:00
00e92d9672
Merge pull request #678 from warpc/579-code_line_comments
...
[refs #579 ] code line comments
2012-10-19 07:48:50 -07:00
4680e9c62c
#706 : added #projects action to Repositories API
2012-10-19 17:52:36 +04:00
6c8c1ca880
Merge branch 'master' into 579-code_line_comments
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
d5ad5b1a95
Merge branch 'master' into 698-rest-api-for-advisories
2012-10-18 18:59:00 +04:00
68dbae8c83
#698 : added #create and #fork actions for Advisories API
2012-10-18 18:17:50 +04:00
b7eff22c23
#698 : added API for Advisories
2012-10-18 15:22:31 +04:00
7870ffef7d
[refs #579 ] fixed some bugs
2012-10-18 00:38:42 +06:00
6680265c64
#686 : some refactoring of relations
2012-10-17 17:46:16 +04:00
351821912b
#686 : added API for show list of projects
2012-10-17 14:35:33 +04:00
d99a2104ce
#692:added index action for Groups API
2012-10-16 15:49:07 +04: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
f3605a1211
#691 : updated routes according to Vladimir's comments
2012-10-15 19:47:42 +04:00
0879a7e46f
#691 : added #notifiers and #update actions for Users API
2012-10-15 18:06:08 +04:00
2ae671df21
Merge branch 'master' into 691-rest-api-for-users
2012-10-15 17:03:05 +04:00
e50bd3a2b5
#691 : added #show action for Users API
2012-10-15 13:45:00 +04:00
00f5d0ce62
#672 : updated Repositories API
2012-10-14 17:38:06 +04:00
be8ed0984a
#672 : added #add_member, #remove_member, #update, #destroy actipns for Repository API
2012-10-14 16:00:49 +04:00
bb47567628
[refs #579 ] small improvements of the discussion
2012-10-13 00:12:04 +06:00
4f21f0cb88
Add new school adress; change email send method to sendmail; add google check page
2012-10-12 00:16:51 +04:00
2e0f4dc2eb
Merge pull request #680 from warpc/671-rest-API
...
[refs #671 ]: full rest API for Platforms; Add refs_list api for Project
2012-10-11 13:12:32 -07:00
8f3ed58cd8
#671 : added Projects#refs_list API action
2012-10-11 20:27:17 +04:00
7f031ac688
[refs #374 ] added commit validation
2012-10-11 22:11:53 +06:00
eef640e82c
#671 : added API Platforms#create action, updated specs, added validation to platform model
2012-10-10 21:45:56 +04:00
972877bc76
#671 : added API Platforms#destroy action and specs
2012-10-10 19:43:14 +04:00
d9c583e226
#671 : added specs for API Platforms#clone action
2012-10-10 19:13:14 +04:00
e5c6707594
#671 : added #remove_member action for platforms API, updated specs
2012-10-09 21:07:10 +04:00
30909b281d
#671 : added #add_member action for platforms API, added new specs
2012-10-09 20:23:48 +04:00
9e6e2de955
#671 : added #members action for platforms API
2012-10-09 19:06:27 +04:00
feefe8ed89
#374 : added #platforms_for_build action for Platforms API
2012-10-08 22:02:44 +04: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
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
4b72501159
#671 : added Architectures API
2012-10-04 16:45:49 +04: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
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
ba7a7b20a5
#349 : updated locales, added shared template
2012-10-02 19:20:58 +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
eaf29713cc
[refs #90 ] autoload refs
2012-10-01 22:03:08 +06:00
234615d728
#658 : added link to notification center in email
2012-10-01 17:08:02 +04:00
e7549635f0
[refs #90 ] change translation
2012-09-28 23:44:26 +06:00
7756f6200d
[refs #374 ] Add http headers for rate limit, restrict rate limit only for api calls.
2012-09-28 01:07:19 +04:00
abafbc6ef5
Merge again-and-again branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-09-28 00:09:34 +06:00
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
223aa33604
[refs #374 ] Add info about API doc site
2012-09-27 17:55:16 +04:00
7c4c855341
[refs #374 ] Small refactoring
2012-09-27 17:41:02 +04:00
0dd103b7f4
[refs #374 ] Fix build list tests, remove unused code.
2012-09-27 03:54:56 +04:00
4402f676c3
Increase hourly request limit, remove daily limit
2012-09-27 01:59:31 +04: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
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
397d411252
#90 : added #index action, updated routes
2012-09-26 00:50:40 +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
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
Alexander Machehin
vladdruzh
Vokhmin Alexey V
Vladimir Sharshov