summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix up @DouweM reviewEric Eastwood2017-03-063-32/+33
* Fix wrong image src with cached gl-emoji and relative rootEric Eastwood2017-03-062-3/+4
* Use native unicode emojisEric Eastwood2017-03-065-151/+102
* Merge branch 'rs-fix-deployments-v3-namespace' into 'master' Robert Speicher2017-03-062-29/+31
|\
| * Move `api/v3/deployments` to the correct namespaceRobert Speicher2017-03-062-29/+31
* | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-061-1/+2
|\ \ | |/ |/|
| * Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-281-1/+2
* | Merge branch 'zj-builds-to-jobs-api' into 'master' Kamil Trzciński2017-03-0610-92/+649
|\ \
| * | Incorporate review, drop old endpointZ.J. van de Weg2017-03-062-25/+4
| * | Rename build to job in the docsZ.J. van de Weg2017-03-061-5/+5
| * | Add changelog entryZ.J. van de Weg2017-03-061-1/+1
| * | Fix all testsToon Claes2017-03-065-256/+179
| * | Pick API files from 8.16.6Z.J. van de Weg2017-03-064-2/+237
| * | 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-061-9/+5
| * | Rename Builds to Jobs in the APIZ.J. van de Weg2017-03-065-68/+349
* | | Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into 'mas...Sean McGivern2017-03-066-16/+105
|\ \ \
| * | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftoversPawel Chojnacki2017-03-062-3/+2
| * | | align schema.rb with upstream and fix rubocop warning about not freezing muta...Pawel Chojnacki2017-03-062-3/+2
| * | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ...Pawel Chojnacki2017-03-064-34/+21
| * | | Cleanup common code in Unique Ips testsPawel Chojnacki2017-03-062-2/+2
| * | | Test various login scenarios if the limit gets enforcedPawel Chojnacki2017-03-064-9/+14
| * | | Cleanup formattingPawel Chojnacki2017-03-062-2/+2
| * | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-063-9/+108
* | | | Merge branch 'gitlab-database-fix' into 'master' Douwe Maan2017-03-061-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | removes redundant code from gitlab database filegitlab-database-fixTiago Botelho2017-03-021-3/+3
* | | | Remove "subscribed" field from API responses returning list of issues or merg...api-drop-subscribedAdam Niedzielski2017-03-067-28/+66
| |/ / |/| |
* | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-064-20/+151
|\ \ \
| * | | Fix UserBasicintroduce-pipeline-triggersKamil Trzcinski2017-03-061-1/+1
| * | | Rename `/take` to `/take_ownership`, expose `owner` in `v3`.Kamil Trzcinski2017-03-062-1/+2
| * | | Update documentation and expose IDKamil Trzcinski2017-03-051-0/+1
| * | | Introduce tests for pipeline triggersKamil Trzcinski2017-03-052-10/+16
| * | | Update triggers APIKamil Trzcinski2017-03-054-17/+140
* | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-061-3/+2
|\ \ \ \
| * | | | Remove remnants of git annexPawel Chojnacki2017-03-031-3/+2
| | |/ / | |/| |
* | | | Merge branch '26384-improve-omnibus-mattermost-command-installation-flow' int...Kamil Trzciński2017-03-061-1/+1
|\ \ \ \
| * | | | Improved team selectionLuke "Jared" Bennett2017-03-051-1/+1
* | | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-062-0/+98
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add middleware for ETag caching with RedisAdam Niedzielski2017-03-012-0/+98
* | | | | Make SidekiqStatus able to count number of jobs completed/runningsh-improve-sidekiq-statusStan Hu2017-03-031-6/+29
* | | | | Merge branch '26847-api-pipelines-use-basic' into 'master' Robert Speicher2017-03-033-2/+39
|\ \ \ \ \
| * | | | | Expose pipelines as PipelineBasic `projects/:id/pipelines`26847-api-pipelines-use-basicToon Claes2017-03-033-2/+39
| | |/ / / | |/| | |
* | | | | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-032-4/+2
|\ \ \ \ \
| * | | | | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-022-4/+2
| | |_|/ / | |/| | |
* | | | | Merge branch '28865-filter-by-authorized-projects-in-v4' into 'master' Sean McGivern2017-03-032-1/+6
|\ \ \ \ \
| * | | | | Rename query parameter to `membership`28865-filter-by-authorized-projects-in-v4Toon Claes2017-03-032-2/+3
| * | | | | Add filter param for authorized projects for current_user for V4Oswaldo Ferreira2017-03-031-0/+4
* | | | | | Stop setting Strict-Transport-Securty header from within the appPaweł Chojnacki2017-03-031-0/+3
|/ / / / /
* | | | | Merge branch 'rs-dev-seed-time' into 'master' Sean McGivern2017-03-031-10/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-timeRobert Speicher2017-03-021-10/+9
| |/ / /
View Lorry Controller Status