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

29 Commits

Author SHA1 Message Date
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
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
Alexander Machehin c1c9f9680e [refs #90] remove code duplication 2012-08-10 22:40:09 +06:00
Alexander Machehin 9bf2f728a7 [refs #90] change new action from post to get 2012-08-08 23:21:49 +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 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
Alexander Machehin 25bdbb01d6 [refs #90] project fullname 2012-07-27 18:52:31 +06: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 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
Alexander Machehin b7911f3585 [refs #90] fixed create pull button text 2012-07-18 16:29:55 +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
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 7b0c135a24 [refs #90] fixed pull button 2012-07-04 20:22:23 +06:00
Alexander Machehin 1ffb1b3940 Merge branch 'master' into 90-pull 
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/models/project.rb
	db/schema.rb
 2012-06-27 16:20:38 +06:00
Alexander Machehin 8542c60838 [refs #522] to fork check own projects 2012-06-15 00:12:44 +06: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
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +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