home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,127 Commits 48 Branches 340 Tags
9cc31183a042b60337f7704d1babb9463ea2a137
Commit Graph
1313 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Dmitriy Zaporozhets 8f68c38746 Dashboard activity as separate page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 14:13:04 +02:00
Robert Speicher c52fe24c36 Merge branch 'reply-by-email-improvements' into 'master' 
Ignore empty incoming messages (Reply by email)

We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit.

See merge request !1190
 2015-08-24 21:56:07 +00:00
Douwe Maan 2088880383 Ignore empty incoming messages. 2015-08-24 10:57:35 -07:00
Stan Hu 4016a4577c Only include base URL in OmniAuth full_host parameter 
Closes #2335
 2015-08-23 13:31:02 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Douwe Maan 34026c97b4 Add documentation. 2015-08-19 13:58:14 -07:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Alex Lossent d26f091b94 Support Kerberos authentication for Git HTTP access 
Add support for the Negotiate authentication protocol for Git HTTP access.
This enables Kerberos ticket-based authentication for users who have a
kerberos identity attached to their account.
 2015-08-17 12:11:53 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Stan Hu 1a3283d4e8 Merge branch 'gravatar-host-link' into 'master' 
link to configured gravatar host on profile page

This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service.

See merge request !1093
 2015-08-09 22:42:07 +00:00
Douwe Maan 5472ded240 Fix importing projects from GitHub Enterprise Edition. 2015-08-07 15:44:53 +02:00
Dmitriy Zaporozhets 7a9d432cdb Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:08:22 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 14:03:27 +02:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Ben Bodenmiller 0f785bbc7e ink to configured gravatar host on profile page 2015-08-05 00:48:16 -07:00
Stan Hu 0c1ccda43f Add "Confirm user" button in user admin page 
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
 2015-08-05 00:35:53 -07:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets c1c89500f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-03 11:04:20 +02:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Kamil Trzcinski 87df06171e Bump redis-store to 1.1.6 and remove redid-store-fix-expiry 2015-07-31 15:53:58 +02:00
Jacob Vosmaer 05b518aa4d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-29 15:44:04 +02:00
Jacob Vosmaer 0be6debb0b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-27 11:22:35 +02:00
Jacob Vosmaer d371331a65 Remove weird trailing characters 2015-07-24 18:55:50 +02:00
Jacob Vosmaer 39a7e210a3 Use a separate backup test directory and nuke its contents 2015-07-24 18:54:06 +02:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Marin Jankovski 8fa9da49c4 Merge branch 'set-omniauth-full-host' into 'master' 
Set OmniAuth full_host parameter to ensure redirect URIs are correct

### What does this MR do?

This MR sets the OmniAuth `full_host` parameter to the configured GitLab URL to ensure the `redirect_uri` parameter is called with the right GitLab host.

### Why was this MR needed?

[OmniAuth attempts to grab the request URI](http://awesomeprogrammer.com/blog/2012/12/09/dealing-with-omniauth-redirect-uri-mismatch-invalid-port-number-gotcha/) and use that. If you set up a reverse proxy that terminates SSL at the Web server layer (e.g. https://gitlab.domain.com), omniauth will use the internal URL (e.g. http://my-host:8080) in its redirect URI unless all the Web server headers are properly set (e.g. `X-Forwarded-Port`, etc.). This is easy to forget or mess up, and it's better to ensure that OmniAuth has the right value from the start.

### What are the relevant issue numbers?

Closes #1967

See merge request !991
 2015-07-20 08:45:58 +00:00
Stan Hu 19163f84fb Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in 
Closes #1612
 2015-07-18 15:57:11 -07:00
Stan Hu 5f4dcbf8be Set OmniAuth full_host parameter to ensure redirect URIs are correct 
Closes #1967
 2015-07-17 16:24:19 -07:00
Stan Hu a84ed6eb23 Merge branch 'add-support-remove-milestone' into 'master' 
Add support for destroying project milestones

### What does this MR do?

This MR adds a "Remove" button to the project milestones page and the milestone page itself.

### Why was this MR needed?

Because lots of people talked about needing to clean their toilets. :)

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/1504

### Screenshots

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef8c7a3ea1db7b37cccae3869ac4de0a/image.png)

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/33eb01c7bc30fb235de96db5efb8746d/image.png)

See merge request !980
 2015-07-17 17:15:27 +00:00
Valery Sizov 3cc78d8998 Approvers: UI for project settings 2015-07-17 17:58:33 +03:00
Stan Hu df2bb60f90 Add support for destroying project milestones 
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
 2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Jacob Vosmaer 82bb5c5e03 Expire Rails cache entries after two weeks 
This should help prevent endless Redis growth.
 2015-07-15 13:53:40 +02:00
Dmitriy Zaporozhets c84b14d2a1 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/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Robert Speicher 800df45db2 Add disable_two_factor route for Admin::Users 2015-07-10 17:18:17 -04:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:01:12 +02:00
Jacob Vosmaer bb50b7fcd0 Allow custom backup archive permissions 
This change helps system administrators who want to replicate
GitLab backup files without needing root permissions.
 2015-07-06 18:43:17 +02:00
Dmitriy Zaporozhets f3590c83ea Merge branch 'audit_log' into 'master' 
Audit log for user authentication

https://dev.gitlab.org/gitlab/gitlabhq/issues/2318

See merge request !931
 2015-07-06 10:09:53 +00:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Stan Hu 3e738e3b9a Add support for unlocking users in admin settings 
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
 2015-07-02 04:22:51 -07:00
Dmitriy Zaporozhets c83bbfa79e Enable rack profiler by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-24 12:48:59 +02:00
Dmitriy Zaporozhets cc04c5b828 Refactor admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:12:20 +02:00
Dmitriy Zaporozhets d059c69db7 Move identities list to own controller action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00