home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
130 Commits
Author SHA1 Message Date
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Daryl Chan e72a9685f3 Added tags to disable autocapitalize and autocorrect on login field 
- Updated CHANGELOG
 2015-07-29 15:42:52 +08:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02: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
Douwe Maan 44458f3ca2 Add "Remember me" checkbox to LDAP signin form. 2015-06-05 14:37:01 +02: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
Vinnie Okada af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06: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
Robert Speicher 76873ce4a4 Move "invalid 2FA code" error message to the flash 
This makes it consistent with the Invalid email/password error message
from the previous step.
 2015-05-09 17:32:49 -04:00
Robert Speicher a4267033f2 Add a hint on login form about using a recovery code 2015-05-09 17:32:09 -04:00
Robert Speicher 32971b0af4 Refactor SessionsController 
Also adds test case for providing an invalid 2FA code and then a valid
one without re-entering username and password.
 2015-05-09 17:32:09 -04:00
Robert Speicher 6fa2942920 Update login views for two-factor auth 2015-05-09 17:31:40 -04:00
Robert Speicher bd680999f9 Be consistent with what we call the 2FA feature 
"Two-factor" vs. "2-Factor"
 2015-05-09 17:31:39 -04:00
Dmitriy ZaporozhetsandRobert Speicher de9e1c3bad Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap users since it is not supported 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
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
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02: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
Dmitriy Zaporozhets ac4968b97e Merge pull request #9062 from fgimian/omniauth-disable-turbolink 
Disable turbolinks for omniauth link to avoid rendering problems
 2015-04-23 16:11:21 +03: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
Robert Speicher 8714038410 Improve wording below signup box 
[ci skip]
 2015-04-07 17:46:00 -04:00
Fotis Gimian cbe9654abe Disable turbolinks for omniauth link to avoid rendering problems 2015-03-31 21:04:47 +11:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
 2015-03-25 09:16:09 -07:00
Dmitriy Zaporozhets 9e554a5223 Update views to single form of address. Change "my" to "your" 2015-03-22 20:10:12 -07:00
Dmitriy Zaporozhets a05cc636d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb
 2015-03-21 20:41:10 -07:00
Dmitriy Zaporozhets 777c119fd2 Restyle oauth accounts at profile page and add ability to unlink account 2015-03-21 17:46:00 -07: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 09791774a5 Use custom LDAP label in LDAP signin form. 2015-03-13 15:42:31 +01:00
Dmitriy Zaporozhets eaf25df318 Fix duplicating OAuth providers on login page 2015-03-03 22:22:18 -08:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Dmitriy Zaporozhets 12581f15ee Merge pull request #7473 from sodabrew/patch-1 
Improve login screen when only OmniAuth providers are enabled
 2015-03-02 15:18:59 -08:00
Dmitriy Zaporozhets b2fb6e0e0c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/services/merge_requests/build_service.rb
	app/views/layouts/_head.html.haml
 2015-02-20 16:02:25 -08:00
Dmitriy Zaporozhets ee26dae63e Update bootstrap-sass gem 2015-02-19 15:02:49 -08:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08:00
Aaron Stone 252ee4e7e5 Improve login screen when only OmniAuth providers are enabled 
Avoids an empty Sign in box when signup_enabled? is false, and avoids
showing "No authentication methods configured" unless there really are none.

OmniAuth signin gets its own file for consistency with signin and signup and LDAP.
 2015-02-13 23:49:12 -08:00
Douwe Maan 7c39e728ef Move OAuth signin options just below signin box. 2015-02-13 15:16:17 +01:00
Douwe Maan da1608196b Add headings to signin/signup blocks on signin page. 2015-02-13 15:16:00 +01:00
Douwe Maan 485e55f88c Clean up devise views. 2015-02-05 19:12:47 +01: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
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01: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 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Nihad Abbasov c2331d87e5 chmod -x 2014-12-27 19:22:15 +04:00
Valery Sizov 8a7993194e Kerberos support 2014-12-15 18:06:17 +02:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00