summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38393-Milestone-duration-error-message-is-not-accurate-enough' ...Sean McGivern2017-11-201-1/+1
|\
| * Changed validation error message on wrong milestone datesXurxo Méndez Pérez2017-11-181-1/+1
* | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-4/+0
|\ \
| * | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-4/+0
* | | Use axios instead of vue resource - step 1Filipa Lacerda2017-11-205-19/+30
* | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2037-0/+47
|\ \ \
| * | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1637-0/+47
* | | | Hide log size in mobileFilipa Lacerda2017-11-202-8/+9
| |_|/ |/| |
* | | Merge branch '4056-hashed-storage-upload-transfers' into 'master'Stan Hu2017-11-171-1/+11
|\ \ \
| * | | Fix project transfer with hashed-storage attachmentsNick Thomas2017-11-171-1/+11
* | | | Merge branch 'improved-changes-dropdown' into 'master'Filipa Lacerda2017-11-175-11/+41
|\ \ \ \ | |_|_|/ |/| | |
| * | | moved magic number into variablesimproved-changes-dropdownPhil Hughes2017-11-171-1/+2
| * | | changed text color of pathPhil Hughes2017-11-171-0/+1
| * | | updated dropdown widthPhil Hughes2017-11-171-1/+1
| * | | updated to use new sprite iconsPhil Hughes2017-11-173-4/+6
| * | | Improved the design of the changed files dropdownPhil Hughes2017-11-173-8/+34
| |/ /
* | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-174-22/+74
|\ \ \ | |/ / |/| |
| * | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-171-2/+4
| * | Applied some code review commentsFrancisco Lopez2017-11-171-2/+1
| * | Some fixes after rebaseFrancisco Lopez2017-11-171-24/+0
| * | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-171-1/+1
| * | Add request throttlesMichael Kozono2017-11-173-2/+70
| * | Add throttle application settingsMichael Kozono2017-11-171-0/+9
* | | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-173-7/+17
* | | Merge branch 'sh-port-hashed-storage-transfer-fix' into 'master'Nick Thomas2017-11-171-9/+17
|\ \ \
| * | | Fix hashed storage with project transfers to another namespacesh-port-hashed-storage-transfer-fixStan Hu2017-11-161-9/+17
| |/ /
* | | Merge branch 'bvl-delete-empty-fork-networks' into 'master'Douwe Maan2017-11-171-0/+10
|\ \ \
| * | | Delete the fork network when removing the last membershipBob Van Landuyt2017-11-171-0/+10
| |/ /
* | | Merge branch 'ci-pipeline-status-query' into 'master'Kamil Trzciński2017-11-177-26/+117
|\ \ \
| * | | Optimise getting the pipeline status of commitsci-pipeline-status-queryYorick Peterse2017-11-167-26/+117
* | | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-176-15/+25
* | | | Exports a couple of project related code as es6 modulesFilipa Lacerda2017-11-178-311/+272
* | | | Merge branch 'rc/use-existing-url-helper' into 'master'Grzegorz Bizon2017-11-172-6/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace ci_status_path with pipeline_pathrc/use-existing-url-helperRémy Coutable2017-11-142-6/+1
* | | | Resolve "lock/confidential issuable sidebar custom svg icons iteration"Luke "Jared" Bennett2017-11-168-57/+93
* | | | Merge branch 'cache-user-keys-count' into 'master'Douwe Maan2017-11-168-28/+81
|\ \ \ \
| * | | | Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-168-28/+81
| | |/ / | |/| |
* | | | Merge branch 'brand_header_change' into 'master'Annabel Dunstone Gray2017-11-163-2/+9
|\ \ \ \
| * | | | When a custom header logo is present, don't show GitLab type logoDrew Blessing2017-11-153-2/+9
* | | | | Merge branch 'dm-notes-actions-noteable-for-update' into 'master'Sean McGivern2017-11-162-3/+8
|\ \ \ \ \
| * | | | | Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-updateDouwe Maan2017-11-162-3/+8
| |/ / / /
* | | | | Merge branch 'backport-delete-epic' into 'master'Filipa Lacerda2017-11-165-6/+40
|\ \ \ \ \
| * | | | | Backport delete epic changesbackport-delete-epicClement Ho2017-11-155-6/+40
* | | | | | Resolve "Clicking on GPG verification badge jumps to top of the page"Mike Greiling2017-11-162-2/+2
|/ / / / /
* | | | | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'Filipa Lacerda2017-11-158-1031/+1058
|\ \ \ \ \
| * | | | | Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojioneEric Eastwood2017-11-152-2/+0
| * | | | | Add rainbow_flag to emoji support mapEric Eastwood2017-11-152-6/+31
| * | | | | Regenerate emoji digests with latest gemojioneEric Eastwood2017-11-148-1025/+1029
* | | | | | Merge branch 'tree_item_limit' into 'master'Douwe Maan2017-11-153-4/+25
|\ \ \ \ \ \
| * | | | | | Truncate tree to max 1,000 items and display notice to usersDrew Blessing2017-11-153-4/+25
| | |/ / / / | |/| | | |