summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-121-1/+9
| | | | | | | Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080
* Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-191-5/+5
| | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498
* Merge branch 'mk-fix-routable-redirect-message' into 'master' Douwe Maan2017-05-191-4/+4
| | | | | Fix redirect message for groups and users See merge request !11313
* Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-191-3/+10
| | | | | | | Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178
* Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-061-0/+38
|\ | | | | | | | | | | | | Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
| * Resolve discussionsMichael Kozono2017-05-051-7/+9
| |
| * Dry up routable lookups. Fixes #30317Michael Kozono2017-05-051-2/+26
| | | | | | | | Note: This changes the behavior of user lookups (see the spec change) so it acts the same way as groups and projects. Unauthenticated clients attempting to access a user page will be redirected to login whether the user exists and is publicly restricted, or does not exist at all.
| * Add “project moved” flash message on redirectMichael Kozono2017-05-051-0/+1
| |
| * Redirect from redirect routes to canonical routesMichael Kozono2017-05-051-0/+11
| |
* | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-052-1/+2
|\ \ | |/ |/| | | | | Backport of Multiple Assignees feature See merge request !11089
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov2017-05-052-19/+27
| |\ | | | | | | | | | skip]
| * | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-042-1/+2
| | |
* | | Support comments for personal snippetsJarka Kadlecova2017-05-051-0/+44
| |/ |/|
* | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-041-19/+0
| | | | | | | | | | | | | | | | | | | | Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window".
* | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+27
|\ \ | |/ |/| | | | | Prepare uploaders for personal snippets comments See merge request !11022
| * Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+27
| |
* | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-031-0/+53
|\ \ | | | | | | | | | | | | Load milestone tabs asynchronously See merge request !10919
| * | Fixed failing specsPhil Hughes2017-04-261-4/+4
| | |
| * | Added controller specsPhil Hughes2017-04-261-0/+11
| | |
| * | Load milestone tabs asynchronouslyPhil Hughes2017-04-261-0/+42
| | |
* | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-021-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Add download button to project snippets See merge request !11004
| * | | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-301-1/+3
| | | |
* | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-023-1/+140
|/ / /
* | | Use blob viewers for snippetsDouwe Maan2017-04-301-0/+4
| |/ |/|
* | Accept default branch param on notifaction servicesZeger-Jan van de Weg2017-04-281-0/+1
| |
* | Render viewer error synchronously so that 'view the source' link will workDouwe Maan2017-04-271-1/+1
| |
* | Add JSON endpoint to get simple blob viewerDouwe Maan2017-04-271-0/+17
| |
* | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-261-0/+19
|\ \ | |/ |/| | | | | Support preview_markdown action for personal_snippets See merge request !10810
| * Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-261-0/+19
| |
* | Merge branch 'dz-refactor-create-members' into 'master' Douwe Maan2017-04-201-2/+40
|\ \ | | | | | | | | | | | | Refactor code that creates and destroys project/group members See merge request !10735
| * | Refactor members controller destroy actionDmitriy Zaporozhets2017-04-171-3/+29
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor controller code that creates project/group membersDmitriy Zaporozhets2017-04-171-0/+12
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Refactor changing files in web UIDouwe Maan2017-04-201-33/+29
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-0/+25
|\
| * Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵Paweł Chojnacki2017-04-071-0/+25
| | | | | | | | application readiness
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-061-0/+58
|\ \ | |/ | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * Merge branch 'feature/enforce-2fa-per-group' into 'master' Douwe Maan2017-04-061-0/+58
| |\ | | | | | | | | | | | | Support 2FA requirement per-group See merge request !8763
| | * rename cache db column with `_cached` suffixAlexis Reigel2017-04-061-2/+2
| | |
| | * check all groups for 2fa requirementAlexis Reigel2017-04-061-1/+1
| | |
| | * state the reason to the user for the required 2faAlexis Reigel2017-04-061-0/+11
| | |
| | * Rename skip_tfa session variable to skip_two_factorMarkus Koller2017-04-061-1/+1
| | |
| | * Rename check_2fa_requirement to check_two_factor_requirementMarkus Koller2017-04-061-4/+4
| | |
| | * Extract 2FA-related code from ApplicationControllerMarkus Koller2017-04-061-0/+47
| | |
* | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-063-17/+8
|\ \ \ | |/ /
| * | Merge branch '28810-projectfinder-should-handle-more-options' into 'master' Rémy Coutable2017-04-062-17/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | ProjectsFinder should handle more options Closes #28810 See merge request !9682
| | * ProjectsFinder should handle more optionsJacopo2017-04-062-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended ProjectFinder in order to handle the following options: - current_user - which user use - project_ids_relation: int[] - project ids to use - params: - trending: boolean - non_public: boolean - starred: boolean - sort: string - visibility_level: int - tags: string[] - personal: boolean - search: string - non_archived: boolean GroupProjectsFinder now inherits from ProjectsFinder. Changed the code in order to use the new available options.
| * | Merge branch 'open-redirect-fix-continue-to' into 'security' Sean McGivern2017-04-051-0/+1
| |/ | | | | | | | | Fix for open redirect vuln involving continue[to] params See merge request !2083
* | Address review commentsDouwe Maan2017-04-051-0/+20
|/
* Remove useless queries with false conditions (e.g 1=0)mhasbini2017-04-041-0/+3
|
* All CI offline migrationsKamil Trzciński2017-03-171-1/+0
|