summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-085-54/+54
* 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
| * | | | | | | | update rouge to 2.1.0http://jneen.net/2017-06-071-1/+1
* | | | | | | | | Merge remote-tracking branch 'gl-dev/master'Regis2017-06-073-8/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CHANGELOG.md for 9.0.10Regis2017-06-071-0/+4
| * | | | | | | | | Update CHANGELOG.md for 9.2.5Regis2017-06-071-0/+4
| * | | | | | | | | Update CHANGELOG.md for 9.1.7Regis2017-06-071-0/+4
| * | | | | | | | | Update CHANGELOG.md for 9.1.6Regis2017-06-021-0/+4
| * | | | | | | | | Update CHANGELOG.md for 9.0.9Regis2017-06-021-0/+4
| * | | | | | | | | Update CHANGELOG.md for 9.2.4Regis2017-06-021-0/+4
| * | | | | | | | | Merge remote-tracking branch 'gitlab-ce/master'Grzegorz Bizon2017-06-01703-4619/+13091
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOG.md for 9.0.8Regis2017-05-311-0/+6
| * | | | | | | | | | Update CHANGELOG.md for 9.1.5Regis2017-05-311-0/+6
| * | | | | | | | | | Update CHANGELOG.md for 9.2.3Regis2017-05-311-0/+7
| * | | | | | | | | | Update CHANGELOG.md for 9.2.2Regis2017-05-253-8/+5
| * | | | | | | | | | Merge branch 'revert-0a6ee7ce' into 'master'Clement Ho2017-05-253-45/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "Merge branch '32908-edit-comment' into 'master'"Clement Ho2017-05-253-45/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '32908-edit-comment' into 'master'Clement Ho2017-05-253-2/+45
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Escapes html content before appending it to the DOMFilipa Lacerda2017-05-253-2/+45
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'responsive-table-fixes' into 'master'Clement Ho2017-06-0810-41/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Responsive table fixesAnnabel Dunstone Gray2017-06-0810-41/+55
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '33377-fix-null-ref-in-repo-is-ancestor' into 'master'Douwe Maan2017-06-082-8/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | nil-check Repository::is_ancestor?Kim Carlbäcker2017-06-082-8/+34
|/ / / / / / / / / / /