home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,647 Commits 48 Branches 340 Tags
758ea7520e69feeac4ffdf2a9e4e2752e5ff91fb
Commit Graph
434 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02:00
Marin Jankovski df346e9507 Add a note that changing example configuration files requires changing omnibus-gitlab. 2015-06-11 15:11:37 +02:00
themaze75andEric Maziade 1d080f5745 session_expire_seconds => session_expire_delay 
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
 2015-06-10 22:10:00 -04:00
Jeroen Nijhof bf7315cb13 update fog to 1.25.0 and add multipart upload support 2015-06-09 17:56:37 +02:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Eric Maziade 84a414fe53 Add session expiration delay configuration through UI application 
settings
 2015-06-05 11:50:37 -04:00
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
Alex Lossent dfcea8ed51 Add option to automatically link omniauth and LDAP identities 
Until now, a user needed to first sign in with his LDAP identity and then manually
link his/her account with an omniauth identity from their profile.
Only when this is done can the user authenticate with the omniauth provider and at
the same time benefit from the LDAP integration (HTTPS authentication with LDAP
username/password and in EE: LDAP groups, SSH keys etc.).
This feature automates the process by looking up a corresponding LDAP person when a
user connects with omniauth for the first time and then automatically linking the LDAP
and omniauth identities (of course, like the existing allow_single_sign_on setting,
this is meant to be used with trusted omniauth providers).
The result is identical to a manual account link.

Add config initializers for other omniauth settings.
 2015-06-03 11:46:20 +02:00
Alex Lossent 5491f6fbde Add an option to automatically sign-in with an Omniauth provider without showing the GitLab sign-in page 
This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for
all user authentication.
 2015-05-29 18:15:03 +02:00
Robert Speicher bd12ca5eb3 Disable Rack::MiniProfiler for /teaspoon path 2015-05-28 18:22:33 -04:00
Robert Speicher 05aa71ccd9 Remove jasmine-rails; add teaspoon 2015-05-28 18:22:32 -04:00
Jakub Jirutka ed3298fc01 Allow to configure gitlab_shell_secret location 2015-05-16 21:46:06 +02:00
Douwe Maan 61ceb45088 Fix. 2015-05-15 15:32:49 +02:00
Douwe Maan ba07c9f7f5 Improve fix. 2015-05-15 14:56:04 +02:00
Douwe Maan b77e1ae6f7 Don't require DB conncetion in AttrEncrypted. 2015-05-15 14:34:22 +02:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Dmitriy Zaporozhets c2ee828c19 Merge branch 'omniauth-csrf' into 'master' 
Protect OmniAuth request phase against CSRF.

Addresses #2268.

See merge request !1793
 2015-05-14 14:22:26 +00: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
Dmitriy ZaporozhetsandRobert Speicher 802fcd051f Add support for backup codes 2015-05-09 17:31:37 -04:00
Dmitriy ZaporozhetsandRobert Speicher 50a2a229e7 Fix rubocop complain 2015-05-09 17:31:10 -04:00
Dmitriy ZaporozhetsandRobert Speicher 7302395142 Init 2 factor authentication for user model 2015-05-09 17:31:07 -04:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master' 
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
 2015-05-08 09:39:48 +00:00
Robert Speicher b519e2312f Disable Rack::MiniProfiler for Jasmine's specs route 2015-05-06 15:13:17 -04:00
Dmitriy Zaporozhets 317ed1fa90 Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00
Jakub Jirutka b4be7aed77 Allow to configure smtp and sendmail in gitlab.yml 2015-05-06 13:15:33 +02:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Douwe Maan 6d093d84b1 Show prettier error message when license file is invalid. 2015-05-05 11:49:28 +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
Dmitriy Zaporozhets 0df317f729 Merge branch 'restrict-signups-to-domains' into 'master' 
Add application setting to restrict user signups to e-mail domains

This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and prone to mistakes.

Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain.

Screenshots:

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

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

See merge request !598
 2015-05-03 10:02:45 +00:00
Stan Hu eb4f1eb5f5 Add application setting to restrict user signups to e-mail domains 
This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.

Only restrict e-mail addresses upon creation
 2015-05-02 09:36:52 -07:00
Stan Hu 4dda17a5bf Make Reply-To config apply to change e-mail confirmation and other notifications 
sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556
 2015-05-01 22:57:10 -07:00
Douwe Maan d1f2b09fad Allow license to be uploaded and enforce its validity. 2015-05-01 14:52:30 +02:00
Robert Speicher 2c90579749 Set default_url_options in test environments too 2015-04-25 19:46:05 -04:00
Douwe Maan 571ba5a7fe Protect OmniAuth request phase against CSRF. 2015-04-24 17:03:18 +02:00
Dmitriy Zaporozhets f502b293e5 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
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Robert Speicher b71e5a17e9 Add default_url_options initializer 
Fixes #2266
 2015-04-23 12:58:11 -04:00
Robert Speicher 6c3591279f Fix two places where we should be using Rails.env.development? 2015-04-20 18:28:19 -04:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
Marin Jankovski 225b43de22 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-20 09:43:28 +02:00
Roshan Gautam 984f8077b3 Fix Resource Owner Password Authentication Flow 2015-04-17 11:47:02 -05:00
Robert Speicher 1e27b68b36 Add Markdown to Mime types 2015-04-15 12:25:24 -04:00
Robert Speicher ef47ea3d39 Revert "Fix and improve help rendering" 
This reverts commit d365004e68.
 2015-04-15 12:24:44 -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
Douwe Maan 238e4f0295 Add config var to block auto-created LDAP users. 2015-04-14 17:09:05 +02:00