| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 'mr-sticky-tabs-perf-bar' into 'master' | Filipa Lacerda | 2018-03-16 | 1 | -0/+5 |
| |\ | | | | | | | | | Fixes merge request bar styling when performance bar is visible See merge request gitlab-org/gitlab-ce!17778 | ||||
| | * | Fixes merge request bar styling when performance bar is visiblemr-sticky-tabs-perf-bar | Phil Hughes | 2018-03-15 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'docs-ee-5017-rename_sast_container_to_container_scanning' into ↵ | Achilleas Pipinellis | 2018-03-16 | 4 | -60/+64 |
| |\ \ | | | | | | | | | | | | | | | | | | | 'master' Rename SAST for Docker to Container Scanning in documentation See merge request gitlab-org/gitlab-ce!17769 | ||||
| | * | | Rename SAST for Docker to Container Scanning in documentation. Refs ↵docs-ee-5017-rename_sast_container_to_container_scanning | Olivier Gonzalez | 2018-03-15 | 4 | -60/+64 |
| | | | | | | | | | | | | | gitlab-org/gitlab-ee#5017 | ||||
| * | | | Merge branch 'revert-feb95ce3' into 'master' | Grzegorz Bizon | 2018-03-16 | 2 | -3/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | Revert "Merge branch 'update-httparty' into 'master'" See merge request gitlab-org/gitlab-ce!17789 | ||||
| | * | | | Revert "Merge branch 'update-httparty' into 'master'" | Stan Hu | 2018-03-16 | 2 | -3/+4 |
| |/ / / | | | | | | | This reverts merge request !17737 | ||||
| * | | | Update CHANGELOG.md for 10.5.5 | Ian Baum | 2018-03-15 | 6 | -25/+14 |
| | | | | | | | | | | [ci skip] | ||||
| * | | | Merge branch 'docs-new-fe-guide-style' into 'master' | Jacob Schatz | 2018-03-15 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | Rename style to style guide in new frontend guide See merge request gitlab-org/gitlab-ce!17725 | ||||
| | * | | | Rename style to style guide in new frontend guide | Clement Ho | 2018-03-15 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | Merge branch 'fix-import-helper-spec' into 'master' | Stan Hu | 2018-03-15 | 1 | -4/+2 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Fix import helper spec when a previous spec stubs settings Closes gitlab-ee#5303 See merge request gitlab-org/gitlab-ce!17776 | ||||
| | * | | Fix import helper spec when a previous spec stubs settings | Sean McGivern | 2018-03-15 | 1 | -4/+2 |
| | | | | | | | | | | | | | This should use stub_omniauth_setting, not do it manually. | ||||
| * | | | Merge branch 'jivl-realtime-update-adding-file' into 'master' | Phil Hughes | 2018-03-15 | 3 | -0/+52 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add realtime pipeline status component for files Closes #42927 See merge request gitlab-org/gitlab-ce!17705 | ||||
| | * | | | Include feature spec for realtime pipelinejivl-realtime-update-adding-file | Mayra Cabrera | 2018-03-14 | 1 | -9/+18 |
| | | | | | |||||
| | * | | | Add realtime pipeline status component for files | Jose Ivan Vargas | 2018-03-14 | 3 | -0/+43 |
| | | | | | |||||
| * | | | | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' ↵ | Stan Hu | 2018-03-15 | 7 | -18/+57 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reduce Redis usage from merge request diffs caching" Closes #44191 See merge request gitlab-org/gitlab-ce!17746 | ||||
| | * | | | | Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-caching | Sean McGivern | 2018-03-15 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This may lead to some being evicted and having to be cached again, but many MRs get closed or updated in that time anyway. | ||||
| | * | | | | Only cache highlight results for latest MR diffs | Sean McGivern | 2018-03-15 | 7 | -17/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we kept them all in the cache. We don't need the highlight results for older diffs - if someone does view that (which is rare), we can do the highlighting on the fly. | ||||
| * | | | | | Merge branch '44306-drop-jquery-rails' into 'master' | Phil Hughes | 2018-03-15 | 2 | -6/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop jquery-rails gem from Gemfile Closes #44306 See merge request gitlab-org/gitlab-ce!17771 | ||||
| | * | | | | | Remove jquery-rails from Gemfile | Balasankar "Balu" C | 2018-03-15 | 2 | -6/+0 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'issue_41724' into 'master' | Sean McGivern | 2018-03-15 | 1 | -0/+103 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Add labeled issues seed Closes #41724 See merge request gitlab-org/gitlab-ce!17754 | ||||
| | * | | | | Add labeled issues seedissue_41724 | Felipe Artur | 2018-03-15 | 1 | -0/+103 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master' | Grzegorz Bizon | 2018-03-15 | 8 | -1/+254 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add slash command for moving an issue See merge request gitlab-org/gitlab-ce!17691 | ||||
| | * | | | | Add slash command for moving an issue | Sean McGivern | 2018-03-15 | 8 | -1/+254 |
| | | | | | | | | | | | | | | | | | | | | | Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857 | ||||
| * | | | | | Merge branch 'fix-42459-#-in-branch' into 'master' | Sean McGivern | 2018-03-15 | 3 | -1/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually escape '#' when building relative uris, closes #42459 Closes #42459 See merge request gitlab-org/gitlab-ce!17679 | ||||
| | * | | | | | add spec testing '#' escape in relative link filter | Jan Beckmann | 2018-03-14 | 1 | -0/+17 |
| | | | | | | | |||||
| | * | | | | | Manually escape '#' when building relative uris, fixes #42459 | Jan | 2018-03-11 | 2 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'42762-project-settings-sections-cannot-be-expanded-after-submission-error | Kamil Trzciński | 2018-03-15 | 15 | -145/+380 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce CI/CD variables collection Closes #33042 See merge request gitlab-org/gitlab-ce!14439 | ||||
| | * | | | | | | Fix pipeline predefined variables specs | Grzegorz Bizon | 2018-03-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections | Grzegorz Bizon | 2018-03-14 | 4 | -41/+96 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Hide emoji popup after multiple spaces or blank lines Remove enforcing uniqueness of build variables Improve pipeline tests for variables to test ordering Improve tests for predefined variables for a build Conflicts: spec/models/ci/build_spec.rb spec/models/ci/pipeline_spec.rb | ||||
| | * | | | | | | | Fix pipeline specs for predefined variables | Grzegorz Bizon | 2018-03-14 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | DRY remaining instances of predefined variables | Grzegorz Bizon | 2018-03-14 | 5 | -34/+35 |
| | | | | | | | | | |||||
| | * | | | | | | | Improve predefined variables collection methods | Grzegorz Bizon | 2018-03-14 | 3 | -13/+22 |
| | | | | | | | | | |||||
| | * | | | | | | | Port deployment variables skeleton code from EE | Grzegorz Bizon | 2018-03-14 | 2 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit backports method signatures and related implementation to the CE, to make CE and EE identical. This does not add any features from EE, it is only aimed to reduce conflicts between CE and EE in the future. | ||||
| | * | | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections | Grzegorz Bizon | 2018-03-14 | 826 | -3683/+9698 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (211 commits) | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |