summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'fix-webpack-dev-server-proxy' into 'master'"revert-34685c58Douwe Maan2017-02-271-6/+6
* Merge branch 'fix-webpack-dev-server-proxy' into 'master' Douwe Maan2017-02-271-6/+6
|\
| * ensure webpack dev server proxy connects regardless of request headersfix-webpack-dev-server-proxyMike Greiling2017-02-271-6/+6
* | Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-271-1/+14
|\ \
| * | Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-241-1/+14
* | | Merge branch 'unified-member-api-response' into 'master' Sean McGivern2017-02-271-7/+0
|\ \ \
| * | | API: Return 400 for all validation erros in the mebers APIunified-member-api-responseRobert Schilling2017-02-241-7/+0
| | |/ | |/|
* | | Merge branch 'feature/runners-v4-api' into 'master' Kamil Trzciński2017-02-274-0/+80
|\ \ \
| * | | Rename API::Ci to API::Runnerfeature/runners-v4-apiTomasz Maczukin2017-02-163-6/+6
| * | | Fix rubocop offensesTomasz Maczukin2017-02-161-4/+3
| * | | Add Runner registration/deletion APITomasz Maczukin2017-02-164-0/+81
* | | | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-18/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skipRémy Coutable2017-02-231-11/+11
| * | | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-9/+15
* | | | Raise error when no content is providedDouwe Maan2017-02-241-2/+0
* | | | Address reviewDouwe Maan2017-02-241-15/+21
* | | | Update API v3 in line with v4Douwe Maan2017-02-241-7/+0
* | | | Fix new offensesDouwe Maan2017-02-241-3/+1
* | | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-244-215/+124
| |_|/ |/| |
* | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-242-6/+7
|\ \ \
| * | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-232-6/+7
| |/ /
* | | Merge branch 'api-simplify-variables-validation' into 'master' Rémy Coutable2017-02-241-8/+3
|\ \ \
| * | | Simplyfy variables validation in triggers APIapi-simplify-variables-validationRobert Schilling2017-02-241-8/+3
| |/ /
* | | Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groupsSean McGivern2017-02-247-4/+24
|\ \ \
| * \ \ Merge branch '3874-correctly-return-json-on-delete-responses' into 'master' Sean McGivern2017-02-244-1/+14
| |\ \ \
| | * | | Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responsesOswaldo2017-02-234-1/+14
| | |/ /
| * | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-24136-517/+1218
| |\ \ \ | | |/ /
| * | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-217-47/+93
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2152-235/+536
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-1612-30/+51
| |\ \ \ \ \
| * | | | | | Fix tests and disallow 0 to make it consistent with .gitlab-ci.ymlLin Jen-Shin2017-02-152-1/+2
| * | | | | | rubocop: Align the operands of an expressionLin Jen-Shin2017-02-151-2/+2
| * | | | | | Use the same syntax for default expirationLin Jen-Shin2017-02-152-3/+6
| * | | | | | Initial implementation for default artifacts expirationLin Jen-Shin2017-02-152-3/+6
* | | | | | | Backport groups API to V3Robert Schilling2017-02-242-0/+39
* | | | | | | API: Use parameter to get owned groups instead of dedicated endpointRobert Schilling2017-02-241-12/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-23109-417/+432
|\ \ \ \ \ \
| * | | | | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-2/+2
| * | | | | | Stylistic tweaksDouwe Maan2017-02-236-21/+21
| * | | | | | Fix OAuth/SAML user blocking behaviorDouwe Maan2017-02-231-1/+3
| * | | | | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-2318-73/+73
| * | | | | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2343-209/+209
| * | | | | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-234-8/+8
| * | | | | | Move up delegate callsDouwe Maan2017-02-231-2/+2
| * | | | | | ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-231-2/+0
| * | | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-232-7/+4
| * | | | | | Don’t exclude some file in lib from rubocopDouwe Maan2017-02-2334-206/+187
| * | | | | | Fix new offensesDouwe Maan2017-02-232-2/+2
| * | | | | | Enable Rails/DelegateDouwe Maan2017-02-2310-40/+14
| * | | | | | Enable Style/WordArrayDouwe Maan2017-02-238-8/+8
View Lorry Controller Status