Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove `www.` from `twitter_url` helperrs-twitter-helper | Robert Speicher | 2018-03-19 | 1 | -3/+3 |
* | Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master' | Robert Speicher | 2018-03-19 | 2 | -0/+11 |
|\ | |||||
| * | Remove N+1 queries in /admin/projects page | Stan Hu | 2018-03-19 | 2 | -0/+11 |
* | | Merge branch 'refactor/move-mr-widget-sha-mismatch-vue-component' into 'master' | Clement Ho | 2018-03-19 | 7 | -26/+39 |
|\ \ | |||||
| * | | Move ShaMismatch vue component | George Tsiolis | 2018-03-19 | 7 | -26/+39 |
* | | | Merge branch 'sh-fix-failure-project-destroy' into 'master' | Robert Speicher | 2018-03-19 | 2 | -1/+10 |
|\ \ \ | |||||
| * | | | Fix "Can't modify frozen hash" error when project is destroyedsh-fix-failure-project-destroy | Stan Hu | 2018-03-16 | 2 | -1/+10 |
| | |/ | |/| | |||||
* | | | Merge branch 'update-doorkeeper-openid_connect' into 'master' | Douwe Maan | 2018-03-19 | 2 | -12/+13 |
|\ \ \ | |||||
| * | | | Update doorkeeper-openid_connect and doorkeeper | Pirate Praveen | 2018-03-16 | 2 | -12/+13 |
* | | | | Merge branch 'remove-oj' into 'master' | Robert Speicher | 2018-03-19 | 2 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | Remove oj as we're not using it | Lin Jen-Shin | 2018-03-19 | 2 | -5/+0 |
* | | | | | Merge branch '43928-merge-request-comment-gets-cleared-once-the-previous-comm... | Filipa Lacerda | 2018-03-19 | 1 | -9/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Resolve "Notes karma specs failing" | Simon Knox | 2018-03-19 | 1 | -9/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'update-omniauth-saml' into 'master' | Douwe Maan | 2018-03-19 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Relax omniauth-saml | Pirate Praveen | 2018-03-15 | 2 | -2/+2 |
* | | | | | Merge branch '31114-internal-ids-are-not-atomic' into 'master' | Sean McGivern | 2018-03-19 | 19 | -8/+383 |
|\ \ \ \ \ | |||||
| * | | | | | Add spec for concurrent insert situation.31114-internal-ids-are-not-atomic | Andreas Brandl | 2018-03-18 | 1 | -0/+13 |
| * | | | | | Replace public_send calls. | Andreas Brandl | 2018-03-18 | 1 | -3/+3 |
| * | | | | | Address review comments. | Andreas Brandl | 2018-03-16 | 6 | -19/+22 |
| * | | | | | Only support single scope argument. | Andreas Brandl | 2018-03-16 | 1 | -4/+2 |
| * | | | | | Simplify migration and add NOT NULL to project_id. | Andreas Brandl | 2018-03-16 | 2 | -20/+4 |
| * | | | | | Address review comments. | Andreas Brandl | 2018-03-16 | 2 | -17/+15 |
| * | | | | | Add new model to import/export configuration. | Andreas Brandl | 2018-03-16 | 1 | -0/+1 |
| * | | | | | Add shared specs for AtomicInternalId concern. | Andreas Brandl | 2018-03-16 | 3 | -2/+46 |
| * | | | | | Backwards-compat for migration specs. | Andreas Brandl | 2018-03-16 | 2 | -4/+35 |
| * | | | | | Add changelog. | Andreas Brandl | 2018-03-16 | 1 | -0/+5 |
| * | | | | | Use bigserial for internal_ids table. | Andreas Brandl | 2018-03-16 | 2 | -2/+2 |
| * | | | | | Add bigserial as a native database type for MySQL adapter | Douglas Barbosa Alexandre | 2018-03-16 | 1 | -0/+11 |
| * | | | | | Refactor, extract class and improve comments. | Andreas Brandl | 2018-03-16 | 5 | -43/+95 |
| * | | | | | More flexible way of internal id generation. | Andreas Brandl | 2018-03-16 | 5 | -49/+42 |
| * | | | | | Atomic generation of internal ids for issues. | Andreas Brandl | 2018-03-16 | 8 | -1/+243 |
| * | | | | | Deprecate InternalId concern and rename. | Andreas Brandl | 2018-03-16 | 6 | -6/+6 |
* | | | | | | Merge branch 'abuango-cloud-native' into 'master' | Achilleas Pipinellis | 2018-03-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added Video explaining Cloud native GitLab Chartabuango-cloud-native | Abubakar Ango | 2018-03-19 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '44257-viewing-a-particular-commit-gives-500-error-error-undefin... | Douwe Maan | 2018-03-19 | 3 | -18/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary | Sean McGivern | 2018-03-16 | 3 | -18/+38 |
* | | | | | | | Merge branch '44022-singular-1-diff' into 'master' | Sean McGivern | 2018-03-19 | 3 | -2/+63 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Resolve "GitLab Community Edition 10.5.3 shows plural for 1 item" | Jan | 2018-03-19 | 3 | -2/+63 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fl-update-svgs' into 'master' | Phil Hughes | 2018-03-19 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Updates svg dependency | Filipa Lacerda | 2018-03-19 | 2 | -4/+4 |
* | | | | | | | Merge branch 'le-issue-boards-height-calculation' into 'master' | Phil Hughes | 2018-03-19 | 4 | -61/+80 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make issue boards height calculation clearer and remove magic numbers | Lukas Eipert | 2018-03-19 | 4 | -61/+80 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'tc-package-qa-rename-docs' into 'master' | Grzegorz Bizon | 2018-03-19 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Rename `package-qa` in docs | Toon Claes | 2018-03-19 | 3 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'update-gitlab-ci-yml-services-docs' into 'master' | Achilleas Pipinellis | 2018-03-19 | 2 | -1/+67 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Copyedit CI services docs | Achilleas Pipinellis | 2018-03-19 | 1 | -56/+33 |
| * | | | | | | Add CHANGELOG entryupdate-gitlab-ci-yml-services-docs | Tomasz Maczukin | 2018-03-14 | 1 | -0/+5 |
| * | | | | | | Update CI services documnetation | Tomasz Maczukin | 2018-03-14 | 1 | -0/+84 |
* | | | | | | | Merge branch 'update-kubeclient' into 'master' | Grzegorz Bizon | 2018-03-19 | 12 | -22/+23 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into 'update-kubeclient' | Grzegorz Bizon | 2018-03-17 | 233 | -3409/+5755 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | |