home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 13:06:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,924 Commits 48 Branches 340 Tags
f07b26fcefdf363fc97a495e83aeb8351bbcd8bc
Commit Graph
311 Commits
Author SHA1 Message Date
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Douwe Maan 4d7759156b Plural instead of singular. 2015-04-30 21:10:42 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Dmitriy Zaporozhets 93359c7e06 Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside 2015-04-30 19:40:05 +03:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Sullivan SENECHAL f28f5e49f6 Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
Robert Speicher 96593d79f9 Add data-placement attributes for all sidebar links 2015-04-25 16:03:03 -04:00
Dmitriy Zaporozhets f912650ded Improve mobile UI for dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-24 17:39:53 +03:00
Douwe Maan a12d50c5e5 Remove unnecessary private_token params. 2015-04-23 17:11:39 +02:00
Douwe Maan cd450221eb Rename "News Feed" buttons to "Activity Feed" 2015-04-23 17:11:39 +02:00
Douwe Maan 9c60354a6a Make links and titles of atom feeds consistent. 2015-04-23 17:11:39 +02:00
Douwe Maan 72b090b890 Move activity feed buttons out of event_filter into actual show views. 2015-04-23 17:11:38 +02:00
Douwe Maan cba86eed74 Add feed button to dashboard and group issue pages. 2015-04-23 17:11:38 +02:00
Douwe Maan 8917ae39e3 Add atom link tag to every page that has one. 2015-04-23 17:11:38 +02:00
Dmitriy Zaporozhets d01d0c02b7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03:00
Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Douwe Maan 453340d449 Let membership invitations be resent. 2015-04-14 12:08:10 +02:00
Douwe Maan 87dd3f215f Let members be invited from Add members pane. 2015-04-14 12:08:10 +02:00
Douwe Maan 2a1d4255da Correctly render invite members without user. 2015-04-14 12:07:33 +02:00
Douwe Maan ff3caad4ca Rename manage_group ability to admin_group for consistency with project. 2015-04-14 12:05:49 +02:00
Sven Strickroth 57c2a9f03d Explicitly set image alt to prevent graphical glitches 
Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded.

Fixes https://github.com/gitlabhq/gitlabhq/issues/6036.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-04-13 21:07:42 +02:00
Dmitriy Zaporozhets 6a790b7963 Better looking milestone lists 2015-04-01 02:45:47 +03:00
Dmitriy Zaporozhets b7e2be247f Fix adding new members to group 2015-03-30 14:17:49 -07:00
Dmitriy Zaporozhets a05cc636d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb
 2015-03-21 20:41:10 -07:00
Dmitriy Zaporozhets beece83af1 Improve header with avatar for group and user pages 2015-03-20 20:15:13 -07:00
Dmitriy Zaporozhets 31af3f4003 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	spec/models/note_spec.rb
 2015-03-19 23:21:50 -07:00
Dmitriy Zaporozhets fa7ee3ade8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-18 21:16:43 -07:00
Dmitriy Zaporozhets ba39ca9f4a Fix project name overflow on dashboard 2015-03-18 21:05:39 -07:00
Dmitriy Zaporozhets e25b1107c8 Refactor select css. Make selects same width 2015-03-18 20:46:26 -07:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Dmitriy Zaporozhets bacb05c554 Small improvements to group/project member rows 2015-03-15 23:50:55 -07:00
Douwe Maan 84371de01f Move group leave action from dashboard/groups to groups/group_members. 2015-03-15 13:52:28 +01:00
Douwe Maan 224187ffb9 Move group members index from /members to /group_members. 2015-03-15 13:51:11 +01:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets 7ac62388a5 Prevent database query each time we render group avatar 2015-03-12 13:56:53 -07:00
Valery Sizov 57875720ab Group level webhooks 2015-03-12 20:46:10 +02:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets c6b2421127 Render milestone progress with one helper method 2015-03-09 15:20:32 -07:00
Dmitriy Zaporozhets 9b3e156e43 Move profile groups page to dashboard 2015-03-08 17:03:30 -07:00
Dmitriy Zaporozhets be3edeb6a1 Small UI improvements after css refactoring 2015-03-07 10:35:17 -08:00
Dmitriy Zaporozhets 7b9b9f704e Fix project create link on group page 2015-03-04 18:26:49 -08:00
Dmitriy Zaporozhets 65105ff3bb Improve projects list 
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
 2015-03-04 17:22:55 -08:00
Dmitriy Zaporozhets 811505c7ce Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/views/groups/members.html.haml
 2015-03-03 13:33:40 -08:00
Douwe Maan fbc3cb69c3 Add dashboard milestones. 2015-03-03 16:19:37 +01:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Dmitriy Zaporozhets 519ca7bae9 Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button 
Conflicts:
	app/views/shared/_issuable_filter.html.haml
 2015-03-02 15:28:22 -08:00