Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-master' into markdown-preview | Vinnie Okada | 2014-12-07 | 417 | -2204/+6299 |
|\ | |||||
| * | Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master' | Dmitriy Zaporozhets | 2014-12-07 | 2 | -4/+10 |
| |\ | |||||
| | * | Add an avatar_url spec when relative url is set. | Marin Jankovski | 2014-12-05 | 1 | -0/+10 |
| | * | Revert "Merge pull request #7349 from srna/patch-1" | Marin Jankovski | 2014-12-05 | 1 | -4/+0 |
| * | | Merge branch 'improved-monokai' into 'master' | Dmitriy Zaporozhets | 2014-12-07 | 2 | -10/+22 |
| |\ \ | |||||
| | * | | Improve Monokai highlight style to match original | Mark Riedesel | 2014-12-01 | 2 | -10/+22 |
| * | | | Merge branch 'improve-activity-ui' into 'master' | Dmitriy Zaporozhets | 2014-12-07 | 1 | -7/+3 |
| |\ \ \ | |||||
| | * | | | Bolder event title and lighter color for event body | Dmitriy Zaporozhets | 2014-12-06 | 1 | -7/+3 |
| * | | | | Merge branch 'small-fixes' into 'master' | Dmitriy Zaporozhets | 2014-12-07 | 2 | -6/+16 |
| |\ \ \ \ | |||||
| | * | | | | Decline push if repository does not exist | Dmitriy Zaporozhets | 2014-12-05 | 1 | -3/+12 |
| | * | | | | Prevent 500 on MR page if merge_event missing | Dmitriy Zaporozhets | 2014-12-05 | 1 | -3/+4 |
| * | | | | | Merge branch 'async-services' into 'master' | Dmitriy Zaporozhets | 2014-12-07 | 3 | -8/+15 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Execute project services asynchronously | Dmitriy Zaporozhets | 2014-12-07 | 3 | -8/+15 |
| |/ / / / | |||||
| * | | | | Update CHANGELOG | Dmitriy Zaporozhets | 2014-12-05 | 1 | -1/+1 |
| * | | | | Merge branch 'author-filter' into 'master' | Dmitriy Zaporozhets | 2014-12-05 | 8 | -151/+166 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | More tests for issues finder | Dmitriy Zaporozhets | 2014-12-05 | 1 | -29/+52 |
| | * | | | Add author filter for issues & merge requests pages | Dmitriy Zaporozhets | 2014-12-05 | 5 | -23/+62 |
| | * | | | Move issues/mr filter to partial | Dmitriy Zaporozhets | 2014-12-05 | 3 | -99/+52 |
| |/ / / | |||||
| * | | | Merge branch 'mr-lock-problem' into 'master' | Dmitriy Zaporozhets | 2014-12-05 | 5 | -3/+30 |
| |\ \ \ | |||||
| | * | | | Automatically close merge requests that were locker for 1 day | Dmitriy Zaporozhets | 2014-12-05 | 3 | -2/+13 |
| | * | | | Set/unset merge request locked_at timestamp after transition | Dmitriy Zaporozhets | 2014-12-05 | 1 | -0/+10 |
| | * | | | Add locked_at to merge request | Dmitriy Zaporozhets | 2014-12-05 | 2 | -1/+7 |
| * | | | | Merge branch 'doc/snapshot_backups' into 'master' | Sytse Sijbrandij | 2014-12-05 | 1 | -0/+23 |
| |\ \ \ \ | |||||
| | * | | | | Add snapshot backup tips | Jacob Vosmaer | 2014-12-05 | 1 | -0/+23 |
| |/ / / / | |||||
| * | | | | Merge branch 'release_docs_improvements' into 'master' | Dmitriy Zaporozhets | 2014-12-05 | 2 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | Update release docs to deploy to GitLab.com before publishing. | Marin Jankovski | 2014-12-05 | 2 | -1/+3 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Sytse Sijbrandij | 2014-12-05 | 48 | -177/+444 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch '512mb-memory-description' into 'master' | Marin Jankovski | 2014-12-05 | 1 | -6/+6 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Reword the 512 memmory advise. | Sytse Sijbrandij | 2014-12-04 | 1 | -6/+6 |
| | * | | | Merge branch 'rake_task_for_google_email_schema_verfication' into 'master' | Dmitriy Zaporozhets | 2014-12-05 | 4 | -0/+125 |
| | |\ \ \ | |||||
| | | * | | | Add rake task for google schema whitelisting. | Marin Jankovski | 2014-12-04 | 4 | -0/+125 |
| | * | | | | Merge branch 'dev-rake-task-docs' into 'master' | Dmitriy Zaporozhets | 2014-12-04 | 1 | -1/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | Remove warning from db seed since it is called by db setup. | Sytse Sijbrandij | 2014-12-04 | 2 | -7/+2 |
| | | * | | | | Seed is not seed dump. | Sytse Sijbrandij | 2014-12-04 | 1 | -5/+3 |
| | | * | | | | Fix notifications for developers that don't read the documentation. | Sytse Sijbrandij | 2014-12-04 | 2 | -1/+12 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'refactor-atom-code' into 'master' | Dmitriy Zaporozhets | 2014-12-04 | 8 | -102/+56 |
| | |\ \ \ \ | |||||
| | | * | | | | DRY and refactor atom code | Dmitriy Zaporozhets | 2014-12-04 | 8 | -102/+56 |
| | * | | | | | Merge branch 'atom-feed-for-user' into 'master' | Dmitriy Zaporozhets | 2014-12-04 | 6 | -4/+90 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Feature: atom feed for user activity | Dmitriy Zaporozhets | 2014-12-04 | 6 | -4/+90 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'sidekiq-2.17.8' into 'master' | Dmitriy Zaporozhets | 2014-12-04 | 3 | -11/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | Update Sidekiq to 2.17.8 | Jacob Vosmaer | 2014-12-04 | 3 | -11/+12 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'prevent-500-test-webhook' into 'master' | Dmitriy Zaporozhets | 2014-12-04 | 3 | -4/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | Handle web hook exception | Dmitriy Zaporozhets | 2014-12-04 | 3 | -4/+8 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'multi_provider' into 'master' | Dmitriy Zaporozhets | 2014-12-04 | 24 | -70/+163 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | fix specs | Valery Sizov | 2014-12-04 | 4 | -13/+16 |
| | | * | | | added helper | Valery Sizov | 2014-12-04 | 3 | -1/+22 |
| | | * | | | Supporting for multiple omniauth provider for the same user | Valery Sizov | 2014-12-04 | 20 | -127/+123 |
| | | * | | | Multi-provider auth. LDAP is not reworked | Valery Sizov | 2014-12-04 | 8 | -50/+123 |
| * | | | | | Update favorites to the new link. | Sytse Sijbrandij | 2014-12-05 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Sytse Sijbrandij | 2014-12-04 | 8 | -24/+43 |
| |\ \ \ \ |