summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-master' into markdown-previewVinnie Okada2014-12-07417-2204/+6299
|\
| * Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master'Dmitriy Zaporozhets2014-12-072-4/+10
| |\
| | * Add an avatar_url spec when relative url is set.Marin Jankovski2014-12-051-0/+10
| | * Revert "Merge pull request #7349 from srna/patch-1"Marin Jankovski2014-12-051-4/+0
| * | Merge branch 'improved-monokai' into 'master'Dmitriy Zaporozhets2014-12-072-10/+22
| |\ \
| | * | Improve Monokai highlight style to match originalMark Riedesel2014-12-012-10/+22
| * | | Merge branch 'improve-activity-ui' into 'master'Dmitriy Zaporozhets2014-12-071-7/+3
| |\ \ \
| | * | | Bolder event title and lighter color for event bodyDmitriy Zaporozhets2014-12-061-7/+3
| * | | | Merge branch 'small-fixes' into 'master'Dmitriy Zaporozhets2014-12-072-6/+16
| |\ \ \ \
| | * | | | Decline push if repository does not existDmitriy Zaporozhets2014-12-051-3/+12
| | * | | | Prevent 500 on MR page if merge_event missingDmitriy Zaporozhets2014-12-051-3/+4
| * | | | | Merge branch 'async-services' into 'master'Dmitriy Zaporozhets2014-12-073-8/+15
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Execute project services asynchronouslyDmitriy Zaporozhets2014-12-073-8/+15
| |/ / / /
| * | | | Update CHANGELOGDmitriy Zaporozhets2014-12-051-1/+1
| * | | | Merge branch 'author-filter' into 'master'Dmitriy Zaporozhets2014-12-058-151/+166
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | More tests for issues finderDmitriy Zaporozhets2014-12-051-29/+52
| | * | | Add author filter for issues & merge requests pagesDmitriy Zaporozhets2014-12-055-23/+62
| | * | | Move issues/mr filter to partialDmitriy Zaporozhets2014-12-053-99/+52
| |/ / /
| * | | Merge branch 'mr-lock-problem' into 'master'Dmitriy Zaporozhets2014-12-055-3/+30
| |\ \ \
| | * | | Automatically close merge requests that were locker for 1 dayDmitriy Zaporozhets2014-12-053-2/+13
| | * | | Set/unset merge request locked_at timestamp after transitionDmitriy Zaporozhets2014-12-051-0/+10
| | * | | Add locked_at to merge requestDmitriy Zaporozhets2014-12-052-1/+7
| * | | | Merge branch 'doc/snapshot_backups' into 'master'Sytse Sijbrandij2014-12-051-0/+23
| |\ \ \ \
| | * | | | Add snapshot backup tipsJacob Vosmaer2014-12-051-0/+23
| |/ / / /
| * | | | Merge branch 'release_docs_improvements' into 'master'Dmitriy Zaporozhets2014-12-052-1/+3
| |\ \ \ \
| | * | | | Update release docs to deploy to GitLab.com before publishing.Marin Jankovski2014-12-052-1/+3
| | |/ / /
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2014-12-0548-177/+444
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '512mb-memory-description' into 'master'Marin Jankovski2014-12-051-6/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Reword the 512 memmory advise.Sytse Sijbrandij2014-12-041-6/+6
| | * | | Merge branch 'rake_task_for_google_email_schema_verfication' into 'master'Dmitriy Zaporozhets2014-12-054-0/+125
| | |\ \ \
| | | * | | Add rake task for google schema whitelisting.Marin Jankovski2014-12-044-0/+125
| | * | | | Merge branch 'dev-rake-task-docs' into 'master'Dmitriy Zaporozhets2014-12-041-1/+5
| | |\ \ \ \
| | | * | | | Remove warning from db seed since it is called by db setup.Sytse Sijbrandij2014-12-042-7/+2
| | | * | | | Seed is not seed dump.Sytse Sijbrandij2014-12-041-5/+3
| | | * | | | Fix notifications for developers that don't read the documentation.Sytse Sijbrandij2014-12-042-1/+12
| | | |/ / /
| | * | | | Merge branch 'refactor-atom-code' into 'master'Dmitriy Zaporozhets2014-12-048-102/+56
| | |\ \ \ \
| | | * | | | DRY and refactor atom codeDmitriy Zaporozhets2014-12-048-102/+56
| | * | | | | Merge branch 'atom-feed-for-user' into 'master'Dmitriy Zaporozhets2014-12-046-4/+90
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Feature: atom feed for user activityDmitriy Zaporozhets2014-12-046-4/+90
| | |/ / / /
| | * | | | Merge branch 'sidekiq-2.17.8' into 'master'Dmitriy Zaporozhets2014-12-043-11/+12
| | |\ \ \ \
| | | * | | | Update Sidekiq to 2.17.8Jacob Vosmaer2014-12-043-11/+12
| | |/ / / /
| | * | | | Merge branch 'prevent-500-test-webhook' into 'master'Dmitriy Zaporozhets2014-12-043-4/+8
| | |\ \ \ \
| | | * | | | Handle web hook exceptionDmitriy Zaporozhets2014-12-043-4/+8
| | | |/ / /
| | * | | | Merge branch 'multi_provider' into 'master'Dmitriy Zaporozhets2014-12-0424-70/+163
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | fix specsValery Sizov2014-12-044-13/+16
| | | * | | added helperValery Sizov2014-12-043-1/+22
| | | * | | Supporting for multiple omniauth provider for the same userValery Sizov2014-12-0420-127/+123
| | | * | | Multi-provider auth. LDAP is not reworkedValery Sizov2014-12-048-50/+123
| * | | | | Update favorites to the new link.Sytse Sijbrandij2014-12-051-1/+1
| |/ / / /
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2014-12-048-24/+43
| |\ \ \ \