Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '26371-native-emojis-v3-code' into '26371-native-emojis-v3' 26371-native-emojis-v3 | Eric Eastwood | 2017-03-06 | 53 | -10674/+10599 |
|\ | |||||
| * | Update changelog26371-native-emojis-v3-code | Eric Eastwood | 2017-03-06 | 1 | -0/+0 |
| * | Fix up @DouweM review | Eric Eastwood | 2017-03-06 | 7 | -38/+38 |
| * | Fix wrong image src with cached gl-emoji and relative root | Eric Eastwood | 2017-03-06 | 6 | -27/+21 |
| * | Fix up potential for build finish event to fire for wrong menu | Eric Eastwood | 2017-03-06 | 2 | -5/+4 |
| * | Fix up off index when reading canvas and something failed | Eric Eastwood | 2017-03-06 | 1 | -3/+6 |
| * | Fix up emoji not being next to autocomplete label | Eric Eastwood | 2017-03-06 | 1 | -0/+7 |
| * | Fix emoji cut-off line-height | Eric Eastwood | 2017-03-06 | 3 | -4/+3 |
| * | Fix up `watch` alias lookup in Firefox | Eric Eastwood | 2017-03-06 | 2 | -2/+3 |
| * | Use native unicode emojis | Eric Eastwood | 2017-03-06 | 51 | -10643/+10565 |
|/ | |||||
* | Add emoji images (generated from `rake gemojione:sprite`) | Eric Eastwood | 2017-03-06 | 1792 | -0/+0 |
* | Merge branch 'rs-fix-deployments-v3-namespace' into 'master' | Robert Speicher | 2017-03-06 | 2 | -29/+31 |
|\ | |||||
| * | Move `api/v3/deployments` to the correct namespace | Robert Speicher | 2017-03-06 | 2 | -29/+31 |
* | | Merge branch '24998-fix-typo-gitlab-config-file' into 'master' | Rémy Coutable | 2017-03-06 | 2 | -1/+5 |
|\ \ | |||||
| * | | Add changelog entry | medied | 2017-03-05 | 1 | -0/+4 |
| * | | Fix typo in Gitlab application config file | medied | 2017-03-04 | 1 | -1/+1 |
* | | | Merge branch 'revert-see-if-repro-29035' into 'master' | Jacob Schatz | 2017-03-06 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Revert it | Jacob Schatz | 2017-03-06 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge branch 'see-if-repro-29035' into 'master' | Jacob Schatz | 2017-03-06 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | See if repro #29035 | Jacob Schatz | 2017-03-06 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge branch 'see-if-repro-revert' into 'master' | Jacob Schatz | 2017-03-06 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Remove Test if worked. #29035 | Jacob Schatz | 2017-03-06 | 1 | -1/+0 |
* | | | | Merge branch 'cowbellerina-22562-todos-filters' into 'master' | Annabel Dunstone Gray | 2017-03-06 | 5 | -11/+28 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix Sort dropdown reflow issue | Jarkko Tuunanen | 2017-03-06 | 5 | -11/+28 |
* | | | | Merge branch 'see-if-we-can-reproduce' into 'master' | Jacob Schatz | 2017-03-06 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | [ci skip] | Jacob Schatz | 2017-03-06 | 1 | -0/+1 |
* | | | | | Merge branch 'backup_storage_class' into 'master' | Rémy Coutable | 2017-03-06 | 5 | -1/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Add storage class configuration option for Amazon S3 remote backups | Jon Keys | 2017-02-28 | 5 | -1/+11 |
* | | | | | | Merge branch 'remove-vendored-raphael-library' into 'master' | Filipa Lacerda | 2017-03-06 | 12 | -10207/+425 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | remove unnecessary IIFEremove-vendored-raphael-library | Mike Greiling | 2017-03-05 | 1 | -12/+10 |
| * | | | | | refactor Network class | Mike Greiling | 2017-03-05 | 2 | -18/+15 |
| * | | | | | refactor BranchGraph class | Mike Greiling | 2017-03-05 | 4 | -392/+388 |
| * | | | | | remove manually vendored raphael library in favor of node module | Mike Greiling | 2017-03-05 | 5 | -9784/+0 |
| * | | | | | merge raphael library into the network bundle | Mike Greiling | 2017-03-05 | 4 | -2/+13 |
* | | | | | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' | Kamil Trzciński | 2017-03-06 | 7 | -82/+198 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performant | Tomasz Maczukin | 2017-03-03 | 4 | -35/+35 |
| * | | | | | | Make 'joins' line shorter | Tomasz Maczukin | 2017-03-01 | 1 | -1/+1 |
| * | | | | | | Fix rubocop offenses | Tomasz Maczukin | 2017-03-01 | 2 | -6/+3 |
| * | | | | | | Add minor updates | Tomasz Maczukin | 2017-03-01 | 2 | -9/+32 |
| * | | | | | | Improve builds search query | Tomasz Maczukin | 2017-03-01 | 1 | -1/+1 |
| * | | | | | | Add Gitlab::OptimisticLocking for build dropping | Tomasz Maczukin | 2017-03-01 | 1 | -1/+3 |
| * | | | | | | Add exclusive lease for stuck_ci_builds_worker | Tomasz Maczukin | 2017-03-01 | 2 | -3/+27 |
| * | | | | | | Update default configuration of stuck_ci_builds_worker cron interval | Tomasz Maczukin | 2017-03-01 | 3 | -2/+6 |
| * | | | | | | Update stuck and outdated builds cleanup worker | Tomasz Maczukin | 2017-03-01 | 2 | -35/+101 |
* | | | | | | | Merge branch 'zj-builds-to-jobs-api' into 'master' | Kamil Trzciński | 2017-03-06 | 25 | -312/+1517 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove docs for removed endpointzj-builds-to-jobs-api | Z.J. van de Weg | 2017-03-06 | 1 | -104/+0 |
| * | | | | | | | Incorporate review, drop old endpoint | Z.J. van de Weg | 2017-03-06 | 5 | -101/+13 |
| * | | | | | | | Rename build to job in the docs | Z.J. van de Weg | 2017-03-06 | 6 | -113/+113 |
| * | | | | | | | Add changelog entry | Z.J. van de Weg | 2017-03-06 | 2 | -1/+5 |
| * | | | | | | | Fix all tests | Toon Claes | 2017-03-06 | 11 | -350/+220 |