summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fall back to gzip when zopfli compression is unavailablefall-back-to-gzip-when-missing-optional-depsMike Greiling2017-06-091-1/+10
* Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-088-66/+43
|\
| * Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-088-79/+68
* | Merge branch 'dm-highlight-diff-file-blob' into 'master'Sean McGivern2017-06-085-54/+54
|\ \
| * | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-085-54/+54
* | | Merge branch 'docs/shared-runners' into 'master'Sean Packham2017-06-084-78/+136
|\ \ \
| * | | Refactor Runners docsdocs/shared-runnersAchilleas Pipinellis2017-06-074-78/+136
* | | | Merge branch 'docs/rm-protected-branches' into 'master'Sean Packham2017-06-082-0/+27
|\ \ \ \
| * | | | Add docs for protected branches deletion featuredocs/rm-protected-branchesAchilleas Pipinellis2017-05-192-0/+27
* | | | | Merge branch 'docs/triggers' into 'master'Sean Packham2017-06-083-84/+77
|\ \ \ \ \
| * | | | | Refactor CI triggers docsdocs/triggersAchilleas Pipinellis2017-06-083-84/+77
* | | | | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into '...Douwe Maan2017-06-085-1/+267
|\ \ \ \ \ \
| * | | | | | added changelog for Bulgarian translations黄涛2017-06-071-0/+4
| * | | | | | add bulgarian translation of cycle analytics page to I18N黄涛2017-06-074-1/+263
* | | | | | | Merge branch '33334_add_portuguese_brazil_translation_of_cycle_analytics_page...Douwe Maan2017-06-085-0/+266
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch '33334_add_portuguese_brazil_translation_of_cycle_analytics_page...黄涛2017-06-070-0/+0
| |\ \ \ \ \ \
| | * | | | | | Update i18n.rb styleHuang Tao2017-06-061-1/+1
| | * | | | | | added changelog for Portuguese Brazil translations黄涛2017-06-061-0/+4
| | * | | | | | add portuguese brazil translation of cycle analytics page黄涛2017-06-064-0/+262
| * | | | | | | Update i18n.rb styleHuang Tao2017-06-071-1/+1
| * | | | | | | added changelog for Portuguese Brazil translations黄涛2017-06-071-0/+4
| * | | | | | | add portuguese brazil translation of cycle analytics page黄涛2017-06-074-0/+262
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-084-7/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-084-7/+11
* | | | | | | Merge branch '32720-emoji-spacing' into 'master'Annabel Dunstone Gray2017-06-084-10/+23
|\ \ \ \ \ \ \
| * | | | | | | remove extra space on thumbs emoji buttons32720-emoji-spacingtauriedavis2017-06-071-0/+5
| * | | | | | | 32720 Create equal padding for emoji on comments and emoji-blocktauriedavis2017-06-064-10/+18
* | | | | | | | Merge branch 'sh-document-road-to-graphql' into 'master'Douwe Maan2017-06-081-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Add text documenting that v5 of the API will be GraphQLsh-document-road-to-graphqlStan Hu2017-06-071-0/+9
* | | | | | | | | Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan2017-06-0822-160/+2423
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Regenerate po and js fileszj-i18n-pipeline-schedulesZ.J. van de Weg2017-06-0813-8/+3109
| * | | | | | | | | Allow translation of Pipeline SchedulesZ.J. van de Weg2017-06-0822-2416/+536
* | | | | | | | | | Merge branch 'remove-transition' into 'master'Annabel Dunstone Gray2017-06-081-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary transitionremove-transitionClement Ho2017-06-071-1/+0
* | | | | | | | | | | Merge branch '33202-scrollbar-center' into 'master'Phil Hughes2017-06-082-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Resolve "Jobs page scrollbar and centering"Filipa Lacerda2017-06-082-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-0810-13/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-0710-13/+15
* | | | | | | | | | | Merge branch 'clean-up-project-for-merge-conflicts' into 'master'Rémy Coutable2017-06-081-16/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Split Project#reset_cache_and_import_attrs upYorick Peterse2017-06-081-1/+5
| * | | | | | | | | | Re-order some methods in ProjectYorick Peterse2017-06-081-15/+16
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets2017-06-083-18/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix long urls in the title of commitAlexander Randa2017-05-123-18/+39
* | | | | | | | | | | Merge branch 'zj-prom-pipeline-count' into 'master'Grzegorz Bizon2017-06-083-0/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add test for prom metric gatheringzj-prom-pipeline-countZ.J. van de Weg2017-06-081-0/+8
| * | | | | | | | | | Add prometheus metrics on pipeline creationZ.J. van de Weg2017-06-072-0/+10
* | | | | | | | | | | Merge branch '28607-forking-and-configuring-project-via-api-works-very-unreli...Achilleas Pipinellis2017-06-082-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Confirm Project forking behaviour via the APIMark Fletcher2017-06-062-0/+6
* | | | | | | | | | | | Merge branch 'feature/rouge-2.1.0' into 'master'Douwe Maan2017-06-083-29/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remove the rouge copypasta and add notes to refactorhttp://jneen.net/2017-06-072-28/+4