summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-10-7-users-can-update-their-password-without-entering-...Filipa Lacerda2018-05-251-2/+0
* Merge branch '10-7-stable-patch-3' into '10-7-stable'Robert Speicher2018-05-0217-105/+126
|\
| * Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-05-022-2/+2
| * Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-023-4/+3
| * Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-024-75/+76
| * Merge branch 'issue_45463' into 'master'Sean McGivern2018-05-021-2/+6
| * Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-05-025-20/+32
| * Merge branch '44775-avatar-on-os-fails-with-cdn' into 'master'John Northrup2018-05-022-2/+7
* | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-251-2/+3
* | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-241-1/+2
|/
* Merge branch '45514-resolved-table' into 'master'Filipa Lacerda2018-04-201-1/+1
* Merge branch 'issue_45435' into 'master'Phil Hughes2018-04-201-0/+2
* Merge branch 'fj-42601-respect-visibility-options' into 'master'Douwe Maan2018-04-201-1/+2
* Merge branch 'fix-direct-upload-for-old-records' into 'master'Grzegorz Bizon2018-04-203-16/+23
* Merge branch '45507-fix-repository-archive-url' into 'master'Douwe Maan2018-04-201-5/+6
* Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'Yorick Peterse2018-04-201-1/+1
* Merge branch 'ide-subgroup-fix' into 'master'Filipa Lacerda2018-04-201-2/+2
* Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master'Filipa Lacerda2018-04-202-5/+1
* Merge branch 'ide-tree-loading-fix' into 'master'Filipa Lacerda2018-04-201-6/+2
* Merge branch '45406-error-getting-performance-bar-results-for-uuid-regularly-...Phil Hughes2018-04-201-17/+13
* Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-207-18/+21
* Merge branch '44294-skeleton-lines' into 'master'Phil Hughes2018-04-203-65/+31
* Merge branch '45353-raw-html-is-being-shown-on-the-mr-page-from-performance-w...Mike Greiling2018-04-201-2/+2
* Merge branch 'ide-mr-changes-alert-box' into 'master'Filipa Lacerda2018-04-201-44/+26
* Merge branch 'ide-firefox-scroll-fix' into 'master'Filipa Lacerda2018-04-201-1/+2
* Merge branch 'changes-bar-peek-id-change' into 'master'Filipa Lacerda2018-04-201-28/+21
* Merge branch '45287-align-icons' into 'master'Phil Hughes2018-04-201-7/+1
* Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-1815-41/+41
* Revert "Merge branch '45473-temporary-fix-for-ci-register-jobs-service' into ...Robert Speicher2018-04-181-1/+1
* Merge branch '45456-improve-performance-of-cicd-jobs-request' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-1/+1
* Merge branch '45473-temporary-fix-for-ci-register-jobs-service' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-1/+1
* Merge branch '45271-collpased-diff-loading' into 'master'Phil Hughes2018-04-175-17/+62
* Merge branch '10-7-stable-prepare-rc6-fix-conflict-18366' into '10-7-stable-p...Dmitriy Zaporozhets2018-04-174-13/+14
|\
| * Fix conflict in app/controllers/admin/application_settings_controller.rbDmitriy Zaporozhets2018-04-171-11/+0
| * Merge branch 'dz-fix-admin-import-sources' into 'master'Douwe Maan2018-04-174-5/+17
* | Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-1751-198/+283
* | Merge branch 'sh-memoize-repository-empty' into 'master'Grzegorz Bizon2018-04-171-0/+1
* | Merge branch '45269-double-checked-internal-ids' into 'master'Yorick Peterse2018-04-171-4/+20
* | Merge branch 'revert-93869c63' into 'master'Filipa Lacerda2018-04-176-26/+47
|/
* Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'Marin Jankovski2018-04-121-1/+1
* Merge branch 'ide-markdown-temp-file-fix' into 'master'Tim Zallmann2018-04-121-2/+2
* Merge branch 'ab-37125-assigned-issues-query' into 'master'Yorick Peterse2018-04-101-4/+7
* Merge branch 'revert-e9e800f5' into 'master'Marin Jankovski2018-04-101-17/+2
* Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipient...Yorick Peterse2018-04-1015-41/+41
* Merge branch 'deploy-tokens-container-registry-specs' into 'master'Kamil Trzciński2018-04-102-2/+3
* Merge branch 'sh-fix-issue-45152' into 'master'Grzegorz Bizon2018-04-102-2/+2
* Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan2018-04-101-2/+7
* Projects and groups badges settings UIFrancisco Javier López2018-04-0826-9/+1050
* Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-067-40/+14
* Handles default expires_at date directly into DeployToken modelMayra Cabrera2018-04-063-4/+6