home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,845 Commits 48 Branches 340 Tags
3e71e568569998516afffcb336d397cd4f4a4e90
Commit Graph
478 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Dmitriy Zaporozhets ac571623d8 Merge branch 'pg_dump_schema' into 'master' 
Add pg_schema to backup config

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

See merge request !1345
 2015-09-18 14:33:35 +00:00
Valery Sizov d7242054ba add pg_schema to backup config 2015-09-18 16:29:13 +03:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master' 
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
 2015-09-16 18:34:55 +00:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Kamil Trzcinski 95037c9c55 Revert "monkey patch of Hash" 
This reverts commit 6014019ed4.
 2015-09-14 11:27:30 +02:00
Valery Sizov 6014019ed4 monkey patch of Hash 2015-09-14 12:06:52 +03:00
Valery Sizov 25149ce47e Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-14 11:16:56 +03:00
Valery Sizov ad5d2c3e78 fix of API 2015-09-14 11:15:54 +03:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-11 16:32:11 +02:00
Stan Hu e20529cec4 Bump rouge to 1.10.1 2015-09-10 13:38:43 -07:00
Valery Sizov 381180bc27 remove gitlab_ci config 2015-09-10 13:42:41 +03:00
Robert Speicher a81ce718c7 Merge branch 'rouge-patch' into 'master' 
Fix highlighting of deleted lines in diffs.

Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498

Only needed until https://github.com/jneen/rouge/pull/297 is merged into
Rouge and the gem is updated in GitLab.

Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an
option, since `gollum-lib` has `rouge` as a dependency, so it would get
included anyway, and which code we'd get would depend on the load order.

See merge request !1267
 2015-09-09 18:37:45 +00:00
Kamil Trzcinski 0d66d4d342 Fix reading session_expire_delay when application settings are not yet created and migrations are not yet done 2015-09-09 15:31:40 +01:00
Douwe Maan d3730b0713 Fix highlighting of deleted lines in diffs. 2015-09-09 14:54:34 +01:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Douwe Maan 0e9ba0a4fa Add attributes to LDAP::Config. 2015-09-08 17:34:18 +01:00
Valery Sizov 3700e5a960 Crowd integration 2015-09-02 12:42:01 +03:00
Valery Sizov 6f785d584b retrieving oauth token with LDAP credentials 2015-08-31 15:10:01 +03:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
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
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -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 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 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
Douwe Maan 5472ded240 Fix importing projects from GitHub Enterprise Edition. 2015-08-07 15:44:53 +02:00
Ben Bodenmiller 0f785bbc7e ink to configured gravatar host on profile page 2015-08-05 00:48:16 -07:00
Dmitriy Zaporozhets c1c89500f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-03 11:04:20 +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 0be6debb0b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-27 11:22:35 +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
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 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
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 ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Marin Jankovski c6c3577bc6 Use explicit if. 2015-06-16 13:44:52 +02:00
Marin Jankovski 4c317531b4 If kerberos is enabled require it. 2015-06-15 18:04:30 +02:00
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme 
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
 2015-06-13 17:58:16 -04:00
Robert Speicher 567a25b630 Ensure session_expire_delay field exists before accessing it 
Closes #1798
 2015-06-13 00:31:08 -04:00
Douwe Maan 9ea8dcb5e2 Merge branch 'feature-session-expire-seconds-ui' into 'master' 
Add session expiration delay configuration through UI application

Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting)

Answers the following suggestions:

  * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable
  * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle

See merge request !774
 2015-06-12 13:50:40 +00:00