Commit Graph

3117 Commits

Author SHA1 Message Date
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
Vladimir Sharshov de21c6142b Merge pull request #544 from warpc/90-pull
[refs #90] Pull request
2012-09-27 11:21:21 -07: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
Alexander Machehin 0ad9374ad1 [refs #616] fixed comments spec 2012-09-27 14:50:45 +06:00
Vladimir Sharshov 0dd103b7f4 [refs #374] Fix build list tests, remove unused code. 2012-09-27 03:54:56 +04:00
Vladimir Sharshov 4402f676c3 Increase hourly request limit, remove daily limit 2012-09-27 01:59:31 +04:00
Vladimir Sharshov 181e95a9d2 Moving Apidocs to separate project 2012-09-27 01:06:57 +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
Alexander Machehin 496cb7d354 Merge pull request #660 from warpc/90-separate-issues-and-pull-requests
#90: separate issues and pull requests
2012-09-26 09:53:19 -07: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 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