home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
57 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets 5b26b45dcb Improve group settings UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 21:30:20 +03:00
Dmitriy Zaporozhets a2b3eb134a Move from ui-box to panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 18:57:27 +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
Marc Radulescu d1980adf93 typos fixed 2014-05-22 10:35:01 +02:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +02:00
Dmitriy Zaporozhets 32ecb02784 Refactor scss 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 13:51:22 +02:00
Dmitriy Zaporozhets f974bea8ba Merge branch 'upstream-ce' into 'master' 
Upstream changes from CE (6.6.0.pre)
 2014-02-11 12:09:54 +00:00
Dmitriy Zaporozhets e6c9ee7732 Improve group edit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 12:52:06 +02:00
Dmitriy Zaporozhets 3915b4b9e0 Improve group edit page for admins 
Add autocomplete selectbox for ldap group name.
Fixed align of LDAP settigs block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 10:24:44 +02:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
 2014-02-11 10:15:13 +02:00
Dmitriy Zaporozhets eb272227c3 Add icons and better names to Project/Group nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 10:16:26 +02:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Dmitriy Zaporozhets 427a9e16a6 EE ui fixes after twbs3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-27 14:40:01 +02:00
Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +02:00
Dmitriy Zaporozhets 09c2f8c7b1 Improve group views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-04 19:26:12 +02:00
Dmitriy Zaporozhets 5fa805a7ba Restyle issue form. Replace inputs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-01 22:11:18 +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 010a770b3f Migrate forms and inputs pt1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-31 02:50:36 +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 0c0beec26e use .body instaed of .ui-box-body 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-24 12:58:23 +02:00
Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
 2013-12-23 12:57:22 +02:00
Jacob Vosmaer 2f53c2d8b5 Improve wording of LDAP sync explanation 2013-12-19 11:46:17 +01:00
Jacob Vosmaer d19f5bd74c Fix grammar in help text 2013-12-18 16:38:14 +01:00
Dmitriy Zaporozhets 4128f995d3 Improve UI for Group ldap settings page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 17:01:50 +02:00
Jacob Vosmaer 60797589bc Add unstyled explanation for LDAP group settings 2013-12-18 15:43:23 +01:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 10:01:43 +02:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00
David Pursehouse 618ba8ca47 Improve warning message when removing group 2013-10-23 10:15:08 +09:00
David Pursehouse 20ea670e67 Remove "is" from labels 2013-10-18 13:28:49 +09:00
Dmitriy Zaporozhets 89654431ea Group#ldap_cn selectbox with ajax autocomplete via api 2013-10-01 12:04:14 +03:00
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Dmitriy Zaporozhets 3cb663f5c9 Remove project transfer page since we already have multiple owners for group 2013-09-26 10:33:06 +03:00
Dmitriy Zaporozhets 61d9860158 Remove team mentions 2013-08-27 12:59:44 +03:00
Dmitriy Zaporozhets cc36f6dcf8 Few fixes after pull from gitlab upstream 2013-08-12 14:20:08 +03:00
Dmitriy Zaporozhets 9ff730254a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	db/schema.rb
 2013-08-12 13:47:02 +03:00
Dmitriy Zaporozhets 915315a460 ldap_access field added to group. set ldap group membership based on ldap_access value 2013-08-09 12:53:52 +03:00
Dmitriy Zaporozhets b2152847b1 Replace xlarge and xxlarge classes 2013-08-07 23:40:29 +03:00
Dmitriy Zaporozhets a3b0dc2e17 use control-group classes for inline forms in profile and group pages 2013-08-07 23:24:34 +03:00
Dmitriy Zaporozhets 4b3fa67cb7 Add ldap_cn field to Group 2013-08-02 15:58:40 +03:00
Dmitriy Zaporozhets 3e9460b6cb Fix minor wording 2013-08-01 16:11:50 +03:00
Dmitriy Zaporozhets a41875d21e Replace %h5.title with div.title 2013-07-13 20:36:21 +03:00
Dmitriy Zaporozhets 746ffcfcbd Make group settings menu looks similar to project settings menu 2013-06-25 13:15:07 +03:00
Dmitriy Zaporozhets 20ce3980d3 public_icon, private_icon helpers 2013-06-06 14:02:29 +03:00