Commit Graph
28023 Commits
Author SHA1 Message Date
Andrei Gliga 3a91f5081e documentation for enabling or disabling OAuth sign in 2016-05-12 13:44:46 +03:00
Andrei Gliga bc099d799e Allow Admins to remove the Login with buttons for OAuth services and still be able to import on the changelog 2016-05-12 13:44:46 +03:00
Andrei Gliga 7818f7329a On Application Settings Page let the user select the enabled OAuth Sign in sources instead of the disabled ones 2016-05-12 13:44:46 +03:00
Andrei Gliga 96122034cf more readable specs for enabled_button_based_providers and button_based_providers_enabled? 2016-05-12 13:44:46 +03:00
Andrei Gliga 81d0a4a473 typo 2016-05-12 13:44:46 +03:00
Andrei Gliga a2d4c349b5 unindent 1 level the Disable OAuth form 2016-05-12 13:44:46 +03:00
Andrei Gliga dad501a236 no need to show the help about Github or the other authentication sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 3c3bc93747 if omniauth is enabled and if there are button_based_providers available show the disable OAuth sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 038dbb6803 DRYing enabled_button_based_providers tests 2016-05-12 13:44:46 +03:00
Andrei Gliga 3922e7ee22 enabled_button_based_providers into their own describe section 2016-05-12 13:44:46 +03:00
Andrei Gliga fc88527c9e use stub_application_setting instead 2016-05-12 13:44:46 +03:00
Andrei Gliga 2e4c914ae8 between "" 2016-05-12 13:44:46 +03:00
Andrei Gliga deca3da1a7 stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has no omniauth provider enabled
This will fix failing tests in case gitlab.yml file has no omniauth providers enabled
2016-05-12 13:44:46 +03:00
Andrei Gliga 6f69f6a1ab tests for button_based_providers_enabled? helper method of AuthHelper 2016-05-12 13:44:46 +03:00
Andrei Gliga 8c2b72b1c8 tests for enabled_button_based_providers helper method of AuthHelper 2016-05-12 13:44:46 +03:00
Andrei Gliga 47ee5125e8 validate disabled_oauth_sign_in_sources in ApplicationSe 2016-05-12 13:44:46 +03:00
Andrei Gliga 7c7c5b7e40 text for the disable_oauth_signin_sources label 2016-05-12 13:44:46 +03:00
Andrei Gliga 28da3a88de show only the eanbled oauth providers 2016-05-12 13:44:46 +03:00
Andrei Gliga 284eccb5e6 render the omniauth_box if there are any button_based_providers 2016-05-12 13:44:46 +03:00
Andrei Gliga d943e5f691 method to check if oauth button based providers are enabled 2016-05-12 13:44:46 +03:00
Andrei Gliga 8d26836e94 method to get the enabled_button_based_providers 2016-05-12 13:44:46 +03:00
Andrei Gliga cf30044314 OAuth Providers disable from the ApplicationSettings page 2016-05-12 13:44:46 +03:00
Andrei Gliga d8085d8e12 default value for disabled_oauth_sign_in_sources in create_from_defaults @ ApplicationSetting 2016-05-12 13:44:46 +03:00
Andrei Gliga e5ddd6d21e disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsController 2016-05-12 13:44:46 +03:00
Andrei Gliga ca28858725 serialize the disabled_oauth_sign_in_sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 7db3fb5a0b disabled_oauth_sign_in_sources column 2016-05-12 13:44:46 +03:00
Yorick Peterse 624dc104a8 Merge branch 'update-8-8-guides' into 'master'
Update 8.8 guides

See merge request !4119
2016-05-12 10:06:57 +00:00
Rémy Coutable f4a1ac2397 Merge branch '16568-relative-links-wiki-regression' into 'master'
Relative Links in the Wiki Are Broken

- [ ] #16568 (!4050) Relative links in wiki are broken
    - [x] Investigate issue

  
    - [x] Implementation / Fix

        - [x] Write (failing) tests for `WikiLinkFilter`
        - [x] Link to `./bar` should either get rewritten correctly or left alone
        - [x] Link to `./bar.md` should maybe get rewritten correctly (is left alone currently)
        - [x] Link to `bar.md` should get rewritten correctly


            - [x] Check if this indeed a bug

    - [x] Make sure CI is green
    - [x] Assign to endboss

    - [x] Wait for review

    - [x] Implement review feedback
    - [ ] Wait for merge


See merge request !4050
2016-05-12 08:08:35 +00:00
Timothy Andrew 555610b619 Add CHANGELOG entry. 2016-05-12 07:20:09 +05:30
Timothy Andrew a4ee7d25e3 Implement @rymai's feedback after review.
- Separate 'exercise' and 'verify' steps of tests.
- Use `build_stubbed` instead of `build`
2016-05-12 07:17:07 +05:30
Timothy Andrew a59ad3936a Add a spec for WikiLinkFilter
- And fix behavior for non-file hierarchical links.
2016-05-12 07:17:07 +05:30
Douwe Maan f2251273b9 Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master'
Add snippet tab under user profile

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572

