summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Renamed a file to make the transition to EE easierJose Ivan Vargas2017-01-192-2/+2
| | | | | | | | |
| * | | | | | | | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pagesJose Ivan Vargas2017-01-184-10/+8
| | | | | | | | |
| * | | | | | | | Removed the index action from both the projects hook and services controllersJose Ivan Vargas2017-01-182-9/+2
| | | | | | | | |
| * | | | | | | | Corrected code style and titlesJose Ivan Vargas2017-01-185-6/+5
| | | | | | | | |
| * | | | | | | | Fixed more testsJose Ivan Vargas2017-01-183-8/+8
| | | | | | | | |
| * | | | | | | | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-186-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test for the integrations controller
| * | | | | | | | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-189-15/+32
| | | | | | | | |
* | | | | | | | | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-2011-7/+175
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084
| * | | | | | | | | Fix specsKamil Trzcinski2017-01-201-4/+6
| | | | | | | | | |
| * | | | | | | | | Fix specsKamil Trzcinski2017-01-192-2/+3
| | | | | | | | | |
| * | | | | | | | | Added CHANGELOGKamil Trzcinski2017-01-191-0/+4
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19323-1542/+2883
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Fix specsKamil Trzcinski2017-01-194-10/+39
| | | | | | | | | |
| * | | | | | | | | Add missing build_specKamil Trzcinski2017-01-191-0/+10
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-192128-16907/+67314
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | WIP: Add tests and make sure that headers are set21698-redis-runner-last-buildLin Jen-Shin2017-01-045-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We realized that headers were not set whenever we give 204 because `render_api_error!` doesn't preserve the headers. * We also realized that `update_runner_info` would be called in POST /builds/register every time therefore runner is updated every time, ticking the queue, making this last_update didn't work very well, and the test would be failing due to that.
| * | | | | | | | | | Fixed broken buildKim "BKC" Carlbäcker2016-12-212-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Change name of expire constantKim "BKC" Carlbäcker2016-12-161-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Make expire-time a constant, correct function in ServiceKim "BKC" Carlbäcker2016-12-162-3/+4
| | | | | | | | | | |
| * | | | | | | | | | Use Token instead of IDKim "BKC" Carlbäcker2016-12-161-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Do things in the correct orderKim "BKC" Carlbäcker2016-12-162-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Don't use redis.multiKim "BKC" Carlbäcker2016-12-161-9/+3
| | | | | | | | | | |
| * | | | | | | | | | Make ensure_runner_queue_value atomicKim "BKC" Carlbäcker2016-12-161-5/+7
| | | | | | | | | | |
| * | | | | | | | | | #NamingThingsKim "BKC" Carlbäcker2016-12-164-16/+21
| | | | | | | | | | |
| * | | | | | | | | | Update Runners in a ServiceKim "BKC" Carlbäcker2016-12-152-15/+13
| | | | | | | | | | |
| * | | | | | | | | | Move redis-logic into Ci::RunnerKim "BKC" Carlbäcker2016-12-153-12/+19
| | | | | | | | | | |
| * | | | | | | | | | lintingKim "BKC" Carlbäcker2016-12-152-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Use correct variablesKim "BKC" Carlbäcker2016-12-141-1/+1
| | | | | | | | | | |
| * | | | | | | | | | typo-oKim "BKC" Carlbäcker2016-12-142-2/+2
| | | | | | | | | | |
| * | | | | | | | | | This is needed as well...Kim "BKC" Carlbäcker2016-12-141-1/+8
| | | | | | | | | | |
| * | | | | | | | | | Add BuildQueueWorker for injecting redis-keysKim "BKC" Carlbäcker2016-12-143-0/+25
| | | | | | | | | | |
| * | | | | | | | | | First attemptKim "BKC" Carlbäcker2016-12-142-0/+20
| | | | | | | | | | |
* | | | | | | | | | | Make university more prominent.sytses2017-01-191-1/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ci-submodule-doc-update' into 'master' Tomasz Maczukin2017-01-192-1/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document GIT_SUBMODULE_STRATEGY See merge request !8586
| * | | | | | | | | | | Document GIT_SUBMODULE_STRATEGYJonathon Reinhart2017-01-162-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This documents the `GIT_SUBMODULE_STRATEGY` feature added in gitlab-ci-multi-runner version 1.10. [ci skip]
* | | | | | | | | | | | Merge branch '26868-fix-duplicate-backported-migrations' into 'master' Robert Speicher2017-01-194-68/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename duplicate migrations and skip them if table/columns are already present Closes #26868 See merge request !8644
| * | | | | | | | | | | Rename duplicate migrations and skip them if table/columns are already presentRémy Coutable2017-01-194-68/+35
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The time tracking feature was backported from EE to CE, thus the CE migrations should be uniquely named and should skip the actual migration content if the table/columns already exist (that means that the EE migrations were already performed). Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch '26066-wrong-messsage-for-unregistered-u2f-device-on-sign-in' ↵Fatih Acet2017-01-193-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' New U2F ineligible message Closes #26066 See merge request !8392
| * | | | | | | | | | | Added isAuthenticate to differentiate between ineligible messages26066-wrong-messsage-for-unregistered-u2f-device-on-sign-inLuke "Jared" Bennett2017-01-043-10/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'improve-public_access-documentation' into 'master' Achilleas Pipinellis2017-01-192-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an image to the public access documentation and fix wrong profile path See merge request !8583
| * | | | | | | | | | | | Add an image to the public access documentation and fix wrong profile pathRémy Coutable2017-01-192-3/+6
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-196-48/+218
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error handling in environments list" Closes #25507 See merge request !8461
| * | | | | | | | | | | Filter environments visibility in store instead of the view in order to not ↵25507-handle-errors-environment-listFilipa Lacerda2017-01-162-42/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get a infinite update loop in vue.js
| * | | | | | | | | | | Adds testsFilipa Lacerda2017-01-126-5/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds changelog entry Finishes tests Fix eslint errors Fix teaspoon test timing out
| * | | | | | | | | | | Adds .catch to the request in order to handle erros and show a feedback to ↵Filipa Lacerda2017-01-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user
* | | | | | | | | | | | Merge branch '26601-dropdown-makes-request-close' into 'master' Fatih Acet2017-01-193-15/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545
| * | | | | | | | | | | | Use bootstrap dropdown events to only make the request when the dropdown is ↵26601-dropdown-makes-request-closeFilipa Lacerda2017-01-133-15/+21
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being opened Fixes builds dropdown making request when clicked to be closed Adds MR ID to CHANGELOG Improve documentation Use bootstrap dropdown events to only make the request when the dropdown is being opened
* | | | | | | | | | | | Merge branch '26472-math-margin' into 'master' Fatih Acet2017-01-192-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543
| * | | | | | | | | | | Add margin to math blocks26472-math-marginAnnabel Dunstone Gray2017-01-122-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'use-empty_project-factory-in-api-specs' into 'master' Robert Speicher2017-01-1919-54/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace many :project with :empty_projects in API specs See merge request !8608