home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,221 Commits 48 Branches 340 Tags
f189c36d8d352deccbd37b8ae92ca0c539e330c3
Commit Graph
195 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f189c36d8d Merge branch 'rs-dev-issue-2414' into 'master' 
Allow Admin to filter users by 2FA status

> ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png)

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414

See merge request !852
 2015-06-23 08:48:22 +00:00
Robert SpeicherandDmitriy Zaporozhets bf71d53f63 Change to_not calls to not_to 
Both work, but now we're consistent across the entire app.
 2015-06-22 12:13:49 +02:00
Robert SpeicherandDmitriy Zaporozhets 1f7490a23f Update spec/features/security specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets afec5efc7d Fix features syntax 2015-06-22 12:13:45 +02:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
swellard 98615ef536 Fix duplicate 'Email has already been taken' message when creating a user 2015-06-16 14:24:05 +01:00
Dmitriy Zaporozhets 7300729190 Merge branch 'rs-dev-issue-2228' into 'master' 
Allow user to customize default Dashboard page

Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:

> ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png)

See merge request !778
 2015-06-15 11:29:36 +00:00
Robert Speicher b00f447db4 Add allowing_for_delay helper method for feature specs 2015-06-14 20:33:29 -04:00
Robert Speicher 37066267e7 Use page.all and page.within in specs 2015-06-13 18:37:30 -04:00
Robert Speicher 422236c71e Change foo.should syntax to expect(foo).to in specs 2015-06-13 18:37:30 -04:00
Robert Speicher bf9dd4327e Add feature specs for default dashboard preference 2015-06-13 17:59:12 -04:00
Robert Speicher 0e21436aaf Simplify the javascript behavior for Preference updating 2015-06-13 17:58:17 -04:00
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme 
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
 2015-06-13 17:58:16 -04:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Dmitriy Zaporozhets e414463d9e Merge branch 'repo-remove' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 16:17:36 +02:00
Dmitriy Zaporozhets 58ab8a4a9d Fix tests and increase delay time before remove repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 15:09:12 +02:00
Robert Speicher 442a0663da Add feature specs for Project and Group description rendering 2015-06-02 13:04:10 -04:00
Robert Speicher 7424d2fa5b Add ExternalLinkFilter to Markdown pipeline 
Forces a `rel="nofollow"` attribute on all external links.
 2015-05-27 15:39:08 -04:00
Robert Speicher 5a9c5520d9 Make use of to_reference in more specs 2015-05-26 15:49:22 -04:00
Robert Speicher 68f74aa826 Add a note about the commented-out test in Markdown Feature 2015-05-26 15:49:22 -04:00
Robert Speicher ca268b85f6 Use to_reference in Markdown feature spec 2015-05-26 15:48:30 -04:00
Robert Speicher 9789b56a31 Update ffaker gem 
Adds a version requirement which it didn't have before, at 2.0.0. This
version has breaking API changes in that the namespace is now `FFaker`
instead of `Faker`.
 2015-05-20 19:22:00 -04:00
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