summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-144-4/+14
|\
| * Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-14132-2393/+957
| |\
| * | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-143-3/+13
| * | Add matcher class to ci status linkGrzegorz Bizon2015-12-141-1/+1
* | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
* | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-143-3/+3
|\ \ \
| * | | Fix 500 when viewing specific runners on runners page [ci skip]Kamil Trzcinski2015-12-142-2/+2
| * | | Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master' Douwe Maan2015-12-141-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Minor fix in flow 'Merge when build succeeds'Zeger-Jan van de Weg2015-12-111-1/+1
* | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-14164-2813/+1450
|\ \ \ \ | |/ / /
| * | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-14100-1388/+613
| |\ \ \
| | * | | Fix runners admin view [ci skip]Kamil Trzcinski2015-12-141-1/+1
| | * | | Run builds from projects with enabled CIci-project-migrateKamil Trzcinski2015-12-111-1/+1
| | * | | Use Gitlab::Git instead of Ci::GitKamil Trzcinski2015-12-112-4/+4
| | * | | Fix last specsKamil Trzcinski2015-12-111-1/+1
| | * | | Fix specsKamil Trzcinski2015-12-113-7/+9
| | * | | Fix after column renameKamil Trzcinski2015-12-113-5/+5
| | * | | Fix errorsKamil Trzcinski2015-12-114-6/+2
| | * | | Update badgeKamil Trzcinski2015-12-111-2/+4
| | * | | Finishing touchesKamil Trzcinski2015-12-115-19/+5
| | * | | Reimplement Trigger APIKamil Trzcinski2015-12-112-5/+7
| | * | | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-1120-64/+67
| | * | | Add runners tokenKamil Trzcinski2015-12-114-16/+11
| | * | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1195-1341/+580
| * | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-1443-1008/+347
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fix indentation and BuildsEmailServiceci-services-migrateKamil Trzcinski2015-12-112-6/+5
| | * | Change default valuesKamil Trzcinski2015-12-115-11/+29
| | * | Fix issue tracker serviceKamil Trzcinski2015-12-101-11/+7
| | * | Fix specsKamil Trzcinski2015-12-101-0/+1
| | * | Migrate SlackService and HipChat serviceKamil Trzcinski2015-12-103-0/+6
| | * | Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-102-5/+8
| | * | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1043-1008/+324
| * | | Merge branch 'improve_emoji'Valery Sizov2015-12-141-1/+20
| |\ \ \
| | * | | Add hover-state for emoji in emoji-pickerimprove_emojiValery Sizov2015-12-111-1/+20
| | | |/ | | |/|
| * | | 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 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-1118-290/+342
| |\ \ \ \ \
| | * | | | | 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-111-7/+10
| | * | | | | 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
| * | | | | | Merge branch 'mr-statuses' into 'master' Robert Speicher2015-12-116-1/+59
| |\ \ \ \ \ \