Commit Graph

61 Commits

Author SHA1 Message Date
Vokhmin Alexey V b93f40a154 #465: Fixed: Pundit::AuthorizationNotPerformedError 2015-04-19 00:02:16 +03:00
Vokhmin Alexey V ba219d6f1d #465: Update specs for Users::ProfileController 2015-04-07 23:14:28 +03:00
Vokhmin Alexey V 28988303d1 #465: Update API controllers, specs 2015-04-07 23:08:16 +03:00
Vokhmin Alexey V 6a7d6cb982 #465: updated views 2015-04-07 23:05:12 +03:00
Vokhmin Alexey V 86e39e978c Fixed: undefined method #find_or_initialize_by_provider_and_uid 2015-03-11 14:37:10 +03:00
Vokhmin Alexey V 84e7145d6d rename *_filter => *_action 2015-03-05 02:19:19 +03:00
Vokhmin Alexey V 2a01474d03 #452: added "Builds settings" for user 2015-02-11 01:08:39 +03:00
Vokhmin Alexey V 362477fadd #369: remove layouts/application.html.haml 2014-11-14 00:41:07 +03:00
Vokhmin Alexey V 09a1ab377f #369: updated UI for user and group profile 2014-11-14 00:19:18 +03:00
Vokhmin Alexey V 54d2c6f3c3 #369: updated submenu for user 2014-11-13 03:23:01 +03:00
Vokhmin Alexey V 6bf4576b34 #369: updated UI for User profile 2014-11-13 03:17:22 +03:00
Vokhmin Alexey V 6a78ab4993 #369: updated UI for user settings, ssh_keys 2014-11-07 01:00:23 +03:00
Alexander Machehin e8e80e91fe fix Could not find a valid mapping for nil 2014-09-13 09:43:41 +06:00
Vokhmin Alexey V b1e98bd92f Fixed: confirmation_instructions 2014-03-31 14:25:56 +04:00
Vokhmin Alexey V cab3debd4a Fixed: sign_up 2014-03-27 18:25:15 +04:00
Vokhmin Alexey V bd36a6a807 #345: fixed: visibility of projects 2014-03-26 14:24:52 +04:00
Alexander Machehin 2ee3ea93bd [#345] remove deprecated dynamic finder methods 2014-03-18 19:58:51 +06:00
Vokhmin Alexey V e6934057b4 #345: updated routes, fixed specs 2014-03-17 21:01:17 +04:00
Vokhmin Alexey V c06245aa9f #345: fixed some specs, build_list_observer 2014-03-15 02:54:04 +04:00
Alexander Machehin 718c8bb08c [#345] remove url_for hack 2014-03-13 22:35:00 +06: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
Vokhmin Alexey V 7be0129361 #312: show user authentication_token 2013-10-16 21:30:40 +04:00
Alexander Machehin 198cb75711 [#277] show own projects 2013-09-12 13:49:42 +06:00
Alexander Machehin cdcc05e0fc [#277] small profile controllers refactoring 2013-09-11 21:43:53 +06:00
Alexander Machehin 73570317fa [#277] fix users profile 2013-09-11 00:04:47 +06:00
Alexander Machehin 5ff87be8a9 [#277] profile projects 2013-09-10 23:03:00 +06:00
Alexander Machehin 7da70b5f12 [#277] profile projects 1 ver. 2013-09-08 17:56:43 +06:00
Alexander Machehin 5c6220a46d try to stop bots (part2) 2013-08-28 21:15:28 +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
Alexander Machehin e6238a7621 try stop bots 2013-08-26 23:53:03 +06:00
Vokhmin Alexey V 60d262d635 #81: some refactoring 2013-07-01 15:09:36 +04:00
Vokhmin Alexey V 1cd1ac45a1 #81: sort projects list alphabetically when no search 2013-07-01 14:50:35 +04:00
Alexander Machehin f8f53b198b [#98] create home controller; move activity, common issues/pull_requests & root pages here 2013-05-15 23:28:39 +06:00
Alexander Machehin dd6a319dfb [#98] common pull requests 2013-05-13 23:15:23 +06:00
Alexander Machehin d3ac9d1a2c [#98] Add common issues tracker 2013-04-30 00:14:25 +06:00
Vokhmin Alexey V 960aecb6d5 #30: refactoring of OmniauthCallbacksController#find_for_ouath 2013-03-26 17:35:02 +04:00
Vokhmin Alexey V 69c226be0b #30: update comments, some refactoring 2013-03-26 17:30:43 +04:00
Vokhmin Alexey V cd98088e7f #30: find user by email before registration 2013-03-26 17:22:25 +04:00
Vokhmin Alexey V abfe502b5f #30: update devise.rb and omniauth_callbacks_controller 2013-03-26 16:24:15 +04:00
Vokhmin Alexey V c2e89f8781 #30: use omniauth for registration through Facebook, GitHub, Google 2013-03-26 03:13:15 +04:00
Vokhmin Alexey V e055d0080b #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
Alexander Machehin d85039d5be Support git over ssh: hooks, support gitlab-shell api, UI, refactroing 2013-03-07 14:09:08 +06:00
Alexander Machehin 8756a6d28a fix mistype 2013-03-01 17:33:31 +06:00
Alexander Machehin c065e3d5be #953 add key management 2013-03-01 17:33:02 +06:00
Alexander Machehin 520d51a55a #953 ssh keys initial 2013-02-28 23:02:14 +06:00
Alexander Machehin 6fc5eaa65c [refs #818] add system role 2012-12-28 00:27:50 +06:00
Vokhmin Alexey V 04b2647ef0 #668: added uploading avatars for groups 2012-10-03 20:38:42 +04:00
Vokhmin Alexey V cb994c6fd6 #349: created autocompletes_controller, refactoring, updated specs 2012-10-02 20:54:55 +04:00
Vokhmin Alexey V c7fda1a810 #349: updated ability model according to Alexander comments, reverted some changes, added paging for projects on #show page 2012-10-02 19:14:08 +04:00