summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix concurrent access on builds/registerfix-builds-processingKamil Trzcinski2017-02-282-12/+69
* Merge branch 'ci-tables-ui-improvements' into 'master' Annabel Dunstone Gray2017-02-274-267/+114
|\
| * Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-27599-3773/+6228
| |\
| * | Guarantees we show at least 4 stages in line in smaller screensFilipa Lacerda2017-02-231-0/+1
| * | Aligns text content instead of divFilipa Lacerda2017-02-232-106/+82
| * | Merge branch 'master' into ci-tables-ui-improvementsFilipa Lacerda2017-02-23305-1441/+3655
| |\ \
| * | | Guarantees buttons will always stay in the same lineFilipa Lacerda2017-02-231-1/+2
| * | | Fix btn group not having round corners when there's only some buttons presentFilipa Lacerda2017-02-231-19/+10
| * | | Equal padding between table cellsFilipa Lacerda2017-02-222-51/+22
| * | | Fix scss linter errorFilipa Lacerda2017-02-221-2/+2
| * | | Improvements in spacingFilipa Lacerda2017-02-221-4/+7
| * | | Remove unused fileFilipa Lacerda2017-02-221-92/+0
| * | | Remove unused css, align buttons with top buttonFilipa Lacerda2017-02-221-21/+15
| * | | Convert button into a btn group according to mockupsFilipa Lacerda2017-02-221-29/+32
* | | | Merge branch '14748-runner-version-in-admin-views' into 'master' Rémy Coutable2017-02-273-0/+7
|\ \ \ \
| * | | | Add runner version to /admin/runners viewJonathon Reinhart2017-02-263-0/+7
* | | | | Merge branch 'sh-async-delete-children' into 'master' Dmitriy Zaporozhets2017-02-272-1/+4
|\ \ \ \ \
| * | | | | Include nested group into destroy_service_specsh-async-delete-childrenDmitriy Zaporozhets2017-02-271-0/+2
| * | | | | Make nested groups deletion synchronous to avoid potential raceStan Hu2017-02-271-1/+2
* | | | | | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-278-19/+111
|\ \ \ \ \ \
| * | | | | | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-248-19/+111
* | | | | | | Merge branch 'improve-backoff-algo' into 'master' Fatih Acet2017-02-271-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Improves backoff algo with maxInterval between requestsFilipa Lacerda2017-02-271-3/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'balu-update-container-registry-docs' into 'master' Marin Jankovski2017-02-271-0/+40
|\ \ \ \ \ \ \
| * | | | | | | Update Registry administration doc - external registrybalu-update-container-registry-docsBalasankar C2017-01-091-0/+40
* | | | | | | | Merge branch '28721-backport-http-status-code-ee' into 'master' Jacob Schatz2017-02-271-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Backport EE http status codes new file to CEFilipa Lacerda2017-02-271-0/+10
* | | | | | | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-278-9/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-248-9/+46
* | | | | | | | | Merge branch 'patch-14' into 'master' Rémy Coutable2017-02-271-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use single backticks for inline codeheapifyman2017-02-251-1/+1
| * | | | | | | | | Update manage_large_binaries_with_git_lfs.md heapifyman2017-02-211-0/+6
* | | | | | | | | | Merge branch '27267-events-project-query-performance-regression' into 'master' Sean McGivern2017-02-272-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add performance query regression fix for !9088 affecting #2726727267-events-project-query-performance-regressionOswaldo Ferreira2017-02-242-1/+5
* | | | | | | | | | | Merge branch 'unified-member-api-response' into 'master' Sean McGivern2017-02-274-13/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | API: Return 400 for all validation erros in the mebers APIunified-member-api-responseRobert Schilling2017-02-244-13/+11
* | | | | | | | | | | | Merge branch 'feature/runners-v4-api' into 'master' Kamil Trzciński2017-02-276-0/+232
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Rename API::Ci to API::Runnerfeature/runners-v4-apiTomasz Maczukin2017-02-164-7/+7
| * | | | | | | | | | | Fix rubocop offensesTomasz Maczukin2017-02-162-12/+11
| * | | | | | | | | | | Add changelog entryTomasz Maczukin2017-02-161-0/+4
| * | | | | | | | | | | Add Runner registration/deletion APITomasz Maczukin2017-02-165-0/+229
* | | | | | | | | | | | Merge branch 'sh-bump-hashie-to-3.5.5' into 'master' Rémy Coutable2017-02-273-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update CHANGELOG.mdsh-bump-hashie-to-3.5.5Stan Hu2017-02-251-1/+1
| * | | | | | | | | | | Bump omniauth to 1.4.2Stan Hu2017-02-252-3/+3
| * | | | | | | | | | | Bump Hashie to 3.5.5 to eliminate warning noiseStan Hu2017-02-252-1/+5
* | | | | | | | | | | | Merge branch 'add-quotes-to-coverage-pattern' into 'master' improve-backoff-algoGrzegorz Bizon2017-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add quotes to coverage patternMax Raab2017-02-271-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'backoff-algo-backport-ee' into 'master' Jacob Schatz2017-02-261-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Adds backoff algo from EE to CEbackoff-algo-backport-eeFilipa Lacerda2017-02-241-0/+52
* | | | | | | | | | | | | Merge branch 'update-vue-2.1' into 'master' Fatih Acet2017-02-264-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |