Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ux/suppress-ci-yml-warning' into 'master' | Grzegorz Bizon | 2015-12-14 | 4 | -4/+14 |
|\ | |||||
| * | Merge branch 'master' into ux/suppress-ci-yml-warning | Grzegorz Bizon | 2015-12-14 | 132 | -2393/+957 |
| |\ | |||||
| * | | Do not display ci build status if builds enabled but no `.gitlab-ci.yml` | Grzegorz Bizon | 2015-12-14 | 3 | -3/+13 |
| * | | Add matcher class to ci status link | Grzegorz Bizon | 2015-12-14 | 1 | -1/+1 |
* | | | Use a new admin runners path when reseting runners token | Grzegorz Bizon | 2015-12-14 | 1 | -1/+1 |
* | | | Merge branch 'master' into ci/persist-registration-token | Grzegorz Bizon | 2015-12-14 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | Fix 500 when viewing specific runners on runners page [ci skip] | Kamil Trzcinski | 2015-12-14 | 2 | -2/+2 |
| * | | | Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master' | Douwe Maan | 2015-12-14 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Minor fix in flow 'Merge when build succeeds' | Zeger-Jan van de Weg | 2015-12-11 | 1 | -1/+1 |
* | | | | Merge branch 'master' into ci/persist-registration-token | Grzegorz Bizon | 2015-12-14 | 164 | -2813/+1450 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'ci-project-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 100 | -1388/+613 |
| |\ \ \ | |||||
| | * | | | Fix runners admin view [ci skip] | Kamil Trzcinski | 2015-12-14 | 1 | -1/+1 |
| | * | | | Run builds from projects with enabled CIci-project-migrate | Kamil Trzcinski | 2015-12-11 | 1 | -1/+1 |
| | * | | | Use Gitlab::Git instead of Ci::Git | Kamil Trzcinski | 2015-12-11 | 2 | -4/+4 |
| | * | | | Fix last specs | Kamil Trzcinski | 2015-12-11 | 1 | -1/+1 |
| | * | | | Fix specs | Kamil Trzcinski | 2015-12-11 | 3 | -7/+9 |
| | * | | | Fix after column rename | Kamil Trzcinski | 2015-12-11 | 3 | -5/+5 |
| | * | | | Fix errors | Kamil Trzcinski | 2015-12-11 | 4 | -6/+2 |
| | * | | | Update badge | Kamil Trzcinski | 2015-12-11 | 1 | -2/+4 |
| | * | | | Finishing touches | Kamil Trzcinski | 2015-12-11 | 5 | -19/+5 |
| | * | | | Reimplement Trigger API | Kamil Trzcinski | 2015-12-11 | 2 | -5/+7 |
| | * | | | Remove ci_ prefix from all ci related things | Kamil Trzcinski | 2015-12-11 | 20 | -64/+67 |
| | * | | | Add runners token | Kamil Trzcinski | 2015-12-11 | 4 | -16/+11 |
| | * | | | Migrate CI::Project to Project | Kamil Trzcinski | 2015-12-11 | 95 | -1341/+580 |
| * | | | | Merge branch 'ci-services-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 43 | -1008/+347 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Fix indentation and BuildsEmailServiceci-services-migrate | Kamil Trzcinski | 2015-12-11 | 2 | -6/+5 |
| | * | | Change default values | Kamil Trzcinski | 2015-12-11 | 5 | -11/+29 |
| | * | | Fix issue tracker service | Kamil Trzcinski | 2015-12-10 | 1 | -11/+7 |
| | * | | Fix specs | Kamil Trzcinski | 2015-12-10 | 1 | -0/+1 |
| | * | | Migrate SlackService and HipChat service | Kamil Trzcinski | 2015-12-10 | 3 | -0/+6 |
| | * | | Migrate CI WebHooks and Emails to new tables | Kamil Trzcinski | 2015-12-10 | 2 | -5/+8 |
| | * | | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 43 | -1008/+324 |
| * | | | Merge branch 'improve_emoji' | Valery Sizov | 2015-12-14 | 1 | -1/+20 |
| |\ \ \ | |||||
| | * | | | Add hover-state for emoji in emoji-pickerimprove_emoji | Valery Sizov | 2015-12-11 | 1 | -1/+20 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'fix-shared-runner-wording' into 'master' | Robert Speicher | 2015-12-12 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix wording on runner setup page | Pelle | 2015-12-12 | 1 | -2/+2 |
| * | | | | Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages | Stan Hu | 2015-12-11 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Make sure notify email always has author info. | Jason Lee | 2015-11-18 | 1 | -0/+2 |
| * | | | | | Merge branch 'ui-right-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 18 | -290/+342 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move awards back to gray panel and few improvements to sidebar | Dmitriy Zaporozhets | 2015-12-11 | 7 | -6/+7 |
| | * | | | | | Few UI improvements to new sidebar implementation | Dmitriy Zaporozhets | 2015-12-11 | 3 | -8/+13 |
| | * | | | | | Fix tests for new issuable sidebar | Dmitriy Zaporozhets | 2015-12-11 | 1 | -7/+10 |
| | * | | | | | Implement new sidebar for merge request page | Dmitriy Zaporozhets | 2015-12-11 | 10 | -92/+82 |
| | * | | | | | Make edit link on issuable sidebar works | Dmitriy Zaporozhets | 2015-12-11 | 1 | -2/+8 |
| | * | | | | | Redesign issue page for new sidebar | Dmitriy Zaporozhets | 2015-12-11 | 6 | -198/+97 |
| | * | | | | | Move awards css to separate file | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+68 |
| | * | | | | | Implement issuable sidebar partial | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+80 |
| * | | | | | | Merge branch 'fix-typo' into 'master' | Robert Speicher | 2015-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fix typo | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
| * | | | | | | Merge branch 'mr-statuses' into 'master' | Robert Speicher | 2015-12-11 | 6 | -1/+59 |
| |\ \ \ \ \ \ |