home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
133 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Marin Jankovski f0085d034b Reuse show page for user keys. 2014-12-29 17:09:39 +01:00
Marin Jankovski 492f3a4779 Add user key actions to admins. 2014-12-29 17:07:23 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Dmitriy Zaporozhets e1f1e062a8 Merge branch 'multi_provider' into 'master' 
Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296
 2014-12-04 16:03:04 +00:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Valery Sizov 4e0da2325b Admin: user sorting 2014-10-13 16:07:57 +03:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Marin Jankovski f74dba8c42 Merge pull request #7595 from bbodenmiller/patch-4 
add sign-in count
 2014-10-03 10:23:26 +02:00
Dmitriy Zaporozhets 929678899d Fix 500 error on admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:15:09 +03:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Ciro Santilli 0cdef83dc8 Remove type submit from button_tag since default. 2014-09-26 16:52:36 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Ben Bodenmiller f818218359 add current sign-in date 
add current sign-in date to admin section profile view
 2014-08-24 23:52:31 -07:00
Ben Bodenmiller 92160789aa add sign-in count 
add sign-in count to admin section profile view
 2014-08-24 23:47:19 -07:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Jan-Willem van der Meer 429ab088bc Add entrypoint for sending emails to users 2014-08-11 14:20:29 +02:00
Marin Jankovski c0a95947bc Update the note for admin user. 2014-07-17 14:03:17 +02:00
Marin Jankovski d12c1e90f8 Test secondary user email removal. 2014-06-23 10:39:56 +02:00
Marin Jankovski 37425618bc Add option for admin to remove users secondary emails. 2014-06-23 09:45:26 +02:00
Dmitriy Zaporozhets 31c963edb1 Improve admin/user form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:05:06 +03:00
Dmitriy Zaporozhets fc43c4e7fa Restyle admin/user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 12:44:22 +03:00
Dmitriy Zaporozhets 4c51619de3 Use more logic class names for buttons in panel headings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 19:42:49 +03:00
Dmitriy Zaporozhets 38ff5d1ab9 Replace ui-box title with panel-heading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 18:43:21 +03:00
Dmitriy Zaporozhets 6dcbe1b43c Replace ui-box with panel.panel-default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 18:42:44 +03:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-20 16:21:30 +03:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Dmitriy Zaporozhets f92b1f3d01 Use more specific class names: grouped -> btn-grouped 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 13:05:33 +02:00
Dmitriy Zaporozhets db961b8b46 Improve few admin pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-15 14:31:01 +02:00
Dmitriy Zaporozhets d47fb275ce Fix block/remove UI for admin::users#show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:04:14 +02:00
Jerome Dalbert 9697e5327f Rename "Website url" labels to "Website" 2014-01-20 13:05:19 +00:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Jeroen van Baarsen 34c8ca286a Fix for edit user as admin 
* It fixes an issue where you where able to remove your own
  admin rights. This would result in a 404 error. fixes: #2283
* It fixes an issue where you would be able to block your own
  account on the edit page. This fix makes the behaviour the same
  as on the admin/users overview page
 2014-01-11 14:54:49 +01:00
Dmitriy Zaporozhets 95e6a5dcd3 Fix admin forms UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-10 14:39:45 +02:00
Dmitriy Zaporozhets 0a364762d9 twbs3 style for admin, tree, network, commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-04 19:27:09 +02:00
Dmitriy Zaporozhets d7a48443ce alert-error to alert-danger 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-31 16:34:14 +02:00
Dmitriy Zaporozhets 16eb3ac360 Update form classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-31 01:27:02 +02:00
Dmitriy Zaporozhets 1b1a408a71 Convert span into col-md 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-30 23:55:15 +02:00
Dmitriy Zaporozhets 4cd7a56333 Add User#email uniq validation. Fixed confirmation for admin/users form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:20:36 +02:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets 74d6e492d3 More data: confirm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:46:50 +02:00
Jeroen van Baarsen 00d72e73c8 Better warning when deleting a user 
Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
 2013-12-06 20:11:14 +01:00
Dmitriy Zaporozhets e411f3bab2 Small UI fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 17:24:03 +02:00
Dmitriy Zaporozhets 6404d69780 Better UX for blocked users in admin area 2013-10-16 20:19:25 +03:00