Commit Graph

54 Commits

Author SHA1 Message Date
Wedge f9f75d4318 New interface 2016-05-22 15:33:46 +03:00
Wedge 72e8faa988 Increase release tag on github(wip) 2015-12-29 22:22:17 +03:00
duratarskeyk bdb6458393 modify project model, add project controller for project page 2015-12-12 18:19:02 +00:00
duratarskeyk 07871f7a5e save 2015-12-08 11:13:38 +00:00
Vokhmin Alexey V d56f14a9a8 Update Rails to 4.2.1 2015-06-17 21:18:53 +03:00
Alexander Machehin 366e17b75d add rack-utf8_sanitizer gem 2015-03-25 17:34:56 +05:00
Alexander Machehin 8e32a63cec [#369] fix angular_templates.ignore_prefix 2015-02-03 07:41:51 +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 9d40bfc291 #403: added abf_worker_service, specs 2014-06-19 23:35:53 +04:00
Vokhmin Alexey V c37cf206ab #403: updated structure of jobs 2014-06-19 00:40:22 +04:00
Alexander Machehin d66d9accaf Merge branch '369-remove_codemirror' into 369-bootstrap
Conflicts:
	Gemfile
	Gemfile.lock
	vendor/assets/javascripts/old-codemirror.js
	vendor/assets/javascripts/old-codemirror/keymaps/emacs.js
	vendor/assets/javascripts/old-codemirror/keymaps/vim.js
	vendor/assets/javascripts/old-codemirror/modes/clike.js
	vendor/assets/javascripts/old-codemirror/modes/clojure.js
	vendor/assets/javascripts/old-codemirror/modes/coffeescript.js
	vendor/assets/javascripts/old-codemirror/modes/css.js
	vendor/assets/javascripts/old-codemirror/modes/diff.js
	vendor/assets/javascripts/old-codemirror/modes/gfm.js
	vendor/assets/javascripts/old-codemirror/modes/go.js
	vendor/assets/javascripts/old-codemirror/modes/groovy.js
	vendor/assets/javascripts/old-codemirror/modes/haskell.js
	vendor/assets/javascripts/old-codemirror/modes/htmlembedded.js
	vendor/assets/javascripts/old-codemirror/modes/htmlmixed.js
	vendor/assets/javascripts/old-codemirror/modes/javascript.js
	vendor/assets/javascripts/old-codemirror/modes/jinja2.js
	vendor/assets/javascripts/old-codemirror/modes/less.js
	vendor/assets/javascripts/old-codemirror/modes/lua.js
	vendor/assets/javascripts/old-codemirror/modes/markdown.js
	vendor/assets/javascripts/old-codemirror/modes/mysql.js
	vendor/assets/javascripts/old-codemirror/modes/ntriples.js
	vendor/assets/javascripts/old-codemirror/modes/pascal.js
	vendor/assets/javascripts/old-codemirror/modes/perl.js
	vendor/assets/javascripts/old-codemirror/modes/php.js
	vendor/assets/javascripts/old-codemirror/modes/plsql.js
	vendor/assets/javascripts/old-codemirror/modes/python.js
	vendor/assets/javascripts/old-codemirror/modes/r.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-changes.js
	vendor/assets/javascripts/old-codemirror/modes/rpm-spec.js
	vendor/assets/javascripts/old-codemirror/modes/rst.js
	vendor/assets/javascripts/old-codemirror/modes/ruby.js
	vendor/assets/javascripts/old-codemirror/modes/rust.js
	vendor/assets/javascripts/old-codemirror/modes/scheme.js
	vendor/assets/javascripts/old-codemirror/modes/shell.js
	vendor/assets/javascripts/old-codemirror/modes/smalltalk.js
	vendor/assets/javascripts/old-codemirror/modes/sparql.js
	vendor/assets/javascripts/old-codemirror/modes/stex.js
	vendor/assets/javascripts/old-codemirror/modes/tiddlywiki.js
	vendor/assets/javascripts/old-codemirror/modes/velocity.js
	vendor/assets/javascripts/old-codemirror/modes/verilog.js
	vendor/assets/javascripts/old-codemirror/modes/xml.js
	vendor/assets/javascripts/old-codemirror/modes/xmlpure.js
	vendor/assets/javascripts/old-codemirror/modes/yaml.js
	vendor/assets/javascripts/old-codemirror/overlay.js
	vendor/assets/javascripts/old-codemirror/runmode.js
	vendor/assets/javascripts/vendor.js
	vendor/assets/stylesheets/old-codemirror.scss
	vendor/assets/stylesheets/old-codemirror/modes/diff.scss
	vendor/assets/stylesheets/old-codemirror/modes/rpm-spec.scss
	vendor/assets/stylesheets/old-codemirror/modes/tiddlywiki.scss
	vendor/assets/stylesheets/old-codemirror/themes/cobalt.scss
	vendor/assets/stylesheets/old-codemirror/themes/eclipse.scss
	vendor/assets/stylesheets/old-codemirror/themes/elegant.scss
	vendor/assets/stylesheets/old-codemirror/themes/monokai.scss
	vendor/assets/stylesheets/old-codemirror/themes/neat.scss
	vendor/assets/stylesheets/old-codemirror/themes/night.scss
	vendor/assets/stylesheets/old-codemirror/themes/rubyblue.scss
	vendor/assets/stylesheets/vendor.scss
2014-04-15 19:04:27 +06:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06:00
Vokhmin Alexey V 3eda2718f8 #345: fixed: could not obtain a database connection within 5.000 seconds 2014-03-26 00:25:36 +04:00
Alexander Machehin b4cf625971 [#345] small update config files; remove warning with secret_key_base 2014-03-19 15:47:35 +06:00
Vokhmin Alexey V ebe07ba00c #345: use Redis.current instead of all other 2014-03-19 01:52:40 +04:00
Alexander Machehin b73556da4a [#345] fix No such middleware to insert after: Rack::Lock (RuntimeError) 2014-03-11 19:45:48 +06:00
Alexander Machehin a5f56bb835 [#345] remove observers; use new labmda syntax 2014-03-11 14:28:17 +06:00
Alexander Machehin a81b5fc69e Merge branch 'master' into 345-update_to_rails4
Conflicts:
	Gemfile
	Gemfile.lock
2014-03-07 16:25:32 +06:00
Alexander Machehin 0a80306095 [#345] update gems 2014-03-06 13:44:14 +06:00
Vokhmin Alexey V fe20a9788a Use resque-schedule for cleanup 2014-02-25 00:36:51 +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 01380be9a7 Revert "try stop bots"
This reverts commit e6238a7621.

Conflicts:
	app/assets/stylesheets/devise/registration.scss
2013-08-28 19:35:16 +06:00
Vokhmin Alexey V d317eeb413 #281: moved concerns into lib folder 2013-08-27 20:27:22 +04:00
Alexander Machehin e6238a7621 try stop bots 2013-08-26 23:53:03 +06:00
Vokhmin Alexey V 55bc1a8096 #276: updated UI of platforms, some refactoring 2013-08-23 22:58:29 +04:00
Vokhmin Alexey V 66fe5c11cf #200: removed activity_feed_observer 2013-06-27 18:40:19 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin 2bb5d517a2 [refs #782] add base auth to git url 2012-12-14 17:25:10 +06:00
Vladimir Sharshov 7756f6200d [refs #374] Add http headers for rate limit, restrict rate limit only for api calls. 2012-09-28 01:07:19 +04:00
Vladimir Sharshov 7c4c855341 [refs #374] Small refactoring 2012-09-27 17:41:02 +04:00
Vladimir Sharshov 4402f676c3 Increase hourly request limit, remove daily limit 2012-09-27 01:59:31 +04:00
konstantin.grabar b9a622acec [refs #374] Add unixtime search and output. Fix rate limit configuration and 404 status 2012-09-05 17:47:25 +04:00
konstantin.grabar 58d9a972ef [refs #374] Add rate limit 2012-09-04 22:48:14 +04:00
konstantin.grabar 3cf3546c2e [refs #441] Add secret to filter. Add repository key exist check 2012-07-13 18:16:56 +04:00
konstantin.grabar 742603ab7e [refs #223] Add build list duration 2012-04-12 14:29:04 +04:00
Pavel Chipiga 159fbe65dc Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
2012-03-03 01:38:43 +02:00
Pavel Chipiga 7d112d0524 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-01 19:33:46 +02:00
George Vinogradov edc8774387 [issue #203] Some layout changes & presenters.
*  Fixed bugs in layout
  *  Fixed typos
  *  Fixed bugs in JS
  *  Added universal partial _feed_message.html.haml
  *  Added presenters
  *  Added CommitAsMessage presenter, that prepares Grit::Commit
     to be shown as message.
2012-02-19 02:47:57 +04:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Vladimir Sharshov 3206258f7b Change default locale to English 2012-01-20 00:06:43 +04:00
Pavel Chipiga 4bd9b81f65 Change default_url_options settings. Stub brutal hack. Refs #2261 2011-11-22 20:47:45 +02:00
Pavel Chipiga 1cbd725e14 Fix mailer domains. Fix projects import script. Refs #2261 2011-11-22 15:01:33 +02:00
Pavel Chipiga 0171a0a42a Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136 2011-10-26 23:57:51 +03:00
George Vinogradov 82d72a851c ACL for testing. 2011-10-24 01:39:44 +04:00