Commit Graph
170 Commits
Author SHA1 Message Date
Robert Speicher 24bef5e67a Handle password reset for users with 2FA enabled 2015-05-11 14:31:31 -04:00
Robert Speicher 5cd526f77f Prevent "You are already signed in." error message upon 2FA login 2015-05-09 17:32:49 -04:00
Robert Speicher c845347b23 Generate 10 2FA backup codes instead of the default of 5 2015-05-09 17:32:48 -04:00
Robert Speicher 5f43cae6ca Add :two_factor trait to User factory 2015-05-09 17:32:48 -04:00
Robert Speicher b050bb5bad Fix 2FA backup code removal 2015-05-09 17:32:48 -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 5520397f04 Make two-factor login work and add a feature spec 2015-05-09 17:32:08 -04:00
Robert Speicher 70bbf093aa Remove class and id attributes from SanitizationFilter whitelist 2015-05-08 12:31:34 -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 cb079c8208 Fix Markdown feature spec 2015-05-06 20:43:12 -04:00
Robert Speicher 1108915f75 Change wording for task list summaries 2015-05-06 17:27:10 -04:00
Robert Speicher fdff815a4c Add Markdown feature specs for markup inside links
It was already working, just want to make sure we don't break it in the
future.
2015-05-06 17:21:19 -04:00
Robert Speicher 51c3393974 Task List feature and JS specs 2015-05-06 13:16:37 -04:00
Robert Speicher c915c7b001 Add TaskList to Markdown feature spec 2015-05-06 13:00:13 -04:00
Dmitriy Zaporozhets e097812f57 Merge pull request #9234 from dsander/group-milestones-by-title
Group milestones by title in the dashboard and all other issue views
2015-05-03 14:29:31 +03:00
Dominik Sander e6ee8d0ebe Group milestones by title in the dashboard and all other issue views
This groups milestones by title for issue views like it has been done for
the milestone dashboard/project overview. Before milestones with the
same title would show up multiple times in the filter dropdown and one could
only filter per project and milestone. Now the milestone filter is based
on the title of the milestone, i.e. all issues marked with the same
milestone title are shown.
2015-05-01 01:12:58 +02:00
Robert Speicher cd3c24a8f3 Autolink short URLs 2015-04-30 16:35:27 -04:00
Robert Speicher 286c9e6886 Add a feature spec for our entire Markdown parsing stack 2015-04-30 16:35:25 -04:00
Robert Speicher e3d2304d69 Specs don't need to set default_url_options anymore 2015-04-27 15:47:05 -04:00
Douwe Maan 6ae606d81f Merge branch 'commit-project' into 'master'
Link cross-project cross-reference notes to correct project.

- Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits.
- Include commit comments in MR from a forked project.

To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit.

See merge request !554
2015-04-24 12:46:39 +00:00
Douwe Maan 8ed7ac9d44 Use project.commit convenience method. 2015-04-24 12:29:36 +02:00
Stefan Tatschner 149d67f761 Try to fix tests for pull request #9065
This crappy test framework stuff fails randomly. So I can't reliably
run it on my local machine.
2015-04-24 09:36:52 +02:00
Robert Speicher 3052e89420 Re-fix image rendering for help pages 2015-04-15 12:45:31 -04:00
Robert Speicher ef47ea3d39 Revert "Fix and improve help rendering"
This reverts commit d365004e68.
2015-04-15 12:24:44 -04:00
Robert Speicher 57afaf9d92 Upon successful login, clear reset_password_token field
Closes #1942
2015-04-08 16:06:56 -04:00
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Dmitriy Zaporozhets c1c93f4f7a Fix tests and unassigned filter for issues. Updated CHANGELOG 2015-03-27 00:27:51 -07:00
Douwe Maan e4ac6bbf82 Merge branch 'atom-xhtml-squashed' into 'master'
Fix invalid Atom feeds when using emoji, horizontal rules, or images

This is a fix for issues #880, #723, #1113.

Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like *img* and *hr* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images.

To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML.

I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one.

Thorough review appreciated since this is the first time I have used Ruby.

See merge request !344
2015-03-17 08:38:38 +00:00
Christian Walther 90aa870c36 Fix invalid Atom feeds when using emoji, horizontal rules, or images.
Fixes issues #880, #723, #1113: Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like <img> and <hr>, generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images, are not terminated and make the Atom XML invalid.
2015-03-16 22:05:52 +01:00
Douwe Maan 224187ffb9 Move group members index from /members to /group_members. 2015-03-15 13:51:11 +01:00
Douwe Maan 75aff0f79c Move project members index from /team to /project_members 2015-03-15 13:51:11 +01:00
Dmitriy Zaporozhets 9839d106c4 Rename dashboard landing page to Your projects 2015-03-10 16:06:30 -07:00
Dmitriy Zaporozhets 7e4258777f Move Profile groups tests to Dashboard group tests 2015-03-08 20:52:22 -07:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Douwe Maan 080449f8af Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-17 17:58:08 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Jeroen van Baarsen 026e988544 Even more hound fixes
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 21:00:55 +01:00
Jeroen van Baarsen 0c4a70a306 Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 19:17:35 +01:00
Dmitriy Zaporozhets f9e6f66898 Fix tests 2015-02-05 22:40:35 -08:00
Dmitriy Zaporozhets 50e8e5943f Merge branch 'redirect-sign_up' into 'master'
Redirect signup page to signin page.

Resolves #1916.

See merge request !1468
2015-02-05 16:47:11 +00:00
Douwe Maan ab22caa97e Redirect signup page to signin page.
Resolves #1916.
2015-02-05 15:56:28 +01:00
Dmitriy Zaporozhets 61d07eabfc Fix tests 2015-02-04 13:54:19 -08:00
Jason Blanchard 97d4ac4047 Adds link to milestone and keeping resource context on smaller
viewports for issues and merge requests
2015-02-03 11:41:32 -05:00
Dmitriy Zaporozhets 8cc111bd03 Fix random failing test 2015-01-27 13:40:23 -08:00
Dmitriy Zaporozhets e3987bb6b1 Merge pull request #8585 from duduribeiro/fix_email_in_ssh_help_page
Fix the email variable substituation in ssh help page
2015-01-19 15:01:00 -08:00
Dmitriy Zaporozhets 31cddc152c Fix tests for edited_ago helpers 2015-01-18 19:47:58 -08:00
Carlos Ribeiro d76d897492 Change to single-quoted strings in help_pages_spec 2015-01-18 14:21:18 -02:00
Carlos Ribeiro 714ef62264 Fix the email variable substituation in ssh help page 2015-01-15 23:06:32 -02: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 b124d9e0bb Comment broken test because I dont have time to improve it 2015-01-15 01:17:07 -08:00