summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'ci-services-migrate' into 'master' Kamil TrzciƄski2015-12-1476-1742/+756
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix migrations [ci skip]Kamil Trzcinski2015-12-144-10/+19
| |/ / /
| * | | Fix indentation and BuildsEmailServiceci-services-migrateKamil Trzcinski2015-12-112-6/+5
| * | | Change default valuesKamil Trzcinski2015-12-115-11/+29
| * | | Enhance migrate CI emailsKamil Trzcinski2015-12-111-4/+23
| * | | Fix issue tracker serviceKamil Trzcinski2015-12-101-11/+7
| * | | Fix specsKamil Trzcinski2015-12-105-11/+12
| * | | Migrate SlackService and HipChat serviceKamil Trzcinski2015-12-107-1/+72
| * | | Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-106-6/+55
| * | | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1073-1750/+602
* | | | Merge branch 'use-gitlab-workhorse-in-doc' into 'master' Stan Hu2015-12-141-1/+1
|\ \ \ \
| * | | | Rename mention of gitlab-git-http-server to gitlab-workhorseStan Hu2015-12-141-1/+1
* | | | | Merge branch 'improve_emoji'Valery Sizov2015-12-142-1/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add hover-state for emoji in emoji-pickerimprove_emojiValery Sizov2015-12-112-1/+21
| | |/ / | |/| |
* | | | Merge branch 'fix-shared-runner-wording' into 'master' Robert Speicher2015-12-121-2/+2
|\ \ \ \
| * | | | Fix wording on runner setup pagePelle2015-12-121-2/+2
* | | | | Merge branch 'requires-redis-2.6' into 'master' Gabriel Mazetto2015-12-124-5/+22
|\ \ \ \ \
| * | | | | Bump Redis requirement to 2.8 for Sidekiq 4 requirementsStan Hu2015-12-124-5/+22
|/ / / / /
* | | | | Merge branch 'custom-saml-button-label' into 'master' Achilleas Pipinellis2015-12-121-2/+3
|\ \ \ \ \
| * | | | | add details on how to change saml button labelBen Bodenmiller2015-12-111-2/+3
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-12-111-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'clarify_ci_caching' into 'master' Achilleas Pipinellis2015-12-111-0/+3
| |\ \ \ \ \
| | * | | | | Clarify cache behaviorDrew Blessing2015-12-111-0/+3
* | | | | | | Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messagesStan Hu2015-12-111-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make sure notify email always has author info.Jason Lee2015-11-181-0/+2
* | | | | | | Merge branch 'ui-right-sidebar' into 'master' Dmitriy Zaporozhets2015-12-1120-298/+364
|\ \ \ \ \ \ \
| * | | | | | | Fix testsDmitriy Zaporozhets2015-12-111-1/+1
| * | | | | | | Move awards back to gray panel and few improvements to sidebarDmitriy Zaporozhets2015-12-117-6/+7
| * | | | | | | Few UI improvements to new sidebar implementationDmitriy Zaporozhets2015-12-113-8/+13
| * | | | | | | Fix tests for new issuable sidebarDmitriy Zaporozhets2015-12-112-14/+30
| * | | | | | | Update changelogDmitriy Zaporozhets2015-12-111-0/+1
| * | | | | | | Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-1110-92/+82
| * | | | | | | Make edit link on issuable sidebar worksDmitriy Zaporozhets2015-12-111-2/+8
| * | | | | | | Redesign issue page for new sidebarDmitriy Zaporozhets2015-12-116-198/+97
| * | | | | | | Move awards css to separate fileDmitriy Zaporozhets2015-12-111-0/+68
| * | | | | | | Implement issuable sidebar partialDmitriy Zaporozhets2015-12-111-0/+80
* | | | | | | | Merge branch 'fix-typo' into 'master' Robert Speicher2015-12-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix typoZeger-Jan van de Weg2015-12-101-1/+1
* | | | | | | | Update CHANGELOGRobert Speicher2015-12-111-0/+1
* | | | | | | | Merge branch 'mr-statuses' into 'master' Robert Speicher2015-12-116-1/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-116-1/+59
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'revert-2037' into 'master' Dmitriy Zaporozhets2015-12-114-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-114-2/+6
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'Robert Speicher2015-12-114-8/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-0/+1
| * | | | | | | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-103-8/+45
* | | | | | | | Merge branch 'feature/project_js_from_ee' into 'master' Douwe Maan2015-12-111-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Aling project js with EEBorja Aparicio2015-12-101-2/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-1110-156/+368
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Mix url helpers in into `RepositoryPush`Grzegorz Bizon2015-12-111-9/+10