summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Collapse)AuthorAgeFilesLines
* fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-091-2/+1
| | | | refactors update file
* Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-091-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the remember_me option into the u2f form and support it while authenticating ## What does this MR do? Adds remember me support in the u2f authentication, and makes sure the flag gets passed from the login form to the u2f form. Based on the changes for the same thing done for regular 2fa: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4369 ## Why was this MR needed? The remember me option wasn't working for u2f devices (yubikey) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18103 See merge request !5918
| * Pass the remember_me option into the u2f form and support it while ↵add-remember-option-u2fDJ Mountney2016-09-011-0/+1
| | | | | | | | | | | | authenticating Matches the changes done for non-u2f two-factor auth
* | Refresh todos count cache when an Issue/MR is deletedDouglas Barbosa Alexandre2016-09-081-0/+2
| |
* | Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-081-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-081-0/+31
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-311-1/+1
|/
* prevent authored awardable thumbs votesbarthc2016-08-301-5/+7
|
* prevent authored awardable thumbs votesbarthc2016-08-281-0/+2
| | | | | | prevent authored awardable thumbs votes prevent authored awardable thumbs votes
* Handle legacy sort order values21028-missing-default-sort-for-users-with-an-existing-cookieSean McGivern2016-08-181-0/+5
| | | | | | | The sort orders used to be id_asc / id_desc, and are now created_asc / created_desc. Users can still have cookies containing the old sort orders, or bookmarks to links specifying them, so convert these to the new versions quietly.
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-161-0/+25
|\ | | | | | | pipeline-hooks-without-slack
| * Further refactor and syntax fixes.Patricio Cano2016-08-151-5/+4
| |
| * Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-7/+1
| | | | | | | | - Refactored SpamCheckService into SpamService
| * Allow `Issue` to be submitted as spamPatricio Cano2016-08-151-0/+32
| | | | | | | | | | - Added controller actions as reusable concerns - Added controller tests
* | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-111-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (233 commits) Fix awardable button mutuality loading spinners Update CHANGELOG for 8.10.5 Clean up project destruction Small refactor of doc/development/README.md Avoid commit lookup on diff_helper Removed extra newline from redis_spec.rb Used cached value of project count to reduce DB load Remove duplicate link_to statements Mention add_column_with_default in downtime guide Add missing space to generic badge template Rename `run` task helper method to prevent conflict with StateMachine Add a method in Project to return a cached value of total count of projects spellcheck Add svg guidelines to ui guide Add Changelog entry for Grape upgrade [ci skip] Fix Grape tests. Retain old behavior Update Grape from 0.13.0 to 0.15.0. adds second batch of tests changed to active tense fixes part1 of files to start using active tense ...
| * Cache highlighted diff lines for merge requestsPaco Guzman2016-08-031-3/+3
| | | | | | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting.
* | More descriptive comments, feedback:Lin Jen-Shin2016-08-031-2/+6
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13539571
* | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-021-8/+7
|/ | | | Closes #20115
* State specific default sort order for issuableszs2016-08-013-8/+91
| | | | | | | | | | | | | | | Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created |
* Refactor service settings viewissue_8110Felipe Artur2016-07-201-5/+5
|
* Add project service documentation and update integration documentationFelipe Artur2016-07-191-0/+35
|
* Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-191-1/+0
|\
| * Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-1/+0
| |
* | Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-181-6/+4
|\ \ | |/
| * Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-151-6/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177
| | * Use a single challenge for U2F authentication.Timothy Andrew2016-07-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. According to the spec, either we have a single challenge with a number of `signRequests`, or a number of `signRequests`, each with it's own challenge. 2. Previously, we had both these - per-request challenges, as well as a single extra challenge. 3. This commit changes this so that the per-request challenges are removed, leaving only a single challenge, as per the v1.1 U2F API. 4. The existing implementation didn't work in Firefox, because the Firefox (extension) implementation is less flexible with regard to the inputs. 5. Fix teaspoon specs. 6. References: https://fidoalliance.org/specs/fido-u2f-v1.0-nfc-bt-amendment-20150514/fido-u2f-javascript-api.html#h2_background
| | * Load Javascript U2F library selectively.Timothy Andrew2016-07-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
* | | refactors update action to change commit_params with the correct pathtiagonbotelho2016-07-121-1/+0
| | |
* | | changes the usasge of path to file_path on blob_controller for ↵tiagonbotelho2016-07-121-1/+1
| | | | | | | | | | | | compatibillity with the create action
* | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| | |
* | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| | |
* | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| | |
* | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| | |
* | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| | |
* | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| | |
* | | removes debugging prints from codetiagonbotelho2016-07-121-8/+0
| | |
* | | refactors blob_controllertiagonbotelho2016-07-121-0/+8
| | |
* | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+2
| | |
* | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-1/+2
|/ /
* | Handle more than two paths in MergeRequest#diffsSean McGivern2016-07-111-1/+3
| |
* | Make expand_all param more explicitSean McGivern2016-07-081-1/+1
| |
* | DRY up diff_for_path actionsSean McGivern2016-07-081-0/+23
|/ | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters.
* Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-011-2/+3
| | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Raise a new Gitlab::Access::AccessDeniedError when permission is not enough ↵Rémy Coutable2016-06-181-26/+8
| | | | | | | | to destroy a member This is a try for a new approach to put the access checks at the service level. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Redirect to the member's source on request withdrawalRémy Coutable2016-06-181-1/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* New Members::DestroyServiceRémy Coutable2016-06-181-2/+4
| | | | | | | This is to ensure we don't send unwanted notifications when deleting a project. In other words, stop abusing AR callbacks and use services. Signed-off-by: Rémy Coutable <remy@rymai.me>
* UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-142-38/+58
| | | | | | | | | + 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 access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Factorize #request_access and #approve_access_request into a new ↵Rémy Coutable2016-06-141-0/+38
| | | | | | AccessRequestActions controller concern Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status