summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use native unicode emojisEric Eastwood2017-03-0651-10643/+10565
| | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
* Add emoji images (generated from `rake gemojione:sprite`)Eric Eastwood2017-03-061792-0/+0
|
* Merge branch 'rs-fix-deployments-v3-namespace' into 'master' Robert Speicher2017-03-062-29/+31
|\ | | | | | | | | Move `api/v3/deployments` to the correct namespace See merge request !9732
| * Move `api/v3/deployments` to the correct namespaceRobert Speicher2017-03-062-29/+31
| |
* | Merge branch '24998-fix-typo-gitlab-config-file' into 'master' Rémy Coutable2017-03-062-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix typo in Gitlab application config file Closes #24998 See merge request !9702
| * | Add changelog entrymedied2017-03-051-0/+4
| | |
| * | Fix typo in Gitlab application config filemedied2017-03-041-1/+1
| | |
* | | Merge branch 'revert-see-if-repro-29035' into 'master' Jacob Schatz2017-03-061-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Revert it See merge request !9737
| * | | Revert itJacob Schatz2017-03-061-1/+0
|/ / /
* | | Merge branch 'see-if-repro-29035' into 'master' Jacob Schatz2017-03-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | See if repro #29035 See merge request !9736
| * | | See if repro #29035Jacob Schatz2017-03-061-0/+1
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'see-if-repro-revert' into 'master' Jacob Schatz2017-03-061-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove Test if worked. #29035 See merge request !9735
| * | | Remove Test if worked. #29035Jacob Schatz2017-03-061-1/+0
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'cowbellerina-22562-todos-filters' into 'master' Annabel Dunstone Gray2017-03-065-11/+28
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix Sort dropdown reflow issue Closes #22562 See merge request !9728
| * | | Fix Sort dropdown reflow issueJarkko Tuunanen2017-03-065-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Sort dropdown behave the same as filters in narrower viewports. Adjust dropdowns to fit on the same line in worst-case scenario ("Oldest created" selected). Closes #22562 See merge request !9533
* | | | Merge branch 'see-if-we-can-reproduce' into 'master' Jacob Schatz2017-03-061-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Testing #29035 See merge request !9734
| * | | | [ci skip]Jacob Schatz2017-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | See if we can reproduce that problem
* | | | | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-065-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add storage class configuration option for Amazon S3 remote backups See merge request !9599
| * | | | | Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-285-1/+11
| | | | | |
* | | | | | Merge branch 'remove-vendored-raphael-library' into 'master' Filipa Lacerda2017-03-0612-10207/+425
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Refactor network graph bundle to ES module syntax See merge request !9696
| * | | | | remove unnecessary IIFEremove-vendored-raphael-libraryMike Greiling2017-03-051-12/+10
| | | | | |
| * | | | | refactor Network classMike Greiling2017-03-052-18/+15
| | | | | |
| * | | | | refactor BranchGraph classMike Greiling2017-03-054-392/+388
| | | | | |
| * | | | | remove manually vendored raphael library in favor of node moduleMike Greiling2017-03-055-9784/+0
| | | | | |
| * | | | | merge raphael library into the network bundleMike Greiling2017-03-054-2/+13
| | | | | |
* | | | | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' Kamil Trzciński2017-03-067-82/+198
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make stuck builds detection more performant Closes #27523 See merge request !9025
| * | | | | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performantTomasz Maczukin2017-03-034-35/+35
| | | | | | |
| * | | | | | Make 'joins' line shorterTomasz Maczukin2017-03-011-1/+1
| | | | | | |
| * | | | | | Fix rubocop offensesTomasz Maczukin2017-03-012-6/+3
| | | | | | |
| * | | | | | Add minor updatesTomasz Maczukin2017-03-012-9/+32
| | | | | | |
| * | | | | | Improve builds search queryTomasz Maczukin2017-03-011-1/+1
| | | | | | |
| * | | | | | Add Gitlab::OptimisticLocking for build droppingTomasz Maczukin2017-03-011-1/+3
| | | | | | |
| * | | | | | Add exclusive lease for stuck_ci_builds_workerTomasz Maczukin2017-03-012-3/+27
| | | | | | |
| * | | | | | Update default configuration of stuck_ci_builds_worker cron intervalTomasz Maczukin2017-03-013-2/+6
| | | | | | |
| * | | | | | Update stuck and outdated builds cleanup workerTomasz Maczukin2017-03-012-35/+101
| | | | | | |
* | | | | | | Merge branch 'zj-builds-to-jobs-api' into 'master' Kamil Trzciński2017-03-0625-312/+1517
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename builds to jobs in the API Closes #28515 See merge request !9463
| * | | | | | | Remove docs for removed endpointzj-builds-to-jobs-apiZ.J. van de Weg2017-03-061-104/+0
| | | | | | | |
| * | | | | | | Incorporate review, drop old endpointZ.J. van de Weg2017-03-065-101/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The endpoint dropped, get ':id/repository/commits/:sha/jobs', should be replace by a new endpoint.
| * | | | | | | Rename build to job in the docsZ.J. van de Weg2017-03-066-113/+113
| | | | | | | |
| * | | | | | | Add changelog entryZ.J. van de Weg2017-03-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Fix all testsToon Claes2017-03-0611-350/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit was about 6 commits before squashing, with the main goal to make all tests green. Now, after pushing this commit we'll see what the CI has to say about that.
| * | | | | | | Pick API files from 8.16.6Z.J. van de Weg2017-03-068-2/+625
| | | | | | | |
| * | | | | | | Keep entities the same for API v3Z.J. van de Weg2017-03-061-0/+143
| | | | | | | |
| * | | | | | | Update entities, rename from builds to jobsZ.J. van de Weg2017-03-063-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit only renames the commits, the cascading effects will be dealt with later.
| * | | | | | | Rename Builds to Jobs in the APIZ.J. van de Weg2017-03-067-69/+827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#28515 [ci skip]
* | | | | | | | Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into ↵Sean McGivern2017-03-0622-20/+368
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GitLab should have an option to prevent users from signing in from multiple IPs Closes #27520 See merge request !8998
| * | | | | | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftoversPawel Chojnacki2017-03-065-11/+9
| | | | | | | |
| * | | | | | | align schema.rb with upstream and fix rubocop warning about not freezing ↵Pawel Chojnacki2017-03-063-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mutable constants and empty error classes
| * | | | | | | Cleanup test phases by introducing request_from_ip and operation_from_ip helersPawel Chojnacki2017-03-061-21/+19
| | | | | | | |
| * | | | | | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-066-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + rename shared context
View Lorry Controller Status