17825 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Douwe Maan	2ff2f5bf6e	Update installation/update guides for 7.11.	2015-05-15 13:13:09 +02:00
Dmitriy Zaporozhets	21b10d61a1	Merge branch 'rs-ldap-2fa' into 'master' ... Enable 2FA for LDAP logins See merge request !395	2015-05-14 20:22:20 +00:00
Robert Speicher	0ad9fc60ec	Enable 2FA for LDAP logins	2015-05-14 14:45:31 -04:00
Dmitriy Zaporozhets	c342774597	Merge branch 'ce-to-ee' into 'master' ... CE to EE cc @rspeicher See merge request !394	2015-05-13 15:23:42 +00:00
Dmitriy Zaporozhets	3962d33f98	Merge cross-reference refactoring with EE code	2015-05-13 14:39:57 +03: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 Zaporozhets	cb8f974b21	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2015-05-13 12:40:09 +03:00
Marin Jankovski	700e5117cd	Merge branch 'code-defreeze' into 'master' ... defreeze code Fixes #2166. See merge request !1820	2015-05-13 09:10:47 +00:00
Marin Jankovski	3883cca93f	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-13 11:10:18 +02:00
Dmitriy Zaporozhets	b92d608350	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-12 19:06:25 +03:00
Sytse Sijbrandij	21d65470b4	Merge branch 'remove-outdated-gif' into 'master' ... Replace outdated gif in README with link to website Fixes #2298 See merge request !1806	2015-05-12 14:58:31 +00:00
Hannes Rosenögger	1dd0caf4d9	Merge branch 'fix-avatar-removal' into 'master' ... Fix bug where avatar filenames were not actually deleted from the database during removal This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 See merge request !620	2015-05-12 14:46:58 +00:00
Dmitriy Zaporozhets	8b9e3af8bf	Merge branch 'ad-block_auto_created_users' into 'master' ... Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638	2015-05-12 13:28:33 +00:00
Dmitriy Zaporozhets	0bac9d0135	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-12 16:26:21 +03:00
Douwe Maan	1f080825ef	Merge branch 'remove-mysql-index-conversion-from-docs' into 'master' ... Update docs in line with mysql-postgresql-converter changes. See merge request !640	2015-05-12 13:14:06 +00:00
Sytse Sijbrandij	bebeed5b77	Merge branch 'migration_style_guide' into 'master' ... Update migration style guide See merge request !1823	2015-05-12 12:42:26 +00:00
Douwe Maan	8acd705c8a	Update docs in line with mysql-postgresql-converter changes.	2015-05-12 13:36:20 +02:00
Valery Sizov	34a9aa2e8a	update migration style guide	2015-05-12 14:34:43 +03:00
Dmitriy Zaporozhets	b0b25e37c9	Merge branch 'note-role' into 'master' ... Show user roles by comments. I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.  On hover, the note actions replace the role:  --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639	2015-05-12 11:28:39 +00:00
Dmitriy Zaporozhets	474023b71a	Fix Gemfile.lock	2015-05-12 14:26:46 +03:00
Dmitriy Zaporozhets	1a1e42ad31	Merge branch 'rs-system-note' into 'master' ... Add SystemNoteService class The Note model was basically two models crammed together - one handling user-created notes (i.e., comments on things) and one handling system-created notes (i.e., references). This splits out the system-specific stuff to a new SystemNoteService class. See merge request !595	2015-05-12 10:45:42 +00:00
Douwe Maan	e9af4c71e9	Merge branch 'historical-data' into 'master' ... Validate historical active user count when uploading license. Addresses #274.    See merge request !390	2015-05-12 10:23:21 +00:00
Dmitriy Zaporozhets	ff13fb0ab5	Merge branch 'brakeman-level' ... Conflicts: lib/tasks/brakeman.rake	2015-05-12 13:21:11 +03:00
Dmitriy Zaporozhets	3b88a6e09e	Merge branch 'project-page' into 'master' ... Restructure project sidebar and add more icons. I moved the repository stuff down (including the clone bar), and the project/contribution stuff up. I also added more icons, to the sidebar and tabs on other pages. ---  See merge request !633	2015-05-12 10:19:49 +00:00
Douwe Maan	b0af379a22	Show user roles by comments.	2015-05-12 12:16:34 +02:00
Valery Sizov	071f07b673	Merge branch 'fix_migration' into 'master' ... Make migrations reversible /cc @jacobvosmaer @marin See merge request !622	2015-05-12 09:51:14 +00:00
Dmitriy Zaporozhets	4a373be861	Merge branch '2fa' into 'master' ... Two-factor authentication Implement's Two-factor authentication using tokens. - [X] Authentication logic - [X] Enable/disable 2FA feature - [x] Make 2-step login process if 2FA enabled - [x] Backup codes - [x] Backup code removed after being used - [x] Check backup codes for mysql db (mention mysql limitation if applied) - [x] Add tests - [x] Test if https://github.com/tinfoil/devise-two-factor#disabling-automatic-login-after-password-resets applies, and address if so - [x] Wait for fixed version of `attr_encrypted` or fork and use forked version - https://github.com/attr-encrypted/attr_encrypted/issues/155 Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa See merge request !474	2015-05-12 09:41:27 +00:00
Douwe Maan	87996ece06	Whoops.	2015-05-12 11:28:35 +02:00
Douwe Maan	125cb9b866	Don't accidentally unblock auto created users from Active Directory.	2015-05-12 11:26:43 +02:00
Douwe Maan	8e4dcbb8fb	Merge branch 'fix-tags-view-with-submodules' into 'master' ... Bump gitlab_git to 7.1.11 to fix bug with viewing a tag on a project with submodules This is a reminder MR to bump gitlab_git before the release. Tests will fail until this happens. Closes https://github.com/gitlabhq/gitlabhq/issues/8411 See merge request !607	2015-05-12 09:11:45 +00:00
Douwe Maan	4346c39ba9	Move "Forked from" above "Version".	2015-05-12 10:29:59 +02:00
Douwe Maan	a5ce66d836	Move clone panel to bottom of project sidebar.	2015-05-12 10:28:56 +02:00
Douwe Maan	bfe2384797	Restructure project sidebar.	2015-05-12 10:27:17 +02:00
Douwe Maan	e9dff9f410	Fix alignment of ref picker, breadcrumb and buttons.	2015-05-12 10:27:17 +02:00
Douwe Maan	71a1689fec	Add icons to more tabs.	2015-05-12 10:27:17 +02:00
Douwe Maan	5615f0397a	Tweak text.	2015-05-12 10:24:51 +02:00
Douwe Maan	f84e78f3d7	Merge branch 'commit_time_timezone' into 'master' ... Fix commit time being displayed in the wrong timezone in some cases This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml. Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page. fixes gitlab-org/gitlab-ce#1278 /cc @DouweM See merge request !624	2015-05-12 07:49:10 +00:00
Dmitriy Zaporozhets	22badc1313	Bump attr_encrypted ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-12 10:41:24 +03:00
Dmitriy Zaporozhets	9694c8164d	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-11 22:45:13 +03:00
Dmitriy Zaporozhets	f1ba3769bd	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-11 22:44:21 +03:00
Dmitriy Zaporozhets	e1a8089cc2	Merge branch 'create-merge-request' into 'master' ... Add Create Merge Request buttons to commits page and push event. Commits page:  Branches page:  Push event: (Only for new branches, and only shown to the pushing user)  Push event with multiple commits and a Compare link:  See merge request !632	2015-05-11 19:43:56 +00:00
Robert Speicher	24bef5e67a	Handle password reset for users with 2FA enabled	2015-05-11 14:31:31 -04:00
Jacob Vosmaer	cae978a9e8	We would like to pass 'brakeman -w2'	2015-05-11 18:11:09 +02:00
Dmitriy Zaporozhets	95a470cf50	Merge branch 'params-to-sym' into 'master' ... Don't symbolize params. See merge request !636	2015-05-11 15:49:08 +00:00
Sytse Sijbrandij	881e11df1b	Small improvements to style guide.	2015-05-11 14:48:39 +00:00
Sytse Sijbrandij	426fa2af91	Merge branch 'migration-style-guide' into 'master' ... Migration Style Guide Fixes #2305 See merge request !1821	2015-05-11 14:43:26 +00:00
Jeroen van Baarsen	3a1eba6f14	Merge pull request #8799 from jirutka/group-kerberos ... Make omniauth-kerberos dependency optional (add group 'kerberos')	2015-05-11 15:11:40 +02:00
Job van der Voort	6a6047f80c	create migration style guide. Fixes #2305	2015-05-11 15:09:36 +02:00
Job van der Voort	65b9ca9c08	defreeze code	2015-05-11 14:34:54 +02:00
Jakub Jirutka	f676bbf918	Update installation instructions, make kerberos optional	2015-05-11 13:37:56 +02:00