summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ccr/6699_image_for_object_error' into 'master'Robert Speicher2018-09-061-0/+2
|\
| * Handled exception during file uploadChantal Rollison2018-09-061-0/+2
* | Resolve "Remove usage ping payload from Cohorts, add to Settings"Luke Bennett2018-09-0611-58/+129
* | Merge branch '51117-send-terminal-path-in-job-api' into 'master'Kamil Trzciński2018-09-061-0/+8
|\ \
| * | Add terminal path to job API responseSteve Azzopardi2018-09-061-0/+8
* | | Make MR diff file filter input Clear button functionalKushal Pandya2018-09-062-1/+5
* | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+15
|\ \ \
| * | | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-051-1/+15
* | | | Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan2018-09-063-13/+38
|\ \ \ \
| * | | | Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-063-13/+38
| | |/ / | |/| |
* | | | Enable Kubernetes RBAC for GitLab Managed Apps for existing clustersThong Kuah2018-09-0612-34/+54
* | | | Resolve "Update presentation for SSO providers on log in page"Martin Wortschack2018-09-0617-51/+52
* | | | Merge branch 'rails5-explicit-hashed-path-check' into 'master'Rémy Coutable2018-09-061-1/+3
|\ \ \ \
| * | | | Explicit hashed path check for trace, prevents background migration from acce...Jasper Maes2018-09-051-1/+3
* | | | | Merge branch 'sh-add-ua-to-lograge-logs' into 'master'Sean McGivern2018-09-061-0/+1
|\ \ \ \ \
| * | | | | Add User-Agent to production_json.logStan Hu2018-09-051-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'bw-commonmark-for-files' into 'master'Sean McGivern2018-09-0612-17/+40
|\ \ \ \ \
| * | | | | added feature flag 'commonmark_for_repositories'Brett Walker2018-09-053-2/+16
| * | | | | move logic into legacy_render_context helper methodBrett Walker2018-09-058-16/+13
| * | | | | render using RedCarpet if legacy_render parameter is setBrett Walker2018-09-0510-13/+28
| * | | | | Enable CommonMark for files and wikisBrett Walker2018-09-053-6/+3
| | |/ / / | |/| | |
* | | | | Resolve "Improve project overview UI"Dennis Tang2018-09-0621-261/+468
* | | | | Merge branch 'ce-5306-more-custom-templates' into 'master'Robert Speicher2018-09-062-13/+53
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rename BlobsHelper#dropdown_namesNick Thomas2018-09-051-6/+6
| * | | | Allow the TemplateFinder to handle licenses as wellNick Thomas2018-09-051-0/+10
| * | | | Convert global templates to vendored templates via a ::TemplateFinderNick Thomas2018-09-052-13/+43
* | | | | Merge branch 'dz-cleanup-group-labels-page' into 'master'Rémy Coutable2018-09-051-3/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unnecessary logic from group labels pageDmitriy Zaporozhets2018-09-051-3/+1
* | | | | Merge branch '50974-qa-group-filtering-fails-when-filter-text-field-is-filled...Grzegorz Bizon2018-09-052-2/+2
|\ \ \ \ \
| * | | | | [QA] Ensure groups filtering does not happen before the groups list is loadedRémy Coutable2018-09-052-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'filter-web-hooks-by-branch' into 'master'Dmitriy Zaporozhets2018-09-0510-60/+113
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactor: move active hook filter to TriggerableHooksDuana Saskia2018-09-053-1/+8
| * | | | Refactor ProtectedRefMatcher to be more genericDuana Saskia2018-08-134-84/+56
| * | | | Filter project hooks by branchDuana Saskia2018-08-136-2/+76
* | | | | Merge branch 'rails5-fix-job-artifact-hashed-path' into 'master'Rémy Coutable2018-09-051-1/+1
|\ \ \ \ \
| * | | | | Rails 5: fix hashed_path? method that looks up file_location that doesn't exi...Jasper Maes2018-09-051-1/+1
* | | | | | Resolve "<link href=""> and <a href=""> not properly filled in activity RSS f...schwedenmut2018-09-053-9/+11
* | | | | | Limit navbar search for current project or group for small viewportsGeorge Tsiolis2018-09-053-10/+15
| |_|/ / / |/| | | |
* | | | | Merge branch '36048-move-default-branch-settings-under-repository' into 'master'Phil Hughes2018-09-053-5/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move project default branch settings under 'Repository'Paul Slaughter2018-09-043-5/+22
| | |/ / | |/| |
* | | | Merge branch 'sh-disable-unnecessary-avatar-revalidation' into 'master'Robert Speicher2018-09-041-1/+1
|\ \ \ \
| * | | | Disable project avatar validation if avatar has not changedStan Hu2018-09-041-1/+1
* | | | | Feature/new merge breadcrumbsJ.D. Bean2018-09-041-1/+2
* | | | | Merge branch 'dz-group-labels-search' into 'master'Felipe Artur2018-09-042-10/+22
|\ \ \ \ \
| * | | | | Add search to group labels page [ci skip]Dmitriy Zaporozhets2018-09-032-10/+22
| |/ / / /
* | | | | fixes breadcrumbs on new issue page. adds link to issues page.J.D. Bean2018-09-041-1/+2
* | | | | Conditional partial rendering for EE in application settingsMartin Wortschack2018-09-041-0/+8
* | | | | Merge branch 'add-background-migration-for-legacy-traces' into 'master'Kamil Trzciński2018-09-042-3/+34
|\ \ \ \ \
| * | | | | Squashed commit of the following:add-background-migration-for-legacy-tracesShinya Maeda2018-08-272-3/+34
* | | | | | Merge branch '39665-restrict-issue-reopen' into 'master'Sean McGivern2018-09-047-10/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |