home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,221 Commits 48 Branches 340 Tags
f189c36d8d352deccbd37b8ae92ca0c539e330c3
Commit Graph
2521 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
Dmitriy Zaporozhets 4aa1fdd347 Merge branch 'fix-project-icon-links' into 'master' 
Fix avatar tests to use banana_sample.gif

Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`.

See merge request !866
 2015-06-23 08:32:21 +00:00
Robert Speicher dcfce8b198 Use alias_attribute to define User#two_factor_enabled 2015-06-22 21:14:07 -04:00
Stan Hu fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets 595b3323a8 Merge branch 'rs-rspec3' into 'master' 
RSpec3

Upgrades rspec to 3.3.0, we're now up-to-date! 🎉

See merge request !831
 2015-06-22 13:15:27 +00:00
Dmitriy Zaporozhets 967214b2ec Merge requests API returns closed for closed and merged for merged. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 15:11:53 +02:00
Dmitriy Zaporozhets 6c4d48b8b9 Merge branch 'rs-remove-link-to-override' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/helpers/application_helper_spec.rb
 2015-06-22 12:26:41 +02:00
Robert SpeicherandDmitriy Zaporozhets e4e01dbf41 Fix Gitlab::OAuth::User spec 2015-06-22 12:13:49 +02:00
Robert SpeicherandDmitriy Zaporozhets 1dd42da802 Add sleep call before yield in allowing_for_delay 
This is to give pending AJAX requests time to complete before we
navigate away, for example.
 2015-06-22 12:13:49 +02: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 0f627f1c60 Fix raise_error without an argument deprecation warnings 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets 8b1f1ab32e Remove junk from db_cleaner spec support file 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets da135119aa Move CapybaraHelpers to its own support file 
In case we end up wanting to use it in Spinach as well.
 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets 7460c39f60 Fix GitPushService spec 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets 2120e2dd95 Replace remaining references to Note.create_cross_reference_note 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 213d1a4768 Use to_reference for issue and merge request mentionable specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 1f7490a23f Update spec/features/security specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 20a871cc21 Update email_spec gem 
This fixes spec/mailers/notify_spec

Also only require email_spec in the one place it's used
 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 dad88568f3 Update and simplify Import controller specs 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 9874cf5953 Fix include_module matcher 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets afec5efc7d Fix features syntax 2015-06-22 12:13:45 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets f3d99a1e9c Started on the actual rspec 3 upgrade 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-06-22 12:12:49 +02:00
Dmitriy Zaporozhets 29b6d465a7 Merge branch 'rs-dev-issue-2355' into 'master' 
MergeRequest#show performance improvements

This is a first pass on improving the performance of the `MergeRequests#show` page. Notable changes:

- The "Commits" tab is loaded lazily, so the initial page load should be much faster for MRs with many commits.
- Relative timestamps via `timeago` are only initialized once per load instead of `O(n^2)`. This greatly improves frontend rendering times for a large number of commits.
- Refactored `User.find_for_commit` to use a single ARel-generated SQL query instead of the old method which resulted in one query, and could result in up to three.

See merge request !838
 2015-06-22 09:48:49 +00:00
Dmitriy Zaporozhets ea9dda9541 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-22 11:26:33 +02:00
Robert Speicher e17020b907 Add MergeRequestTabs specs 2015-06-21 22:57:32 -04:00
Robert Speicher d3ff8c1a95 Make default value for otp_required_for_login false instead of null 2015-06-20 19:40:48 -04:00
Douwe Maan c0df5ff126 Merge branch 'snippet_optional_filename' into 'master' 
Make snippet filename optional.

Fixes #2384.

See merge request !1866
 2015-06-20 10:47:06 +00:00
Douwe Maan b2eef41d41 Merge branch 'fix-error-500-internal-snippet' into 'master' 
Fix Error 500 when one user attempts to access another's personal, internal snippet

### What does this MR do?

This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce:

### Why was this MR needed?

1. Go to `<hostname>/snippets/new`.
2. Select "Internal".
3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`)
4. Logout and sign in as another user.
5. Go to the URL in step 3.

### What are the relevant issue numbers?

Closes #1815

See merge request !854
 2015-06-20 10:38:33 +00:00
Stan Hu e785b9d2e2 Fix Error 500 when one user attempts to access a personal, internal snippet 
Closes #1815
 2015-06-19 21:23:46 -07:00
Nicolas aecc989154 Make snippet filename optional. 
Fixes #2384.
 2015-06-20 01:06:57 +02:00
Robert Speicher efa0146c7f Merge branch 'rs-blobview-js-refactor' into 'master' 
Refactor and spec line highlighting Javascript

- Replaces the fragile Spinach tests for this feature with Jasmine tests
- The "Don't scroll the page when we click a line number" behavior now works as expected

See merge request !820
 2015-06-19 21:27:25 +00:00
Robert Speicher ff27747ec7 Fix timezone-based time_ago_with_tooltip spec failures 2015-06-19 16:49:52 -04:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Robert Speicher b6318297fc Use User#two_factor_enabled instead of otp_required_for_login 2015-06-19 15:14:37 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
Robert Speicher 6c8f0fe906 Add convenience methods to User for getting and setting 2FA status 2015-06-19 14:59:42 -04:00
Robert Speicher e59aad6e83 Refactor LineHighlighter 2015-06-19 04:31:24 -04:00
Robert Speicher 32366d1811 Rename BlobView to LineHighlighter 2015-06-19 04:31:24 -04:00
Robert Speicher b3f9be0639 Refactor and spec BlobView JS 2015-06-19 04:31:23 -04:00
Stan Hu 62079d7654 Add init test for ProjectSearchResults 
See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
 2015-06-18 10:35:48 -07:00
Douwe Maan 0e615a4863 Merge branch 'fix-labels-permisssion-check' into 'master' 
Fix 403 Access Denied error messages when accessing Labels section in a project

This would occur if the project's issues or merge requests features were disabled. The change in 9bcd36396b caused `can?(current_user, :read_merge_request, project)` to be false if the merge request feature were disabled, so `authorize_labels!` needs to be changed accordingly.

Closes #1813

See merge request !836
 2015-06-18 11:43:32 +00:00
Stan Hu 07efb17e10 Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled 
Closes #1813
 2015-06-18 03:15:05 -07:00
Robert Speicher 54365ecc7a Remove overridden link_to helper 
The purpose for this override is now handled by `ExternalLinkFilter`.
 2015-06-17 17:23:16 -04:00
Robert Speicher bc027c5183 Load the Merge Request > Commits tab lazily 2015-06-17 16:59:51 -04:00
Robert Speicher 5c78d7fce8 Move Projects::MergeRequestsController spec to its correct location 2015-06-17 16:37:11 -04:00
Robert Speicher 7e31a369f5 Spec and refactor User.find_for_commit 
Now it executes a single query instead of a possible three at the cost
of some scary-looking ARel calls.
 2015-06-17 16:37:11 -04:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
Alex Lossent d96d9aae42 Fix behavior of ldap_person method in Gitlab::OAuth::User 
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
 2015-06-17 18:06:27 +02:00