summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitl...jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-0213-26/+129
|\
| * Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot2019-04-021-1/+1
| |\
| | * Fix XSS in resolve conflicts formPaul Slaughter2019-03-071-1/+1
| * | Merge branch 'security-56224' into 'master'GitLab Release Tools Bot2019-04-023-3/+7
| |\ \
| | * | Hide related branches when user does not have permissionMark Chao2019-03-213-3/+7
| * | | Merge branch 'security-id-potential-denial-languages' into 'master'GitLab Release Tools Bot2019-04-023-7/+35
| |\ \ \
| | * | | Return cached languages if they've been detected beforeIgor Drozdov2019-03-203-7/+35
| * | | | Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'GitLab Release Tools Bot2019-04-021-1/+1
| |\ \ \ \
| | * | | | fix: changed PDFJS prop to GlobalWorkerOptionsNatalia Tepluhina2019-03-131-1/+1
| * | | | | Merge branch 'security-milestone-labels' into 'master'GitLab Release Tools Bot2019-04-023-8/+76
| |\ \ \ \ \
| | * | | | | Check if labels are available for target issuableJarka Košanová2019-03-283-8/+76
| * | | | | | Merge branch 'security-mass-assignment-on-project-update' into 'master'GitLab Release Tools Bot2019-04-021-5/+8
| |\ \ \ \ \ \
| | * | | | | | Add cr remarksMałgorzata Ksionek2019-03-251-3/+3
| | * | | | | | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-201-5/+8
| | | |_|/ / / | | |/| | | |
| * | | | | | Disallow guest users from accessing ReleasesShinya Maeda2019-03-261-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'coverage-parsing-examples' into 'master'Grzegorz Bizon2019-04-021-3/+6
|\ \ \ \ \ \
| * | | | | | Add Elixir example for built in coverage tooloptikfluffel2019-03-281-0/+3
| * | | | | | Move NodeJS examples next to each otheroptikfluffel2019-03-281-3/+3
* | | | | | | Fix group transfer selection possibilitiesPeter Marko2019-04-022-2/+11
* | | | | | | Merge branch 'bvl-stream-io-into-gitaly' into 'master'Nick Thomas2019-04-011-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow streaming io objects into GitalyBob Van Landuyt2019-04-011-2/+1
* | | | | | | | Merge branch 'nfriend-css-updates-for-gitlab-design-system-compliance' into '...Fatih Acet2019-04-012-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update border radius of form controls and remove space above page titlesnfriend-css-updates-for-gitlab-design-system-complianceNathan Friend2019-02-142-2/+1
* | | | | | | | Force a full GC after importing a projectsh-force-gc-after-importStan Hu2019-04-012-2/+5
* | | | | | | | Merge branch 'check-mergeability-in-merge-to-ref-service' into 'master'Douglas Barbosa Alexandre2019-04-012-5/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Check mergeability in merge to ref servicecheck-mergeability-in-merge-to-ref-serviceShinya Maeda2019-04-012-5/+2
* | | | | | | | | Merge branch 'contribute/fix-nav-links-archived-project' into 'master'Douglas Barbosa Alexandre2019-04-011-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable inaccessible navigation links upon archiving a projectElias Werberich2019-03-311-2/+2
* | | | | | | | | | Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'Clement Ho2019-04-013-23/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-pageSam Bigelow2019-03-293-23/+62
* | | | | | | | | | | Fix MergeRequest#has_commits? nil comparisonFrancisco Javier López2019-04-011-1/+1
* | | | | | | | | | | Dry up and remove responsibilitiesJoão Cunha2019-04-014-47/+32
* | | | | | | | | | | Merge branch '59694-markdown-area' into 'master'Phil Hughes2019-04-013-6/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replaces md-area with position-relative for markdown areasFilipa Lacerda2019-04-013-6/+2
* | | | | | | | | | | | Merge branch 'ce-10220-link-to-note-from-email' into 'master'Kushal Pandya2019-04-011-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Display link to review note in text emailce-10220-link-to-note-from-emailMark Chao2019-03-281-0/+4
* | | | | | | | | | | | | add a uniq constraints on issues and mrs labelsAntoine Huret2019-04-011-1/+1
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Remove executable permission on imagessh-fix-image-permissionsStan Hu2019-03-303-0/+0
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Don't try to set any ACL on uploaded objectsBastian Blank2019-03-301-1/+5
* | | | | | | | | | | Merge branch 'dennis-positioning-important' into 'master'Clement Ho2019-03-291-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Designate common positioning classes as important a la Bootstrapdennis-positioning-importantDennis Tang2019-03-261-4/+4
* | | | | | | | | | | | Renames Cluster#managed? to provided_by_user?Mayra Cabrera2019-03-298-25/+24
* | | | | | | | | | | | Handle missing keys in sentry api responseReuben Pereira2019-03-293-3/+17
* | | | | | | | | | | | Merge branch '50199-quick-actions-refactor' into 'master'Sean McGivern2019-03-291-607/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Extend quick actions dsl50199-quick-actions-refactorAlexandru Croitor2019-03-291-607/+15
* | | | | | | | | | | | Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master'Nick Thomas2019-03-295-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_groupMario de la Ossa2019-03-285-2/+4
* | | | | | | | | | | | | Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'Kamil Trzciński2019-03-297-12/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Create detached merge request pipelinespersist-fulll-ref-path-for-mr-pipelinesShinya Maeda2019-03-297-12/+45
* | | | | | | | | | | | | | Merge branch 'sh-fix-gitaly-find-commit-caching' into 'master'Kamil Trzciński2019-03-292-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |