summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Fix builds view count indicatorKamil Trzcinski2015-10-152-5/+5
* | Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-155-11/+44
|\ \
| * | Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-155-11/+44
* | | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-151-2/+8
|\ \ \
| * | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-151-2/+8
* | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-1526-35/+62
|\ \ \ \
| * | | | Fixed Rubocop styling issuesYorick Peterse2015-10-151-1/+1
| * | | | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-152-2/+2
| * | | | Don't use link_to/image_tag where not neededYorick Peterse2015-10-153-8/+8
| * | | | Improve ProjectTeam#max_member_access performanceYorick Peterse2015-10-151-3/+16
| * | | | Eager load project associations for notesYorick Peterse2015-10-151-1/+2
| * | | | Eager load note projects when viewing issuesYorick Peterse2015-10-151-1/+4
| * | | | 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-151-1/+1
| * | | | Re-use User objects for avatar_icon where possibleYorick Peterse2015-10-1516-17/+17
| * | | | Allow avatar_icon to operate on a UserYorick Peterse2015-10-151-3/+7
| |/ / /
* | | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-153-56/+8
|\ \ \ \
| * \ \ \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-15211-1922/+2231
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Always return HTML in git_not_foundJacob Vosmaer2015-10-141-1/+1
| * | | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-082-55/+7
* | | | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-1515-7/+171
|\ \ \ \ \
| * | | | | Remove unneeded changebuilds-viewKamil Trzcinski2015-10-152-3/+3
| * | | | | Fix cancel_all specsKamil Trzcinski2015-10-141-1/+1
| * | | | | Fix specsKamil Trzcinski2015-10-142-7/+7
| * | | | | Refactor builds viewKamil Trzcinski2015-10-145-31/+32
| * | | | | Remove ordering from :ci_commits relationKamil Trzcinski2015-10-143-2/+4
| * | | | | Added builds viewKamil Trzcinski2015-10-1412-6/+167
* | | | | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix error preventing displaying of commit data for a directory with a leading...Stan Hu2015-10-121-0/+7
* | | | | | Merge branch 'rs-issues_sentence' into 'master' Douwe Maan2015-10-151-1/+1
|\ \ \ \ \ \
| * | | | | | Simplify the `issues_sentence` helperrs-issues_sentenceRobert Speicher2015-10-141-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs-mr-tabs-scroll' into 'master' Douwe Maan2015-10-151-4/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Prevent a JS error in MergeRequestTabsrs-mr-tabs-scrollRobert Speicher2015-10-141-4/+4
| * | | | | Merge branch 'fix/improve_reset_service_password' into 'master' Valery Sizov2015-10-145-10/+42
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Improve invalidation of stored service password if the endpoint URL is changedAlex Lossent2015-10-145-10/+42
* | | | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-1412-94/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Make Mentionable#cross_reference_exists? private.simplify-cross-referencesDouwe Maan2015-10-141-6/+6
| * | | | | Remove useless assignmentDouwe Maan2015-10-121-1/+1
| * | | | | Chaining ftwDouwe Maan2015-10-121-5/+1
| * | | | | Fix cross-references originating from notesDouwe Maan2015-10-124-20/+7
| * | | | | Simplify code around (cross)-referencesDouwe Maan2015-10-1210-69/+49
* | | | | | Merge branch 'show_pending_warning' into 'master' Kamil Trzciński2015-10-1410-23/+76
|\ \ \ \ \ \
| * | | | | | Fix warning signshow_pending_warningKamil Trzcinski2015-10-143-6/+5
| * | | | | | Show warning if build doesn't have runners with specified tags or runners did...Kamil Trzcinski2015-10-1410-22/+76
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'predefined_build_variables' into 'master' Kamil Trzciński2015-10-141-1/+10
|\ \ \ \ \ \
| * | | | | | Use tag? instead of tag to indicate that this is booleanpredefined_build_variablesKamil Trzcinski2015-10-141-1/+1