summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Corrected code style and titlesJose Ivan Vargas2017-01-184-4/+3
| | | | | |
| * | | | | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-182-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Added a test for the integrations controller
| * | | | | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-188-14/+31
| | | | | |
* | | | | | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-204-0/+58
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084
| * | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19202-1027/+1125
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fix specsKamil Trzcinski2017-01-192-4/+10
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19833-4775/+12378
| |\ \ \ \ \
| * | | | | | 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-161-0/+1
| | | | | | |
| * | | | | | 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-163-8/+17
| | | | | | |
| * | | | | | Update Runners in a ServiceKim "BKC" Carlbäcker2016-12-152-15/+13
| | | | | | |
| * | | | | | Move redis-logic into Ci::RunnerKim "BKC" Carlbäcker2016-12-151-0/+16
| | | | | | |
| * | | | | | lintingKim "BKC" Carlbäcker2016-12-151-1/+1
| | | | | | |
| * | | | | | Use correct variablesKim "BKC" Carlbäcker2016-12-141-1/+1
| | | | | | |
| * | | | | | typo-oKim "BKC" Carlbäcker2016-12-141-1/+1
| | | | | | |
| * | | | | | This is needed as well...Kim "BKC" Carlbäcker2016-12-141-1/+8
| | | | | | |
| * | | | | | Add BuildQueueWorker for injecting redis-keysKim "BKC" Carlbäcker2016-12-142-0/+24
| | | | | | |
* | | | | | | 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 '25507-handle-errors-environment-list' into 'master' Fatih Acet2017-01-192-47/+72
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-10/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-10/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add margin to math blocks Closes #26472 See merge request !8543
| * | | | | | | | Add margin to math blocks26472-math-marginAnnabel Dunstone Gray2017-01-121-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' ↵Robert Speicher2017-01-191-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure group acts as a namespace for polymorphic routes Closes #26810 See merge request !8627
| * | | | | | | | Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_pathRémy Coutable2017-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-pageFatih Acet2017-01-191-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607
| * | | | | | | | | Autoresize markdown previewdidemacet-markdown-area-height-fixClement Ho2017-01-171-0/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch 'button-alignment' into 'master' Fatih Acet2017-01-192-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix small button alignment issues See merge request !8631
| * | | | | | | | | | Fix small button alignment issuesbutton-alignmentAnnabel Dunstone Gray2017-01-182-2/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'simple-eslint-fixes' into 'master' Fatih Acet2017-01-19159-827/+591
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple eslint fixes See merge request !8536
| * | | | | | | | | | resolve all space-in-parens eslint violationssimple-eslint-fixesMike Greiling2017-01-184-14/+14
| | | | | | | | | | |
| * | | | | | | | | | resolve all prefer-const eslint violationsMike Greiling2017-01-1812-30/+28
| | | | | | | | | | |
| * | | | | | | | | | resolve all no-dupe-keys eslint violationsMike Greiling2017-01-182-4/+2
| | | | | | | | | | |
| * | | | | | | | | | resolve all parseInt radix eslint violationsMike Greiling2017-01-188-17/+17
| | | | | | | | | | |
| * | | | | | | | | | resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-1836-80/+80
| | | | | | | | | | |
| * | | | | | | | | | resolve all indent eslint violationsMike Greiling2017-01-1815-260/+262
| | | | | | | | | | |
| * | | | | | | | | | resolve all no-trailing-spaces eslint violationsMike Greiling2017-01-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | resolve all no-irregular-whitespace eslint violationsMike Greiling2017-01-184-9/+9
| | | | | | | | | | |
| * | | | | | | | | | resolve all padded-blocks eslint violationsMike Greiling2017-01-18132-368/+134
| | | | | | | | | | |
| * | | | | | | | | | resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-1834-88/+88
| | | | | | | | | | |
| * | | | | | | | | | resolve all no-plusplus eslint violationsMike Greiling2017-01-1822-75/+75
| | |/ / / / / / / / | |/| | | | | | | |