See merge request !4001
2016-05-11 22:04:25 +00:00
Douwe Maan 44f6e34bb5 Merge branch 'rs-remove-icon_for_event' into 'master'
Remove unused `icon_for_event` helper

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090

See merge request !4120
2016-05-11 21:21:48 +00:00
Robert Speicher b523dec83d Remove unused icon_for_event helper 2016-05-11 15:08:27 -05:00
Jacob Schatz 459af7ff65 Merge branch 'no-todo-badge-on-zero' into 'master'
Don't show the Todo count if there aren't any Todos.

When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying.

Follow-up on !4077.

**Before:**

![Screen_Shot_2016-05-10_at_9.36.57_PM](/uploads/e0dfafae01692286096606c3251f0997/Screen_Shot_2016-05-10_at_9.36.57_PM.png)

**After:**

![Screen_Shot_2016-05-10_at_10.01.02_PM](/uploads/30a8bafe8f54862418eb4045e5777a9a/Screen_Shot_2016-05-10_at_10.01.02_PM.png)

cc: @jschatz1 @rspeicher 

See merge request !4113
2016-05-11 18:11:47 +00:00
Robert Speicher d8415389de Merge branch 'hook-docs-behavior' into 'master'
Improve documentation and web test for web hooks

Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.

See merge request !4015
2016-05-11 16:34:00 +00:00
Valery Sizov 973cd0fec7 Update 8.8 guides 2016-05-11 18:08:17 +03:00
Robert Speicher 51a8619a71 Merge branch '17356-remove-monkey_patch' into 'master'
Remove Rails monkey-patches now that we're using Rails 4.2.6

Closes #17356.

See merge request !4115
2016-05-11 13:51:57 +00:00
Robert Speicher 56c8125ee1 Merge branch 'improve-destroy-logging' into 'master'
Improve log message when a project is destroyed to include the namespace

See merge request !4114
2016-05-11 13:21:26 +00:00
Robert Speicher 24f353edc4 Merge branch '17249-starred' into 'master'
Restrict starred projects to viewable ones

`User#starred_projects` doesn't perform any visibility checks. This has
a couple of problems:

1. It assumes a user can always view all of their starred projects in
   perpetuity (project not changed to private, access revoked, etc.).
2. It assumes that we'll only ever allow a user to star a project they
   can view. This is currently the case, but bugs happen.

Add `User#viewable_starred_projects` to filter the starred projects by
those the user either has explicit access to, or are public or
internal. Then use that in all places where we list the user's starred
projects.

Closes #17249.

See merge request !4108
2016-05-11 12:49:29 +00:00
Robert Speicher d526cda502 Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into 'master'
Only generate repository push email once

The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)

Closes #17270.

See merge request !4070
2016-05-11 12:45:39 +00:00
Yorick Peterse e9706b2f9b Merge branch 'update-changelog-874' into 'master'
Updated 8.7.4 CHANGELOG entries

See merge request !4116
2016-05-11 12:21:06 +00:00
Yorick Peterse c446a86510 Updated 8.7.4 CHANGELOG entries
[ci skip]
2016-05-11 14:19:30 +02:00
Rémy Coutable 941301339d Remove Rails monkey-patches now that we're using Rails 4.2.6
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-11 12:32:48 +02:00
Rémy Coutable e77a9a342e Merge branch 'casecmp-cop' into 'master'
Enable Rubocop Casecmp Performance Cop.

Also fixes the errors caused by enabling the cop.

`casecmp` is more performant than `.downcase` and `==`.

See also: https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/cop/performance/casecmp.rb

See merge request !3957
2016-05-11 08:59:44 +00:00
Rémy Coutable de5ae1bf06 Merge branch 'string-replacement-cop' into 'master'
Enable the StringReplacement cop.

Also fix one use of `gsub` that would be faster as `delete`.

Use `tr` instead of `gsub` when you are replacing the same number of characters. Use `delete` instead of `gsub` when you are deleting characters.

See merge request !3960
2016-05-11 08:58:59 +00:00
Sean McGivern 5f27e26bb4 Only generate repository push email once
The repository push email can be very expensive to generate, especially
with syntax-highlighted diffs. Instead of generating the email for each
recipient, generate one email object and reset the Message-Id and To
headers for each recipient. (Cloning would also be expensive in the case
of large emails, although probably not as bad as generating from
scratch.)
2016-05-11 09:16:01 +01:00
Sean McGivern acd8930c46 Tidy up user project specs 2016-05-11 09:03:23 +01:00
Stan Hu f2548f3f2b Improve log message when a project is destroyed to include the namespace 2016-05-10 22:07:13 -07:00
Connor Shea 51e198fb38 Don't show the Todo count if there aren't any Todos.
When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying.

Follow-up on !4077.
2016-05-10 21:56:40 -06:00