summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reject ruby interpolation in externalized stringsbvl-correct-interpolation-i18nBob Van Landuyt2018-08-259-7/+185
* Merge branch 'winh-fix-dummy-badge-id' into 'master'Fatih Acet2018-08-231-1/+2
|\
| * Use _.uniqueId() instead of Math.random() for dummy badgesWinnie Hellmann2018-08-231-1/+2
|/
* Merge branch '6965-backport-to-ce' into 'master'Stan Hu2018-08-234-79/+118
|\
| * Backport LDAP changes to CEDouglas Barbosa Alexandre2018-08-234-79/+118
* | Merge branch '43096-controller-projects-issuescontroller-referenced_merge_req...Nick Thomas2018-08-2310-188/+222
|\ \
| * | Only load issue notes once when getting related MRs43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queriesSean McGivern2018-08-212-4/+17
| * | Add changelog entry for related MRs fixesSean McGivern2018-08-211-0/+5
| * | Fix CI pipelines N+1 in Issues::ReferencedMergeRequestsServiceSean McGivern2018-08-212-4/+26
| * | Fix routes N+1 in Issues::ReferencedMergeRequestsService#executeSean McGivern2018-08-212-2/+16
| * | Fix authors N+1 in Issues::ReferencedMergeRequestsServiceSean McGivern2018-08-212-15/+37
| * | Move Issue#{referenced,closed_by}_merge_requests to serviceSean McGivern2018-08-218-186/+144
* | | Merge branch 'remove-scss-variables-5' into 'master'Dmitriy Zaporozhets2018-08-2317-118/+55
|\ \ \ | |_|/ |/| |
| * | Finish cleaning up reassigned variablesAnnabel Dunstone Gray2018-08-2217-118/+55
* | | Merge branch 'docs-update-prod-architecture-links' into 'master'Nick Thomas2018-08-231-1/+1
|\ \ \
| * | | Fixes doc/development/architecture.md prod links.Jamie Gordon2018-07-061-2/+2
* | | | Merge branch 'sh-limit-commit-renderering' into 'master'Sean McGivern2018-08-2313-19/+112
|\ \ \ \
| * | | | Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-2213-19/+112
* | | | | Merge branch 'ccr/48800/ping_for_boards' into 'master'Sean McGivern2018-08-235-0/+29
|\ \ \ \ \
| * | | | | Added count for label, assignee, and milestone listsccr/48800/ping_for_boardsChantal Rollison2018-08-215-0/+29
* | | | | | Merge branch 'jprovazn-fix-form-uploads' into 'master'Kamil Trzciński2018-08-233-3/+32
|\ \ \ \ \ \
| * | | | | | Add public/uploads/tmp to allowed upload pathsjprovazn-fix-form-uploadsJan Provaznik2018-08-213-3/+32
| |/ / / / /
* | | | | | Update CHANGELOG.md for 11.2.1GitLab Release Tools Bot2018-08-224-15/+12
* | | | | | Merge branch 'sh-fix-broken-ldap-clones' into 'master'Alejandro Rodríguez2018-08-223-0/+48
|\ \ \ \ \ \
| * | | | | | Fix broken Git over HTTP clones with LDAP usersStan Hu2018-08-223-0/+48
* | | | | | | Merge branch 'sh-fix-wrong-commit-count-in-push' into 'master'Alejandro Rodríguez2018-08-223-13/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix wrong commit count in push event payloadStan Hu2018-08-223-13/+46
|/ / / / / /
* | | | | | Merge branch 'sh-improve-system-hook-spec' into 'master'Stan Hu2018-08-221-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Improve system hook spec in spec/services/git_push_service_spec.rbStan Hu2018-08-221-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'dz-bump-gitlab-svg' into 'master'50575-instance-statistics-should-be-available-without-usage-pingFilipa Lacerda2018-08-222-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update gitlab-svgs to 1.2.8Dmitriy Zaporozhets2018-08-222-2/+6
|/ / / /
* | | | Merge branch 'sh-conditional-system-hook-push' into 'master'Sean McGivern2018-08-223-4/+12
|\ \ \ \
| * | | | Eliminate unnecessary and duplicate system hook firesStan Hu2018-08-213-4/+12
* | | | | Merge branch 'ide-file-templates-store' into 'master'Filipa Lacerda2018-08-2211-0/+591
|\ \ \ \ \
| * | | | | added rewire comment to action default exportide-file-templates-storePhil Hughes2018-08-211-0/+1
| * | | | | fixed static-analysisPhil Hughes2018-08-171-0/+6
| * | | | | Added store for file templates in the Web IDEPhil Hughes2018-08-1710-0/+584
* | | | | | Merge branch 'qa-317' into 'master'Rémy Coutable2018-08-224-4/+4
|\ \ \ \ \ \
| * | | | | | [QA] Fix a 'superclass must be a Class' errorRémy Coutable2018-08-224-4/+4
* | | | | | | Merge branch 'yisiliang/gitlab-ce-avoid-nil-safe_message' into 'master'Rémy Coutable2018-08-223-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix changelog's MR referenceSean McGivern2018-08-211-1/+1
| * | | | | | | Make it clearer when Commit#description returns no_commit_messageSean McGivern2018-08-212-9/+7
| * | | | | | | add 16889 MR change log, Avoid nil safe message.yisiliang2018-08-211-0/+5
| * | | | | | | to avoid “NoMethodError (undefined method `split' for nil:NilClass)” whil...yisiliang2018-08-211-0/+5
| * | | | | | | use #blank? instead #nil?yisiliang2018-08-211-1/+1
| * | | | | | | to avoid “NoMethodError (undefined method `split' for nil:NilClass)” whil...yisiliang2018-08-211-1/+5
* | | | | | | | Merge branch 'sh-bump-fog-google' into 'master'Rémy Coutable2018-08-225-15/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-googleStan Hu2018-08-215-15/+20
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '41441-add-target-branch-name-to-cherrypick-confirmation' into '...Sean McGivern2018-08-224-6/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix failing testGeorge Andrinopoulos2018-08-201-1/+1
View Lorry Controller Status