| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update Code Quality example documentationdocs-update_code_quality_example | Olivier Gonzalez | 2018-03-16 | 1 | -7/+15 |
| | | |||||
| * | 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) | ||||
| | * | | | | | | | | Fix variables collection item sequence specs | Grzegorz Bizon | 2018-03-14 | 1 | -4/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use new collections to define build predefined variables | Grzegorz Bizon | 2018-03-13 | 1 | -53/+50 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix rubocop offense in auto devops predefined variables | Grzegorz Bizon | 2018-03-13 | 1 | -3/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add more unit tests for variables collection class | Grzegorz Bizon | 2018-03-13 | 3 | -1/+33 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Improve how we handle persistent runner variables | Grzegorz Bizon | 2018-03-13 | 3 | -19/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Make predefined variables in a collection public by default | Grzegorz Bizon | 2018-03-13 | 4 | -15/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | DRY project-level predefined variables | Grzegorz Bizon | 2018-03-13 | 5 | -20/+26 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add TODOs to refactoried variables collections code | Grzegorz Bizon | 2018-03-12 | 2 | -0/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use variables collection as build predefined variables | Grzegorz Bizon | 2018-03-12 | 5 | -28/+42 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Extract variables collection item to a separate class | Grzegorz Bizon | 2018-03-12 | 6 | -36/+103 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Document runner's expecations regarding variable collection | Grzegorz Bizon | 2018-03-12 | 1 | -6/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Make variables collection to runner mapping explicit | Grzegorz Bizon | 2018-03-07 | 3 | -7/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collections | Grzegorz Bizon | 2018-03-07 | 7133 | -125747/+302357 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (6164 commits) | ||||
| | * | | | | | | | | | Fix hash syntax in variables collection classbackstage/gb/refactor-ci-cd-variables-collections | Grzegorz Bizon | 2017-09-22 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Introduce CI/CD variables collection class | Grzegorz Bizon | 2017-09-22 | 3 | -11/+132 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'rs-ci-build-spec-warnings' into 'master' | Kamil Trzciński | 2018-03-15 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove RSpec warnings from `spec/models/ci/build_spec.rb` See merge request gitlab-org/gitlab-ce!17755 | ||||
| | * | | | | | | | | | | Don't attempt to override a `set` with a `let`rs-ci-build-spec-warnings | Robert Speicher | 2018-03-14 | 1 | -8/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Don't use `not_to raise_error(SomeError)` | Robert Speicher | 2018-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'ab-44205-user_interacted_projects-migration' into 'master' | Yorick Peterse | 2018-03-15 | 3 | -49/+110 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrency issue with migration for user_interacted_projects table. Closes #44205 See merge request gitlab-org/gitlab-ce!17728 | ||||
| | * | | | | | | | | | | | Fix concurrency issue with migration for user_interacted_projects table.ab-44205-user_interacted_projects-migration | Andreas Brandl | 2018-03-14 | 3 | -49/+110 |
| | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The concurrency issue originates from inserts on `user_interacted_projects` from the app while running the post-deploy migration. This change comes with a strategy to lock the table while removing duplicates and creating the unique index (and similar for FK constraints). Also, we'll have a non-unique index until the post-deploy migration is finished to speed up queries during that time. Closes #44205. | ||||
| * | | | | | | | | | | | Merge branch 'docs-fe-html' into 'master' | Tim Zallmann | 2018-03-15 | 1 | -1/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add HTML style guide See merge request gitlab-org/gitlab-ce!17616 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |