Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix capitalization of `Target branch`43786-on-the-issuable-list-add-tooltips-to-icons | Lukas Eipert | 2018-03-21 | 1 | -1/+1 |
| | |||||
* | add tooltip to milestone | Lukas Eipert | 2018-03-19 | 1 | -1/+3 |
| | |||||
* | add tooltip to target branches of merge requests | Lukas Eipert | 2018-03-19 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' into 43786-on-the-issuable-list-add-tooltips-to-icons | Lukas Eipert | 2018-03-19 | 187 | -2723/+4901 |
|\ | |||||
| * | Merge branch ↵ | Filipa Lacerda | 2018-03-19 | 1 | -9/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | '43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted' into 'master' Resolve "Notes karma specs failing" Closes #44002 See merge request gitlab-org/gitlab-ce!17627 | ||||
| | * | 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 1.0.0 -> 1.10 Closes #14292 See merge request gitlab-org/gitlab-ce!17764 | ||||
| | * | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Atomic generation of internal ids for issues. Closes #31114 See merge request gitlab-org/gitlab-ce!17580 | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | We can extend this later, but for now we don't have the use case. | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | The specs are based on a schema version that doesn't know about `internal_ids` table. However, the actual code being execute relies on it. | ||||
| | * | | Add changelog. | Andreas Brandl | 2018-03-16 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | Closes #31114. | ||||
| | * | | 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 Chart See merge request gitlab-org/gitlab-ce!17844 | ||||
| | * | | | Added Video explaining Cloud native GitLab Chartabuango-cloud-native | Abubakar Ango | 2018-03-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch ↵ | Douwe Maan | 2018-03-19 | 3 | -18/+38 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary' into 'master' Resolve "Viewing a particular commit gives 500 error ~ Error (undefined method `binary?')" Closes #44257 See merge request gitlab-org/gitlab-ce!17805 | ||||
| | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can be a `BatchLoader` which is proxying a nil, while not being concrete nils themselves. | ||||
| * | | | | | 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" Closes #44022 See merge request gitlab-org/gitlab-ce!17697 | ||||
| | * | | | | | 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 See merge request gitlab-org/gitlab-ce!17843 | ||||
| | * | | | | 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 See merge request gitlab-org/gitlab-ce!17791 | ||||
| | * | | | | | 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 See merge request gitlab-org/gitlab-ce!17842 | ||||
| | * | | | | Rename `package-qa` in docs | Toon Claes | 2018-03-19 | 3 | -3/+3 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ce!17807 the `package-qa` job was renamed to `package-and-qa`. But it was not renamed in the docs. So this change fixes that. | ||||
| * | | | | Merge branch 'update-gitlab-ci-yml-services-docs' into 'master' | Achilleas Pipinellis | 2018-03-19 | 2 | -1/+67 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI services documnetation Closes gitlab-runner#3095 See merge request gitlab-org/gitlab-ce!17749 | ||||
| | * | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update kubeclient 2.2.0 -> 3.0 Closes #43911 See merge request gitlab-org/gitlab-ce!17739 | ||||
| | * \ \ \ \ | Merge branch 'master' into 'update-kubeclient' | Grzegorz Bizon | 2018-03-17 | 233 | -3409/+5755 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock | ||||
| | * | | | | | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0) | Pirate Praveen | 2018-03-15 | 10 | -10/+10 |
| | | | | | | | | |||||
| | * | | | | | | Update kubeclient 2.2.0 -> 3.0 | Pirate Praveen | 2018-03-14 | 2 | -12/+12 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' ↵ | Mike Greiling | 2018-03-19 | 5 | -32/+43 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17538 | ||||
| | * | | | | | | | Move UnresolvedDiscussions vue component | George Tsiolis | 2018-03-08 | 5 | -32/+43 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master' | Kamil Trzciński | 2018-03-18 | 6 | -7/+55 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify ambiguous with_artifacts implication Closes #44138 See merge request gitlab-org/gitlab-ce!17720 | ||||
| | * | | | | | | | | Fix specfix/sm/clarify-ambiguous-with_artifacts-implication | Shinya Maeda | 2018-03-16 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use with_artifacts_archive name. Add spec | Shinya Maeda | 2018-03-15 | 4 | -6/+42 |
| | | | | | | | | | |