summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* CodestyleGabriel Mazetto2017-05-131-1/+1
|
* Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+28
|
* Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-2/+8
|\ | | | | | | | | | | | | Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
| * Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-121-21/+50
|\ \ | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | Respond with 404 when metrics are not enabled or deployment_metrics is not ↵Pawel Chojnacki2017-05-121-21/+50
| |/ | | | | | | implemented
* | Fix redirect message for groups and usersMichael Kozono2017-05-113-8/+20
|/
* Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-101-1/+1
|\ | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| * Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-101-1/+1
| | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-101-0/+35
| | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096
* | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-101-0/+28
| | | | | | | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
* | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-101-3/+3
|/ | | | | | Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
* Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-091-2/+6
|\ | | | | | | | | | | | | Preloads head pipeline for each merge request Closes #27168 See merge request !10064
| * Fix specs 2Felipe Artur2017-05-081-1/+4
| |
| * Fix SpecsFelipe Artur2017-05-081-1/+2
| |
* | Merge request widget redesignFatih Acet2017-05-094-158/+270
|/
* Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-071-0/+87
|
* Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński2017-05-061-1/+1
|\ | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
| * Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-059-12/+521
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits) Fixed Karma spec Reject EE reserved namespace paths in CE as well Updated webpack config Include the bundler:audit job into the static-analysis job Document serializers Add artifact file page that uses the blob viewer Pipeline table mini graph dropdown remains open when table is refreshed Adds off for event hub Compile gitlab-shell go executables Allow to create new branch and empty WIP merge request from issue page Moved to a view spec Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md Convert seconds to minutes and hours on chat notifations Disable navigation to Pages config if Pages is disabled Sort the network graph both by commit date and topographically. Add tooltips to note action buttons Add breadcrumb, build header and pipelines submenu to artifacts browser Update todos screenshots removes the possibility of commit messages having carriage returns Handle incoming emails from aliases correctly ...
| * | Improve code style related to protected actionsGrzegorz Bizon2017-05-031-3/+1
| | |
| * | Merge branch 'master' into ↵Grzegorz Bizon2017-05-035-97/+370
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (103 commits) Include missing project attributes to Import/Export Create the rest of the wiki docs Fill in information about creating the wiki Home page Move wiki doc to its own index page Create initial file for Wiki documentation Default to null user when asignee is unselected Re-enable ref operations with gitaly after not-found fix #31560 Add repo parameter to gitaly:install and workhorse:install Remove N+1 queries when checking nodes visible to user Don't validate reserved words if the format doesn't match Revert "Shorten and improve some job names" Remove unused initializer DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml` Make the static-analysis job be run for docs branches too Add download_snippet_path helper Refresh the markdown cache if it was `nil` Add some documentation for the new migration helpers Update comments Display comments for personal snippets Update docs on creating a project ...
| * | | Fix builds controller spec related to protected actionsGrzegorz Bizon2017-05-021-0/+2
| | | |
* | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-061-0/+31
| | | |
* | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-23/+376
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
| * | | | Resolve discussionsMichael Kozono2017-05-053-0/+7
| | | | |
| * | | | Dry up routable lookups. Fixes #30317Michael Kozono2017-05-051-4/+4
| | | | | | | | | | | | | | | | | | | | 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-053-0/+8
| | | | |
| * | | | Resolve discussionsMichael Kozono2017-05-051-0/+18
| | | | |
| * | | | Fix Rubocop failuresMichael Kozono2017-05-051-4/+4
| | | | |
| * | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-054-21/+341
| | | | |
* | | | | Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-051-0/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new admin integrations not taking effect on existing project Closes #26376 See merge request !11069
| * | | | | refactor code based on feedbackJames Lopez2017-05-051-4/+4
| | | | | |
| * | | | | refactor a few things based on feedbackJames Lopez2017-05-041-0/+32
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov2017-05-056-11/+481
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | skip]
| * | | | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requestsGrzegorz Bizon2017-05-051-0/+36
| | |_|/ | |/| |
| * | | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-0/+66
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973
| | * \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-045-12/+252
| | |\ \ \
| | * \ \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-0312-164/+491
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-281-12/+354
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵Jacob Schatz2017-04-271-0/+66
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | deploy-keys-load-async
| | | * | | | | | Project deploy keys json end pointJarka Kadlecova2017-03-241-0/+66
| | | | | | | | |
| * | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+188
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018
| | * | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+188
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+87
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022
| | * | | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+87
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' Rémy Coutable2017-05-042-11/+104
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable navigation to Pages config if Pages is disabled Closes #30529 See merge request !11008
| | * | | | | | | Disable navigation to Pages config if Pages is disabledMark Fletcher2017-05-042-11/+104
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Regards project-level pages config - Nav link is now shown only if Pages is enabled for instance - Navigation to following controllers denied if Pages disabled: * projects/pages_controller * projects/pages_domains_controller - 'disabled' partial removed + Test for pages_controller introduced
* | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-044-7/+7
|/ / / / / / /
* | | | | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-042-1/+61
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-032-0/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Load milestone tabs asynchronously See merge request !10919
View Lorry Controller Status