Commit Graph

51 Commits

Author SHA1 Message Date
Vokhmin Alexey V cba5ff2d5e #446: cleanup, added specs for Project#fork 2015-01-14 23:56:26 +03:00
Vokhmin Alexey V 8cd175c840 #446: updated UI, logic 2015-01-14 02:17:23 +03:00
Vokhmin Alexey V 8580b9a80d #446: added ability to create project aliases 2015-01-13 02:06:33 +03:00
Alexander Machehin 40cdd40acf [#369] new issue title 2014-11-26 19:24:52 +05:00
Vokhmin Alexey V d1116e70db #369: updated UI for mass import 2014-11-18 23:45:03 +03:00
Vokhmin Alexey V 362477fadd #369: remove layouts/application.html.haml 2014-11-14 00:41:07 +03:00
Alexander Machehin f4eb6de8b0 [#369] project sections page 2014-11-12 22:30:27 +05:00
Alexander Machehin bc0b196319 [#369] edit project page 2014-11-12 22:07:39 +05:00
Alexander Machehin efbde056e0 [#369] new project page 2014-11-11 21:59:49 +05:00
Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml
2014-10-16 16:41:29 +06:00
Vokhmin Alexey V 7ded629ca6 #408: added description to MassBuild 2014-06-27 01:21:31 +04:00
Alexander Machehin bdcbcdd197 [#369] restore line 2014-06-26 18:16:35 +06:00
Alexander Machehin 2727380c32 [#369] projects page; small refactoring 2014-06-26 18:07:22 +06:00
Alexander Machehin 197c33195a [#345] fix authorizing projects controller 2014-03-21 16:40:58 +06:00
Vokhmin Alexey V 4250e31cdc Merge branch 'master' into 354-add-possibility-to-rebuild-projects-periodically
Conflicts:
	Gemfile.lock
2014-02-19 13:16:27 +04:00
Vokhmin Alexey V 93885af29a #354: updated UI 2014-02-18 23:16:23 +04:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
Alexander Machehin 69cefd8764 [#325] fix forbidden for simple user 2013-11-20 17:33:48 +06:00
Alexander Machehin 6932420678 Merge branch 'master' into 325-fork_project_with_another_name
Conflicts:
	app/controllers/projects/projects_controller.rb
2013-11-19 17:18:30 +06:00
Alexander Machehin 188c3be355 [#325] add abibity to create fork with different name 2013-11-19 17:06:44 +06:00
Vokhmin Alexey V 19ff6288ce #321: added select_tag with repositories into Mass Import 2013-11-15 18:46:09 +04:00
Vokhmin Alexey V e538a3d5a6 #321: added debug info, some fixes 2013-11-15 01:26:05 +04:00
Vokhmin Alexey V dbf3f24b21 #321: added UI for mass_import 2013-11-14 02:01:12 +04:00
Vokhmin Alexey V 1cd1ac45a1 #81: sort projects list alphabetically when no search 2013-07-01 14:50:35 +04:00
Alexander Machehin 8c7a4937c0 [#125] fix checking ability to create project for group 2013-05-08 20:41:15 +06:00
Alexander Machehin f588ec36f5 [#125] Add ability to create/fork project in group also for members with "write" access 2013-05-07 20:56:13 +06:00
Vokhmin Alexey V 958017b3ed #82: update for adding new packages into repository 2013-04-08 18:27:50 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04: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
Alexander Machehin eaf29713cc [refs #90] autoload refs 2012-10-01 22:03:08 +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
Vokhmin Alexey V 84378afc3d #648: small code optimization 2012-09-25 13:36:50 +04:00
Vokhmin Alexey V 768f4b1dfb #648: renamed parametr 2012-09-24 22:07:53 +04: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
Vokhmin Alexey V 2406423483 #648: added filters to Projects page 2012-09-21 21:57:22 +04:00
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
Vladimir Sharshov 2c1df5cd14 Merge branch 'master' into 263-refactoring
Conflicts:
	config/deploy.rb
	db/schema.rb
2012-09-06 21:14:14 +04:00
Vladimir Sharshov 698e55e3e8 [refs #263] Test refactoring 2012-09-06 14:53:03 +04:00
George Vinogradov decd4bf293 [issue #620] Removed scope from BuildList::Package && small refactoring. 2012-08-31 21:47:52 +04:00
George Vinogradov 68b86ba09a [issue #620] Fixed migration && BuildList#actualize_packages. 2012-08-30 22:32:28 +04:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
George Vinogradov 6c4b13f0da [issue #620] Removed project_maintainer & assignee 2012-08-28 18:25:57 +04:00
George Vinogradov 2fbb72e537 [issue #620] Changes in Maintainer db:
*  Added maintainer selection on project page (see TODO in sources);
  *  Added `actual` field to BuildList::Package;
  *  Added rake task to set BuildList::Package.actual field.
     Run it after migration (see TODO in sources);
  *  Packages after publising of BuildList becomes actual;
  *  Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
Vladimir Sharshov 255bd3a73a Merge pull request #589 from warpc/551-old_bugs_with_by_object
[refs #551] by_object changed to by_actor.
2012-07-27 06:45:34 -07:00
George Vinogradov 40b0bb4b58 [issue #551] by_object changed to by_actor. 2012-07-27 08:12:09 +04: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 2ae66d6ae4 [refs #466] fixed access to project 2012-05-15 17:18:43 +06:00