home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,019 Commits 48 Branches 340 Tags
f22d80ad7587ee55cb2d07320ea46dbe7d6156a8
Commit Graph
1102 Commits
Author SHA1 Message Date
Robert Speicher bf44988a30 Add RootController 
This controller is now the target for `root_url`. It sub-classes
DashboardController so we can render the old default without a redirect
if the user hasn't customized their dashboard location.

cherry-picked
 2015-06-16 12:51:51 -04:00
Robert Speicher 3cae81a597 Move the "Design" templates and logic to Preferences 
cherry-picked
 2015-06-16 12:51:23 -04:00
Robert Speicher 471ea73a56 Add Profiles::PreferencesController 
cherry-picked
 2015-06-16 12:51:02 -04:00
Dmitriy ZaporozhetsandMarin Jankovski 940d38b065 Merge branch 'require_kerberos_when_enabled' into 'master' 
If kerberos is enabled require it

Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)

This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .

With this we hopefully do not need to remove group from the Gemfile.

See merge request !819
 2015-06-16 15:14:54 +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
Jeroen Nijhof cd522f3309 remove extra space 2015-06-09 17:59:08 +02:00
Jeroen Nijhof bf7315cb13 update fog to 1.25.0 and add multipart upload support 2015-06-09 17:56:37 +02:00
Douwe Maan 3f59a8f0be Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' 2015-06-05 13:34:25 +02:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04: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
Douwe Maan 70b29c3576 Merge branch 'feature/saml_support' into 'master' 
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
 2015-05-29 10:37:27 +00:00
Dmitriy Zaporozhets acb7721fe8 Merge branch 'rs-teaspoon' into 'master' 
Add Teaspoon for Javascript testing

Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.

See https://github.com/modeset/teaspoon

See merge request !715
 2015-05-29 09:10:46 +00:00
Robert Speicher f46b367068 Add MergeRequests#commits action and route 
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
 2015-05-29 00:09:28 -04: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
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +02: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 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
Douwe Maan 0c4653e101 Improve OAuth application flash messages. 2015-05-13 09:41:56 +02:00
Robert Speicher c40f59d04f Add otp_attempt to filtered parameters 2015-05-09 17:32:49 -04:00
Dmitriy ZaporozhetsandRobert Speicher 8ae712ae28 Render 2fa recovery codes instead of downloading it 2015-05-09 17:31:39 -04: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 ba7e2fd946 Create Two-factor authentication resource for user 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
Stan Hu dc2b380da6 Fix config template from parse errors 2015-05-03 08:58:52 -07:00
Achilleas Pipinellis 62aa05dd0c Merge branch 'master' into 'master' 
Update config.yml.example

See merge request !597
 2015-05-03 12:05:19 +00: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
win32 fc79f7382c Update config.yml.example 2015-05-02 11:04:07 +00: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 822ba95f75 Merge branch 'fix-commit-data-url-generation' into 'master' 
Fix bug where commit data would not appear in some subdirectories

Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example:

https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix)

The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior.

* Closes #1478, #1459
* Closes https://github.com/gitlabhq/gitlabhq/issues/9037

See merge request !581
 2015-04-28 15:46:36 +00:00
Dmitriy Zaporozhets 8140c68289 Merge branch 'rs-issue-2269' into 'master' 
Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797
 2015-04-28 08:34:34 +00:00
Stan Hu ef0055b52d Fix bug where commit data would not appear in some subdirectories 
The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically.
Using wildcard globs prevents this behavior.

Closes #1478, #1459
 2015-04-26 23:52:40 -07:00
Vinnie Okada bd557e4b64 Add new admin settings 
Add new global application settings for default project and snippet
visibility levels.
 2015-04-26 07:48:19 -06: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 b0ed2ff1a6 Merge branch 'atom-feeds-everywhere' into 'master' 
Add project activity atom feed and show atom feed buttons everywhere where applicable.

See merge request !555
 2015-04-24 10:15:13 +00:00
Robert Speicher b71e5a17e9 Add default_url_options initializer 
Fixes #2266
 2015-04-23 12:58:11 -04:00
Douwe Maan a6dfd065ca Add atom feed for project activity. 2015-04-23 17:11:39 +02:00
Dmitriy Zaporozhets f9119150ec Merge branch 'rs-rails-env-predicates' into 'master' 
Fix two places where we should be using `Rails.env.development?`

See merge request !550
 2015-04-23 12:37:46 +00:00
Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
 2015-04-23 12:08:03 +03:00