summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-152-0/+17
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵Stan Hu2016-06-122-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark Here was the problem: 1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file. 2. If the blob is text, GitLab will attempt to display it. 3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters. 4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT. To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires an update to gitlab_git: gitlab-org/gitlab_git!86 Closes #13826
* | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-142-27/+27
| | | | | | | | | | | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Factorize #request_access and #approve_access_request into a new ↵Rémy Coutable2016-06-142-6/+6
| | | | | | | | | | | | AccessRequestActions controller concern Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Add request access for groupsRémy Coutable2016-06-142-20/+427
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-131-1/+18
|/
* Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-108-39/+29
|\
| * Remove require_relative 'import_spec_helper'make-omniauth-tests-to-not-modify-global-stateKamil Trzcinski2016-06-086-6/+0
| |
| * Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-33/+0
| |
| * Make Omniauth providers specs to not modify global configurationKamil Trzcinski2016-06-081-1/+1
| |
| * Fix endless redirections when accessing user OAuth applications when they ↵Stan Hu2016-06-081-0/+29
| | | | | | | | | | | | | | | | are disabled Also hides the "Applications" nav button if OAuth applications are disabled by the admin. Closes #14770
* | Add send_git_diff helperDouwe Maan2016-06-083-7/+93
|\ \ | |/
| * Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-0/+53
| |\ | | | | | | | | | | | | | | | | | | Ability to prioritize labels Closes #14189 See merge request !4009
| | * Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-071-0/+53
| | |
| * | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-6/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workhorse to serve raw diffs Fixes (partially) #13999 Dependent on: gitlab-org/gitlab-workhorse!45 See merge request !4130
| | * | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-6/+3
| | | |
| * | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+36
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-0/+36
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes are awardables ## What does this MR do? Makes sure we can :thunder_cloud_rain: comments/notes. ## What are the relevant issue numbers? Follows up upon !2901, depends on !3785 Closes #3655 ## Screenshots (if relevant) TODO See merge request !4291
| | | * | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| | | | |
| | | * | Backend awardables on commentsZJ van de Weg2016-06-061-0/+36
| | | | |
| * | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-8/+32
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-6/+22
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | # Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
| * | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-1/+1
| | |_|/ | |/| |
* | | | Add workhorse controller and API helpersDouwe Maan2016-06-062-2/+5
| |_|/ |/| |
* | | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-061-1/+25
| | | | | | | | | | | | | | | | | | - "two-factor" for OTP-based 2FA - "two-factor-via-u2f-device" for U2F-based 2FA - "standard" for non-2FA login
* | | Implement U2F registration.Timothy Andrew2016-06-061-7/+7
| |/ |/| | | | | | | | | | | | | | | | | | | - Move the `TwoFactorAuthsController`'s `new` action to `show`, since the page is not used to create a single "two factor auth" anymore. We can have a single 2FA authenticator app, along with any number of U2F devices, in any combination, so the page will be accessed after the first "two factor auth" is created. - Add the `u2f` javascript library, which provides an API to the browser's U2F implementation. - Add tests for the JS components
* | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-034-8/+111
|\ \ | |/
| * Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-031-0/+86
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "SHA parameter in accept merge request API" Add a `sha` parameter to the MR merge API, which must match the source SHA for the branch to be merged. Also add the same parameter to the UI: ![MR_SHA](/uploads/616da728695dc19fa7ef7ef6a016ff81/MR_SHA.gif) @DouweM and I discussed adding some smart feature to that, like updating the source SHA on navigating to the diff tab, but for now it will just require a refresh :smiley: Closes #14139. See merge request !4414
| | * Don't allow merges with new commitsSean McGivern2016-06-011-0/+86
| | | | | | | | | | | | | | | | | | Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.
| * | Update test since branch removal does not render template anymoredz-code-tabDmitriy Zaporozhets2016-06-031-4/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216
| | * Fix a broken specConnor Shea2016-05-301-1/+1
| | | | | | | | | | | | | | | Temporary fix until Devise 4 fixes this grammar issue: https://github.com/plataformatec/devise/issues/4095
| * | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-011-0/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the "Remember me" value to the 2FA token form Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000 See merge request !4369
| | * | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-301-0/+21
| | |/ | | | | | | | | | | | | | | | | | | | | | Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000
| * | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-2/+2
| |\ \ | | |/ | |/|
| | * Update tests for the current_application_settings request store changesDJ Mountney2016-05-271-2/+2
| | |
| * | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
| | | | | | | | | | | | See #17478
* | | Incorportate feedbackZ.J. van de Weg2016-06-012-5/+5
| | |
* | | Merge branch 'master' into awardablesZJ van de Weg2016-05-308-10/+21
|\ \ \ | |/ /
| * | Project#show on projects pending deletion will 404zj-race-condition-pending-deleteZeger-Jan van de Weg2016-05-281-0/+11
| |/ | | | | | | fixes #17508
| * Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-247-10/+10
| | | | | | | | Also removes the note from the development/testing.md guide
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-253-1/+49
|\ \ | |/
| * Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-231-1/+1
| |
| * Merge branch 'issue_9013' into 'master' Douwe Maan2016-05-202-0/+48
| |\ | | | | | | | | | | | | | | | | | | Let users set notification levels in projects which they are not members Fixes #9013 See merge request !3986
| | * Use the right default notification settings for non membersissue_9013Felipe Artur2016-05-191-3/+4
| | |
| | * Let users set notification levels in projects which they are not membersFelipe Artur2016-05-172-1/+48
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-185-1/+237
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| * | Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-181-1/+1
| |\ \ | | |/ | |/| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-161-1/+1
| | | | | | | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
| * | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
View Lorry Controller Status