home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
249 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Sytse Sijbrandij 7b233ea853 Spelling improvement, add in a group, not into group. 2015-02-03 16:55:31 -08:00
Dmitriy Zaporozhets 2bd70b6a01 Improve project icons for dashboard 2015-02-02 15:47:51 -08:00
Dmitriy Zaporozhets 78d7c5087b Use tile avatars for user/group show pages 2015-01-29 17:30:51 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Dmitriy Zaporozhets 965cec68ac Project/Group access dropdown should contain link to permissions help page 2015-01-28 10:53:28 -08:00
Dmitriy Zaporozhets 8933149b9e Merge branch 'add_titles_to_links' into 'master' 
Add titles to all nav links

See merge request !313
 2015-01-27 19:41:46 +00:00
Dmitriy Zaporozhets b92449c73e Predefine colors for project identicons 2015-01-24 22:03:30 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Achilleas Pipinellis 7ac648911f Add titles to links. Closes #1018. 2015-01-24 16:45:21 +02:00
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
Dmitriy Zaporozhets 4165426725 Restyle and refactor milestones filter 2015-01-06 12:32:04 -08:00
Jeremy Maziarz e5c0e2603a Fix xmlns:media namespacing for atom feeds 2014-12-31 15:05:38 -05:00
Dmitriy Zaporozhets 6aec286fca Fix navbar items for mobile biew 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 13:58:01 +02:00
Dmitriy Zaporozhets 4adc033761 Improve UI for group milestone and project milestone pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-27 16:03:02 +02:00
Dmitriy Zaporozhets 01f7734fd7 Fix EE UI for new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 15:16:44 +02:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 18:49:39 +02:00
Dmitriy Zaporozhets 06a219baa5 Restyle group page and event filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-16 18:15:48 +02:00
Dmitriy Zaporozhets f3f27fee88 Left-side navigation for group layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-16 16:58:15 +02:00
Marin Jankovski 6c656c759f Move the checkbox to a better position. 2014-12-15 13:25:03 +01:00
Dmitriy Zaporozhets f5d3e47e39 Hide ldap group links if ldap is not enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 15:45:55 +02: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 d31d711a70 DRY and refactor atom code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 22:14:20 +02:00
Marin Jankovski e348c6512f Add group audit events. 2014-11-20 08:54:49 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag 
Use button type=submit instead of input.
 2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms 
Factor group forms
 2014-10-21 11:39:41 +03:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button 
Factor choose group avatar button
 2014-10-21 08:25:09 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +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
Dmitriy Zaporozhets 299114948b Use only escaped auto_link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-06 15:15:39 +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
Dmitriy Zaporozhets 778923b66c Merge branch 'ee-7-4' into 'master' 
Recent 7.4 code from CE into EE

Fixes #187

See merge request !190
 2014-10-03 12:29:35 +00:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02: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
Marin Jankovski db5497afe8 Move the check if group is synced with ldap to a method. 2014-10-02 11:50:46 +02:00
Marin Jankovski 336b7b8783 Disable ldap user showing only if group is synced with LDAP group. 2014-10-01 14:59:37 +02:00
Ciro Santilli 6294033024 Use button type=submit instead of input. 2014-10-01 11:12:56 +02:00
Marin Jankovski 44b94f7c26 Do not show ldap users in add members dropdown. 2014-09-29 13:36:28 +02:00
Dmitriy Zaporozhets 1aa48174db Fix STI+polymorphic for Group <-> GroupMember 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03: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
Jacob Vosmaer dbe62c373e Improve explanation of the LDAP permission reset 2014-08-29 17:47:05 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Marin Jankovski fa1c44ba1a Rewrite explanation text for ldap group members. 2014-08-25 15:48:50 +02:00
Marin Jankovski ce6c46e25b Add short explanation on what to expect when doing group sync. 2014-08-25 15:39:30 +02:00
Jan-Willem van der Meer 3ba7a3a5ca Remove traces from ldab_cn and ldap_access 
Also add notes about refactoring the old single-ldap API and LdapGroupResetService
 2014-08-15 12:33:05 +02:00