home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,383 Commits 48 Branches 340 Tags
4bed25b1e1a8a66cc151dfcf5600a68b8d6c407e
Commit Graph
209 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Stan Hu ab88b7da19 Fix project snippets button appearing when it is disabled 
Closes #1705
 2015-05-27 05:07:44 -07:00
Stan Hu a7d8a7bd3d Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings 
Closes #1676
 2015-05-25 06:16:33 -04:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Robert Speicher f3d63eeb18 Remove feature tests for old task lists 2015-05-06 13:00:14 -04:00
Douwe Maan 97bfd764b7 Add feature specs for license upload. 2015-05-05 14:13:57 +02:00
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
Robert Speicher a3fbf34469 Fix header_should_have_correct_id_and_link for features 2015-04-30 16:35:26 -04: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 5d1ab47bd2 Revert help link tests removal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-15 12:13:49 +03:00
Hannes Rosenögger a9306613f6 The help link has been removed. The commit removes the test for it. 2015-04-13 22:46:18 +02:00
Stan Hu 3d2c387840 Move current user to the top of the list in author/assignee filters 
Closes #1321
 2015-04-09 01:04:53 -07:00
Valery Sizov 3bf8f097d9 git hook sample: tests 2015-03-26 13:38:26 +02:00
Valery Sizov f444c9cc6c deploy key events: tests 2015-03-24 15:58:02 +02: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
Douwe Maan 224187ffb9 Move group members index from /members to /group_members. 2015-03-15 13:51:11 +01:00
Douwe Maan 75aff0f79c Move project members index from /team to /project_members 2015-03-15 13:51:11 +01:00
Valery Sizov 29e8d02ac4 Group level web hooks: tests 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 9839d106c4 Rename dashboard landing page to Your projects 2015-03-10 16:06:30 -07:00
Dmitriy Zaporozhets b8d73315f5 Add tests for starred projects page 2015-03-09 14:25:14 -07:00
Dmitriy Zaporozhets 7e4258777f Move Profile groups tests to Dashboard group tests 2015-03-08 20:52:22 -07:00
Dmitriy Zaporozhets d997890270 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-03-03 21:30:52 -08:00
Stan Hu b8c9257fb1 Fix bug where editing a comment with "+1" or "-1" would cause a server error 
Closes #1151
 2015-03-02 15:26:00 -08:00
Vinnie Okada 067a5b9d8b Update path helpers and routes for Rails 4.1.9 
Update project path helpers and routes to reflect the new nested
resources introduced in the Rails 4.1.9 upgrade.
 2015-02-27 18:21:15 -07:00
Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre 
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
 2015-02-23 23:56:59 -08:00
Dmitriy Zaporozhets 12589d3390 Improve sidebar menu for project settings 2015-02-23 18:43:39 -08:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets 29611a245d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	GITLAB_SHELL_VERSION
	VERSION
	lib/api/entities.rb
	lib/api/groups.rb
 2015-02-18 17:44:29 -08:00
Douwe Maan 080449f8af Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-17 17:58:08 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07: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 e956066d4a Add tests for initializing bare repo and creating new file in it 2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets ed91378627 Fix blob controller rendering in case of errors 2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08:00
Dmitriy Zaporozhets dbd54fad51 Merge pull request #7905 from cirosantilli/visible-false 
Change always passing visible false tests.
 2015-01-15 14:41:41 -08:00
Dmitriy Zaporozhets 36acf5b293 Revert "Fix tests" 
This reverts commit 1e45ba7f16.
 2015-01-14 17:22:48 -08:00
Dmitriy Zaporozhets 1e45ba7f16 Fix tests 2015-01-14 16:23:20 -08: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 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Ciro Santilli 67b06e7a9b Change always passing visible true tests to false. 2015-01-02 00:20:19 +01:00
Ciro Santilli 18fa155025 Add tests for disabled blob edit button cases. 2014-12-30 18:19:48 +01:00
Dmitriy Zaporozhets 465f186954 Show assigned issues/mr be default on dashboard 
This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 18:33:53 +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 aadfb3665f Fix tests and add message if no oauth apps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:46:19 +02:00
Dmitriy Zaporozhets 5b49bb208a Fix issueable context update and fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:42:26 +02:00
Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/group.html.haml
 2014-12-21 01:20:51 +02:00
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 01:11:08 +02:00
Marin Jankovski 3d4a3fc4d1 Add feature spec for group membership locking. 2014-12-15 10:44:34 +01:00