Commit Graph

1121 Commits

Author SHA1 Message Date
Vladimir Sharshov 8c7ac11ec7 Merge pull request #689 from warpc/672-rest-api-for-repositories
[refs #672]: REST API for Refositories
2012-10-15 04:44:08 -07:00
Vokhmin Alexey V fae5d3ff2b #690: truncate project name before validation 2012-10-15 12:28:18 +04:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vladimir Sharshov 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
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Vokhmin Alexey V eef640e82c #671: added API Platforms#create action, updated specs, added validation to platform model 2012-10-10 21:45:56 +04:00
Vokhmin Alexey V abe31b3c2e #671: added API #update action for platform 2012-10-09 18:46:20 +04:00
Vokhmin Alexey V 07bf8f1d0f fixed missprint 2012-10-09 17:54:17 +04:00
Vokhmin Alexey V 1e2d41b183 updated Ability model 2012-10-09 17:50:09 +04:00
Vokhmin Alexey V d83243a3a3 hot fix for API 2012-10-09 17:47:05 +04:00
Alexander Machehin 3513d47be6 [refs #90] fix updating pull 2012-10-05 23:32:29 +06:00
Vokhmin Alexey V f5d0d9f20b #671: added filter platforms by type 2012-10-04 17:34:30 +04: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
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 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 d36155ec7f [refs #90] remove useless abilities 2012-10-02 19:24:53 +06:00
Alexander Machehin 8f011316c3 [refs #90] possible fix for nil commom ancestor commit 2012-10-01 23:52:18 +06:00
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +06: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
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
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 77b57cce11 [refs #374] Fix support http basic auth, fix tests, fix abilities. 2012-09-26 21:15:11 +04:00
Alexander Machehin cc05fa695a [refs #90] fixed pull abilities part 2 2012-09-26 23:09:29 +06:00
Vokhmin Alexey V 5f0e683711 #90: moved code 2012-09-26 19:41:00 +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 3491492c8d [refs #90] fixed pull authorization 2012-09-26 15:24:46 +06: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
Alexander Machehin a29a2f8fe9 [refs #616] change ability for preview 2012-09-25 15:46:19 +06:00
Vokhmin Alexey V 9be978eb68 #648: updated models, JS, controller according to comments and discussions 2012-09-24 22:04:53 +04: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 e94c6f4f00 [refs #374] Merge master into 374-rest_api_for_builds 2012-09-21 13:20:04 +04:00
Vokhmin Alexey V 7a8b68b90b small refactoring 2012-09-20 00:54:15 +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 426eb72d5f moved #notify_users method from observer to model, updated specs 2012-09-19 17:55:17 +04: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