Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/upstream-9-2-security' into master-secur...master-security-update | DJ Mountney | 2017-06-08 | 2 | -6/+10 |
|\ | |||||
| * | Update rename_system_namespace_spec to new validations.upstream-9-2-security | Bob Van Landuyt | 2017-06-08 | 1 | -5/+7 |
| * | Make the uploader use the updated folder | Bob Van Landuyt | 2017-06-08 | 1 | -1/+3 |
| * | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-08 | 55 | -66/+1252 |
* | | Merge branch 'upstream-9-2-security' into master-security-update | DJ Mountney | 2017-06-08 | 37 | -35/+983 |
|\ \ | |||||
| * | | Bring in security changes from the 9.2.5 release | DJ Mountney | 2017-06-07 | 55 | -66/+1252 |
* | | | Merge branch '25934-project-snippet-vis' into 'security-9-2' | DJ Mountney | 2017-06-08 | 13 | -18/+206 |
* | | | Merge branch 'dz-api-x-frame' into 'security-9-2' | DJ Mountney | 2017-06-08 | 1 | -0/+1 |
* | | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1' | DJ Mountney | 2017-06-08 | 2 | -11/+21 |
* | | | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2' | DJ Mountney | 2017-06-08 | 2 | -2/+41 |
* | | | Merge branch 'dm-diff-file-diffable' into 'master' | Sean McGivern | 2017-06-08 | 8 | -66/+43 |
|\ \ \ | |||||
| * | | | Move diffable? method from Repository to Diff::Filedm-diff-file-diffable | Douwe Maan | 2017-06-08 | 8 | -79/+68 |
| | |/ | |/| | |||||
* | | | Merge branch 'dm-highlight-diff-file-blob' into 'master' | Sean McGivern | 2017-06-08 | 5 | -54/+54 |
|\ \ \ | |||||
| * | | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blob | Douwe Maan | 2017-06-08 | 5 | -54/+54 |
* | | | | Merge branch 'docs/shared-runners' into 'master' | Sean Packham | 2017-06-08 | 4 | -78/+136 |
|\ \ \ \ | |||||
| * | | | | Refactor Runners docsdocs/shared-runners | Achilleas Pipinellis | 2017-06-07 | 4 | -78/+136 |
* | | | | | Merge branch 'docs/rm-protected-branches' into 'master' | Sean Packham | 2017-06-08 | 2 | -0/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Add docs for protected branches deletion featuredocs/rm-protected-branches | Achilleas Pipinellis | 2017-05-19 | 2 | -0/+27 |
* | | | | | | Merge branch 'docs/triggers' into 'master' | Sean Packham | 2017-06-08 | 3 | -84/+77 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor CI triggers docsdocs/triggers | Achilleas Pipinellis | 2017-06-08 | 3 | -84/+77 |
* | | | | | | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into '... | Douwe Maan | 2017-06-08 | 5 | -1/+267 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | added changelog for Bulgarian translations | 黄涛 | 2017-06-07 | 1 | -0/+4 |
| * | | | | | | | add bulgarian translation of cycle analytics page to I18N | 黄涛 | 2017-06-07 | 4 | -1/+263 |
* | | | | | | | | Merge branch '33334_add_portuguese_brazil_translation_of_cycle_analytics_page... | Douwe Maan | 2017-06-08 | 5 | -0/+266 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch '33334_add_portuguese_brazil_translation_of_cycle_analytics_page... | 黄涛 | 2017-06-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Update i18n.rb style | Huang Tao | 2017-06-06 | 1 | -1/+1 |
| | * | | | | | | | added changelog for Portuguese Brazil translations | 黄涛 | 2017-06-06 | 1 | -0/+4 |
| | * | | | | | | | add portuguese brazil translation of cycle analytics page | 黄涛 | 2017-06-06 | 4 | -0/+262 |
| * | | | | | | | | Update i18n.rb style | Huang Tao | 2017-06-07 | 1 | -1/+1 |
| * | | | | | | | | added changelog for Portuguese Brazil translations | 黄涛 | 2017-06-07 | 1 | -0/+4 |
| * | | | | | | | | add portuguese brazil translation of cycle analytics page | 黄涛 | 2017-06-07 | 4 | -0/+262 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master' | Douwe Maan | 2017-06-08 | 4 | -7/+11 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labels | Sean McGivern | 2017-06-08 | 4 | -7/+11 |
* | | | | | | | | Merge branch '32720-emoji-spacing' into 'master' | Annabel Dunstone Gray | 2017-06-08 | 4 | -10/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove extra space on thumbs emoji buttons32720-emoji-spacing | tauriedavis | 2017-06-07 | 1 | -0/+5 |
| * | | | | | | | | 32720 Create equal padding for emoji on comments and emoji-block | tauriedavis | 2017-06-06 | 4 | -10/+18 |
* | | | | | | | | | Merge branch 'sh-document-road-to-graphql' into 'master' | Douwe Maan | 2017-06-08 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add text documenting that v5 of the API will be GraphQLsh-document-road-to-graphql | Stan Hu | 2017-06-07 | 1 | -0/+9 |
* | | | | | | | | | | Merge branch 'zj-i18n-pipeline-schedules' into 'master' | Douwe Maan | 2017-06-08 | 22 | -160/+2423 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Regenerate po and js fileszj-i18n-pipeline-schedules | Z.J. van de Weg | 2017-06-08 | 13 | -8/+3109 |
| * | | | | | | | | | | Allow translation of Pipeline Schedules | Z.J. van de Weg | 2017-06-08 | 22 | -2416/+536 |
* | | | | | | | | | | | Merge branch 'remove-transition' into 'master' | Annabel Dunstone Gray | 2017-06-08 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove unnecessary transitionremove-transition | Clement Ho | 2017-06-07 | 1 | -1/+0 |
* | | | | | | | | | | | | Merge branch '33202-scrollbar-center' into 'master' | Phil Hughes | 2017-06-08 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Resolve "Jobs page scrollbar and centering" | Filipa Lacerda | 2017-06-08 | 2 | -3/+3 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'blob-load-all-data' into 'master' | Grzegorz Bizon | 2017-06-08 | 10 | -13/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-data | Douwe Maan | 2017-06-07 | 10 | -13/+15 |
* | | | | | | | | | | | | Merge branch 'clean-up-project-for-merge-conflicts' into 'master' | Rémy Coutable | 2017-06-08 | 1 | -16/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Split Project#reset_cache_and_import_attrs up | Yorick Peterse | 2017-06-08 | 1 | -1/+5 |
| * | | | | | | | | | | | Re-order some methods in Project | Yorick Peterse | 2017-06-08 | 1 | -15/+16 |
| | |_|/ / / / / / / / | |/| | | | | | | | | |