summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with returning ref in commits JSONasync-refs-dropdownPhil Hughes2016-06-201-0/+20
| | | | Added tests to project controller
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-173-84/+125
|\ | | | | | | | | | | | | | | | | | | | | Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-171-0/+71
| |\
| * \ Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-173-103/+125
| |\ \
| | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-163-103/+125
| | | |
| | * | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-0/+19
| | | |
| * | | Implement custom notification level optionsFelipe Artur2016-06-151-0/+19
| | | |
* | | | Merge branch 'issuable-todo-improvements'Douwe Maan2016-06-181-0/+102
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/todos_controller.rb
| * | | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-86/+80
| | | | | | | | | | | | | | | | | | | | | | | | | Re-structured controller spec Renamed issuable param to issuable_id
| * | | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
| | | | |
| * | | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-0/+13
| | | | |
| * | | | Improved manual todosPhil Hughes2016-06-171-0/+42
| |/ / / | | | | | | | | | | | | Based on feedback from !4502
* | | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-0/+26
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the unlink feature for SAML connected accounts (social login). This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent). Fixes #18613 See merge request !4662
| * | | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-141-4/+2
| | | |
| * | | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-0/+28
| | | |
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-165-21/+462
|\ \ \ \ | | |/ / | |/| |
| * | | 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 remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-143-3/+6
|\ \ | |/
| * Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-108-39/+29
| |\
| * \ Add send_git_diff helperDouwe Maan2016-06-083-7/+93
| |\ \
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-062-2/+5
| | | |
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-107-39/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | | |
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-099-24/+261
|\ \ \ \ | |/ / /
| * | | 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
| * | 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
| |\ \ \ \ | | |/ / /
| | * | | 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 '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
| | * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-034-8/+111
| | |\ \ | | | |/
| | * | Incorportate feedbackZ.J. van de Weg2016-06-012-5/+5
| | | |
| | * | Merge branch 'master' into awardablesZJ van de Weg2016-05-308-10/+21
| | |\ \
| | * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-253-1/+49
| | |\ \ \
| | * \ \ \ 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
| | * | | | | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-121-2/+4
| | | | | | |
View Lorry Controller Status