summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-improvements-2Jacob Vosmaer2015-10-20138-801/+1776
|\
| * Merge pull request #9732 from MauriceMohlek/patch-1Stan Hu2015-10-201-0/+4
| |\
| | * Fix orderMaurice Mohlek2015-10-201-4/+4
| | * Update CHANGELOGMaurice Mohlek2015-10-201-0/+4
| * | Merge branch 'remove-duplicate-repos-in-github-import' into 'master' Douwe Maan2015-10-203-5/+2
| |\ \ | | |/ | |/|
| | * Fix duplicate repositories in GitHub import pageStan Hu2015-10-193-5/+2
| * | Merge pull request #9749 from Bufallo/fix-redis-checkreproduce-500-for-3092Stan Hu2015-10-191-1/+1
| |\ \ | | |/ | |/|
| | * Fix regex in redis version checkBenny Schimmer2015-10-191-1/+1
| |/
| * Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-194-16/+23
| |\
| | * Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1960-180/+577
| | |\
| | * | Add changelog itemgrzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-181-0/+1
| | * | Sentences end in periods.Douwe Maan2015-10-181-2/+2
| | * | Add tooltip.Douwe Maan2015-10-181-1/+1
| | * | Find correct group membership.Douwe Maan2015-10-182-8/+6
| | * | Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-18333-2233/+4832
| | |\ \
| | * | | Show notifications button even if user is not member of a projectGrzegorz Bizon2015-10-122-13/+21
| * | | | Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into 'ma...Robert Speicher2015-10-1911-0/+122
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-1960-180/+577
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Satisfy Rubocopjrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-181-7/+6
| | * | | | Add changelog itemDouwe Maan2015-10-181-0/+1
| | * | | | Add help text to admin settings notification email.Douwe Maan2015-10-181-0/+2
| | * | | | Validate admin notification email.Douwe Maan2015-10-181-0/+4
| | * | | | Fix spec.Douwe Maan2015-10-181-33/+53
| | * | | | Only pass abuse report ID to AbuseReportMailer.Douwe Maan2015-10-182-6/+11
| | * | | | Add HTML abuse report notification email.Douwe Maan2015-10-181-0/+11
| | * | | | Tweak email body.Douwe Maan2015-10-181-3/+3
| | * | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-18492-4234/+7771
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-088-1/+81
| * | | | | Merge branch 'merge-request-widget' into 'master' Dmitriy Zaporozhets2015-10-191-37/+36
| |\ \ \ \ \
| | * | | | | Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
| * | | | | | Merge branch 'index-milestone-title-label' into 'master' Robert Speicher2015-10-196-48/+77
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Rename confusing methodsDouwe Maan2015-10-191-4/+4
| | * | | | | Fix schemazj/gitlab-ce-index-milestone-title-labelDouwe Maan2015-10-181-2/+0
| | * | | | | Merge branch 'master' into zj/gitlab-ce-index-milestone-title-labelDouwe Maan2015-10-1874-559/+1058
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Improve performance of filtering issues by milestoneDouwe Maan2015-10-161-30/+33
| | * | | | | Improve performance of queriesZeger-Jan van de Weg2015-10-163-34/+47
| | * | | | | Add project scope to milestone searchZeger-Jan van de Weg2015-10-161-1/+8
| | * | | | | Minor refactoring in seedingZeger-Jan van de Weg2015-10-164-5/+5
| | * | | | | Add an index to milestones title and label titleZeger-Jan van de Weg2015-10-162-0/+8
| * | | | | | Merge branch 'notify-footer' into 'master' Robert Speicher2015-10-191-0/+4
| |\ \ \ \ \ \
| | * | | | | | Restore notification footer text.notify-footerDouwe Maan2015-10-181-0/+4
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-10-191-1/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'fix-code-leading-indent' into 'master' Dmitriy Zaporozhets2015-10-191-1/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove some padding from code blocks Mike Kelly2015-10-141-2/+1
| * | | | | | | | | Merge branch 'add-files-optionto-changelog'Dmitriy Zaporozhets2015-10-192-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add changelog itemadd-files-optionto-changelogDouwe Maan2015-10-192-0/+3
| * | | | | | | | | Merge branch 'user-page-new-ui' into 'master' Dmitriy Zaporozhets2015-10-197-39/+112
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Partly implement new UI for user pageuser-page-new-uiDmitriy Zaporozhets2015-10-167-39/+112
| * | | | | | | | | | Merge branch 'milestone-issue-sorting-performance' into 'master' Yorick Peterse2015-10-195-5/+79
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Improve performance of sorting milestone issuesYorick Peterse2015-10-195-5/+79
| |/ / / / / / / / /