summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-16113-852/+1544
|\
| * Merge pull request #9740 from ashleyhindle/patch-1Stan Hu2015-10-151-1/+1
| |\
| | * Changed loose to loseAshley Hindle2015-10-161-1/+1
| |/
| * Merge branch 'when-syntax' into 'master' Robert Speicher2015-10-1610-126/+283
| |\
| | * Correct spec description typoRobert Speicher2015-10-151-1/+1
| | * Update CI YAML docswhen-syntaxRobert Speicher2015-10-151-4/+5
| | * Shut up, RubocopRobert Speicher2015-10-151-1/+1
| | * Backticks around when typesKamil Trzcinski2015-10-151-1/+1
| | * Fix specsKamil Trzcinski2015-10-153-5/+6
| | * Implement when syntax in .gitlab-ci.ymlKamil Trzcinski2015-10-1510-124/+279
| * | Remove 8.0-only steps from the 8.1 update guideRobert Speicher2015-10-151-89/+9
| * | Remove notes about CI migration from 8.1 update guideRobert Speicher2015-10-151-10/+3
| |/
| * Merge branch 'sentences-end-in-periods' into 'master' Robert Speicher2015-10-151-1/+2
| |\
| | * Sentences end in periods.sentences-end-in-periodsDouwe Maan2015-10-151-1/+2
| * | Merge branch 'rs-prepare-8-1-0' into 'master' Robert Speicher2015-10-152-2/+230
| |\ \
| | * | Add 8.0-to-8.1 update guideRobert Speicher2015-10-151-0/+228
| | * | Update Installation doc for 8-1-stableRobert Speicher2015-10-151-2/+2
| * | | Merge branch 'update-redcarpet' into 'master' Robert Speicher2015-10-152-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Update redcarpet gem. Fixes gem memory leakupdate-redcarpetDmitriy Zaporozhets2015-10-152-3/+3
| * | | Merge branch 'build-view-ui-fixes' into 'master' Kamil TrzciƄski2015-10-153-6/+7
| |\ \ \ | | |/ / | |/| |
| | * | Added missing comma [ci skip]Kamil Trzcinski2015-10-151-1/+1
| | * | Make the builds view and warning notice nicerKamil Trzcinski2015-10-153-6/+7
| |/ /
| * | Merge branch 'rs-markdown-typography' into 'master' Dmitriy Zaporozhets2015-10-156-36/+28
| |\ \
| | * | Update highlight themes so they always have the correct colorsrs-markdown-typographyRobert Speicher2015-10-145-34/+26
| | * | Allow highlight themes to override `pre` colorsRobert Speicher2015-10-141-2/+2
| * | | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'Dmitriy Zaporozhets2015-10-153-2/+16
| |\ \ \
| | * | | Fix bug where merge request comments created by API would not trigger notific...Stan Hu2015-10-103-2/+16
| * | | | Fix builds view count indicatorKamil Trzcinski2015-10-152-5/+5
| * | | | Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-158-53/+259
| |\ \ \ \
| | * | | | Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-158-53/+259
| * | | | | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-155-3/+31
| |\ \ \ \ \
| | * | | | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-155-3/+31
| * | | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-1537-36/+226
| |\ \ \ \ \ \
| | * | | | | | Added documentation on the various profiling toolsview-issue-performanceYorick Peterse2015-10-151-0/+56
| | * | | | | | Fixed Rubocop styling issuesYorick Peterse2015-10-152-5/+5
| | * | | | | | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-152-2/+2
| | * | | | | | Changelog entry for issue page speedupsYorick Peterse2015-10-151-0/+1
| | * | | | | | Don't use link_to/image_tag where not neededYorick Peterse2015-10-153-8/+8
| | * | | | | | Improve ProjectTeam#max_member_access performanceYorick Peterse2015-10-152-3/+39
| | * | | | | | Eager load project associations for notesYorick Peterse2015-10-151-1/+2
| | * | | | | | Eager load note projects when viewing issuesYorick Peterse2015-10-151-1/+4
| | * | | | | | Added rack-lineprof for developmentYorick Peterse2015-10-154-1/+41
| | * | | | | | Added active_record_query_traceYorick Peterse2015-10-153-0/+8
| | * | | | | | Added Bullet to the GemfileYorick Peterse2015-10-153-0/+12
| | * | | | | | Use note.author for issue comment avatarsYorick Peterse2015-10-151-1/+1
| | * | | | | | Eager load various issue/note associationsYorick Peterse2015-10-154-3/+9
| | * | | | | | Re-use User for avatars in link_to_memberYorick Peterse2015-10-152-1/+15
| | * | | | | | Re-use User objects for avatar_icon where possibleYorick Peterse2015-10-1516-17/+17
| | * | | | | | Allow avatar_icon to operate on a UserYorick Peterse2015-10-152-3/+16
| | |/ / / / /
| * | | | | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-1513-253/+62
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |