8955 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	0b7c4fe048	Don't include users without project access in participants.	2015-05-15 12:46:52 +02:00
Douwe Maan	fb86ec519c	Move stuff around a bit in NotifictionService.	2015-05-15 12:45:18 +02:00
Douwe Maan	ac3d472ff4	Fix push event.	2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets	07fd736d2e	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets	9c6f4a2351	Merge branch 'dashboard-references' into 'master' ... Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653	2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets	de1aca131e	Merge branch 'spinner-spin' into 'master' ... Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655	2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets	3b4c0ea06f	Merge branch 'use-count-badges' into 'master' ... Use count badges with number_with_delimiter helper for issue, commit count See merge request !658	2015-05-15 09:56:56 +00:00
Jeroen van Baarsen	735fbb43ed	Merge pull request #9296 from jorgevbo/master ... Fix bug with default timezone en RSS gitlab events	2015-05-15 11:36:40 +02:00
Dmitriy Zaporozhets	e54ff51aca	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-14 23:26:44 +03:00
Jorge Vasquez	dfb58234a1	Fix bug with default timezone en RSS gitlab events	2015-05-14 15:30:55 -04:00
Robert Speicher	c802d8eee1	Refactor SessionsController to use a controller concern	2015-05-14 14:24:05 -04:00
afc163	2738978111	Add style for <kbd> element in markdown ... Fixes #5825	2015-05-14 23:57:01 +08:00
Dmitriy Zaporozhets	ded82ed4c9	Small refactoring of state_filters_text_for helper	2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets	40f381e652	append empty space only if count exists	2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets	3d4d89f060	Use count badges with number_with_delimiter helper for issue, commit count	2015-05-14 18:30:23 +03:00
Douwe Maan	191bb46d74	Use slightly fewer icons in project sidebar.	2015-05-14 17:02:00 +02:00
Dmitriy Zaporozhets	19251a1fc7	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-14 17:22:55 +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	434180c7d2	Merge branch 'fix-group-mention' into 'master' ... Fix mentioning of private groups. `issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326. See merge request !654	2015-05-14 14:10:00 +00:00
Douwe Maan	0b098060cc	Spin icon next to "Checking for CI status..."	2015-05-14 13:27:22 +02:00
Douwe Maan	77dc71d550	Fix mentioning of private groups.	2015-05-14 13:15:13 +02:00
Douwe Maan	cd52cef1c0	Fix reference links in dashboard activity and ATOM feeds.	2015-05-14 13:05:33 +02:00
Douwe Maan	74770137f6	Always show note action icons.	2015-05-14 12:18:19 +02:00
Dmitriy Zaporozhets	091c906131	Fix text overflow in project sidebar	2015-05-13 15:14:02 +03:00
Dmitriy Zaporozhets	8ad91d5840	Merge branch 'text-batch-1' into 'master' ... Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642	2015-05-13 12:05:17 +00:00
Dmitriy Zaporozhets	63403019d2	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-05-13 14:26:39 +03:00
Dmitriy Zaporozhets	f32a045ef4	Merge branch 'version-check' into 'master' ... Version check See merge request !1509	2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets	740716afd1	Merge pull request #9276 from jirutka/relative_link_filter ... Extract handling of relative file links to its own HTML filter	2015-05-13 14:09:57 +03:00
Jeroen van Baarsen	892158f136	Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit ... Call merge request web hook for each commits	2015-05-13 11:57:33 +02:00
Douwe Maan	17a41547a0	Improve OAuth signup error message.	2015-05-13 09:41:56 +02:00
Arthur Gautier	a927bf56b1	Call merge request web hook for each commits ... Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>	2015-05-13 09:33:20 +02: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	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	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
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
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	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	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	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
Dmitriy Zaporozhets	0928c3ae04	Enable version check only for production environment ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-11 18:23:40 +03:00
Douwe Maan	783b286ac0	Don't symbolize params.	2015-05-11 11:55:02 +02:00
Robert Speicher	3e8efce360	Refactor SystemNoteService.cross_reference_disallowed?	2015-05-11 00:01:16 -04:00
Robert Speicher	b94c6d9f5b	Check if system is truthy in Note.cross_reference?	2015-05-11 00:01:16 -04:00
Robert Speicher	686f6855c2	Update SystemNoteService method naming conventions ... Now the verb comes first, and there is no restriction on singular/plural.	2015-05-11 00:01:15 -04:00