delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	Fill in email on the new password form	Vinnie Okada	2015-05-16	4	-4/+4
\| \| \|
* \| \|	Redirect if password reset token is expired	Vinnie Okada	2015-05-16	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't display the password editing form if the user's token is expired; redirect to the form that allows users to request a new password reset token.
* \| \|	Explain reset token expiration in emails	Vinnie Okada	2015-05-16	3	-0/+23
\|/ / \| \| \| \| \| \| \| \|	Tell new users when their password reset token expires and provide a link to get a new one.
* \|	Fix push event.	Douwe Maan	2015-05-15	1	-1/+1
\|/
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-15	10	-24/+34
\|\
\| *	Merge branch 'dashboard-references' into 'master'	Dmitriy Zaporozhets	2015-05-15	7	-13/+15
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	Fix reference links in dashboard activity and ATOM feeds.dashboard-references	Douwe Maan	2015-05-14	7	-13/+15
\| \| \|
\| * \|	Merge branch 'spinner-spin' into 'master'	Dmitriy Zaporozhets	2015-05-15	1	-6/+6
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655
\| \| * \|	Spin icon next to "Checking for CI status..."spinner-spin	Douwe Maan	2015-05-14	1	-6/+6
\| \| \|/
\| * \|	Merge branch 'use-count-badges' into 'master'	Dmitriy Zaporozhets	2015-05-15	2	-5/+13
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use count badges with number_with_delimiter helper for issue, commit count See merge request !658
\| \| * \|	Small refactoring of state_filters_text_for helperuse-count-badges	Dmitriy Zaporozhets	2015-05-14	1	-3/+2
\| \| \| \|
\| \| * \|	append empty space only if count exists	Dmitriy Zaporozhets	2015-05-14	1	-1/+1
\| \| \| \|
\| \| * \|	Use count badges with number_with_delimiter helper for issue, commit count	Dmitriy Zaporozhets	2015-05-14	2	-5/+14
\| \| \| \|
* \| \| \|	Merge pull request #9296 from jorgevbo/master	Jeroen van Baarsen	2015-05-15	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix bug with default timezone en RSS gitlab events
\| * \| \|	Fix bug with default timezone en RSS gitlab events	Jorge Vasquez	2015-05-14	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-14	2	-9/+33
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Refactor SessionsController to use a controller concernrs-refactor-2fa	Robert Speicher	2015-05-14	2	-9/+33
\| \|/ /
* \| \|	Add style for <kbd> element in markdown	afc163	2015-05-14	1	-0/+16
\|/ / \| \| \| \| \| \|	Fixes #5825
* \|	Use slightly fewer icons in project sidebar.	Douwe Maan	2015-05-14	1	-6/+0
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-14	5	-32/+32
\|\ \
\| * \	Merge branch 'fix-group-mention' into 'master'	Dmitriy Zaporozhets	2015-05-14	2	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \|	Fix mentioning of private groups.	Douwe Maan	2015-05-14	2	-3/+3
\| \| \|/
\| * \|	Always show note action icons.	Douwe Maan	2015-05-14	3	-29/+29
\| \|/
* \|	Merge branch 'omniauth-csrf' into 'master'	Dmitriy Zaporozhets	2015-05-14	2	-3/+3
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
\| *	Protect OmniAuth request phase against CSRF.	Douwe Maan	2015-04-24	2	-3/+3
\| \|
* \|	Fix text overflow in project sidebar	Dmitriy Zaporozhets	2015-05-13	1	-0/+4
\| \|
* \|	Merge branch 'text-batch-1' into 'master'	Dmitriy Zaporozhets	2015-05-13	1	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Improve OAuth signup error message.	Douwe Maan	2015-05-13	1	-2/+9
\| \| \|
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-05-13	2	-140/+15
\|\ \ \
\| * \ \	Merge pull request #9276 from jirutka/relative_link_filter	Dmitriy Zaporozhets	2015-05-13	1	-140/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Extract handling of relative file links to its own HTML filter
\| \| * \| \|	Extract handling of relative file links to RelativeLinkFilter	Jakub Jirutka	2015-05-11	1	-140/+0
\| \| \| \| \|
\| * \| \| \|	Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit	Jeroen van Baarsen	2015-05-13	1	-0/+15
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Call merge request web hook for each commits
\| \| * \| \|	Call merge request web hook for each commits	Arthur Gautier	2015-05-13	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>
* \| \| \| \|	Merge branch 'version-check' into 'master'	Dmitriy Zaporozhets	2015-05-13	5	-1/+22
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version check See merge request !1509
\| * \| \| \|	Enable version check only for production environment	Dmitriy Zaporozhets	2015-05-11	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix syntax error	Dmitriy Zaporozhets	2015-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'version-check' into gl-version-check	Dmitriy Zaporozhets	2015-05-08	5	-1/+20
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
\| \| * \| \| \|	Remove encryption	Dmitriy Zaporozhets	2015-05-08	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Add feature to disable version check	Dmitriy Zaporozhets	2015-03-10	4	-4/+13
\| \| \| \| \| \|
\| \| * \| \| \|	Add version check to help page too	Dmitriy Zaporozhets	2015-03-09	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Prevent crash if file does not exists	Dmitriy Zaporozhets	2015-03-09	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Add version check badge to admin area	Dmitriy Zaporozhets	2015-03-09	2	-1/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-avatar-removal' into 'master'	Hannes Rosenögger	2015-05-12	3	-4/+4
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Fix bug where avatar filenames were not actually deleted from the database ↵	Stan Hu	2015-05-07	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \|	Merge branch 'note-role' into 'master'	Dmitriy Zaporozhets	2015-05-12	2	-9/+28
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. ![Screen_Shot_2015-05-12_at_12.15.45](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0da0eea2087d6d3b14a2c0c594575c8a/Screen_Shot_2015-05-12_at_12.15.45.png) On hover, the note actions replace the role: ![Screen_Shot_2015-05-12_at_12.17.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/54a83c2f5047ea3ce0387f6692b14fe5/Screen_Shot_2015-05-12_at_12.17.32.png) --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639
\| * \| \| \| \| \|	Show user roles by comments.	Douwe Maan	2015-05-12	2	-9/+28
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-system-note' into 'master'	Dmitriy Zaporozhets	2015-05-12	8	-235/+330
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Refactor SystemNoteService.cross_reference_disallowed?	Robert Speicher	2015-05-11	1	-6/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Check if `system` is truthy in `Note.cross_reference?`	Robert Speicher	2015-05-11	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update SystemNoteService method naming conventions	Robert Speicher	2015-05-11	6	-77/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the verb comes first, and there is no restriction on singular/plural.