Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,518 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

29 Commits

Author SHA1 Message Date
Alexander Machehin b132a56937 Merge branch 'master' into 674-diff_between_commits 
Conflicts:
	db/schema.rb  fresh
 2012-12-04 00:02:45 +06:00
Alexander Machehin 0669fb2789 [refs #674] small changes 2012-12-03 22:52:11 +06:00
Alexander Machehin 611402c4c2 [refs #674] add stats 2012-12-03 17:11:55 +06:00
Alexander Machehin 76606036cb [refs #737] remove branch from commit message 2012-11-28 19:15:15 +06:00
Alexander Machehin 8ed71e0f03 [refs #674] fixed undefined method 'binary?' for nil:NilClass when rename the file 2012-11-27 23:35:58 +06:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +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 ecf8e7e5ee [refs #579] fixed wiki & refactoring 2012-10-18 18:51:28 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +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 e310f5607c #90: removed unnecessary code 2012-09-27 23:30:59 +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
Vokhmin Alexey V 613db04375 #90: added limit for commits into the pull request 2012-09-26 21:00:58 +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
Alexander Machehin a492367a17 [refs #616] some fixes and refactoring 2012-09-18 16:00:21 +06:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull 
Conflicts:
	db/schema.rb
 2012-08-06 11:19:06 +06: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
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
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +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 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 0b9c0fdd07 [refs #90] fixed rendering file rename 2012-06-08 01:19:18 +06: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