| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow CI/CD Jobs being grouped on version strings | Zeger-Jan van de Weg | 2018-03-01 | 3 | -2/+9 |
| | | | | | | This makes grouping on version number available. In general I'd like to group based on MAJOR.MINOR version numbers for Gitaly. | ||||
| * | Merge branch 'ee-3727-epic-labels-backport' into 'master' | Filipa Lacerda | 2018-03-01 | 5 | -15/+62 |
| |\ | | | | | | | | | CE Platform port for EE epics filtered search changes See merge request gitlab-org/gitlab-ce!17445 | ||||
| | * | Add support for custom container classee-3727-epic-labels-backport | Kushal Pandya | 2018-03-01 | 1 | -1/+9 |
| | | | |||||
| | * | Update class init config | Kushal Pandya | 2018-03-01 | 1 | -1/+3 |
| | | | |||||
| | * | Update FilteredSearchManager init config | Kushal Pandya | 2018-03-01 | 1 | -2/+14 |
| | | | |||||
| | * | Add group related config and endpoint methods to be consistent with EE | Kushal Pandya | 2018-03-01 | 2 | -11/+36 |
| | | | |||||
| * | | Merge branch 'dispatcher-issuable-sidebar-backport' into 'master' | Phil Hughes | 2018-03-01 | 4 | -38/+51 |
| |\ \ | | | | | | | | | | | | | init sidebar bundle separately to allow EE override See merge request gitlab-org/gitlab-ce!17412 | ||||
| | * | | init sidebar bundle separately to allow EE override | Simon Knox | 2018-03-01 | 4 | -38/+51 |
| |/ / | |||||
| * | | Merge branch 'fl-expandbutton-backport' into 'master' | Phil Hughes | 2018-03-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Use v-if in the expand button for performance See merge request gitlab-org/gitlab-ce!17394 | ||||
| | * | | Use v-if in the expand button for performancefl-expandbutton-backport | Filipa Lacerda | 2018-02-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'winh-inline-script-linter' into 'master' | Rémy Coutable | 2018-03-01 | 14 | -0/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | | Forbid all inline script tags in Linter::InlineJavaScript See merge request gitlab-org/gitlab-ce!17437 | ||||
| | * | | | Ignore InlineJavaScript linter in existing script tag locations.winh-inline-script-linter | Connor Shea | 2018-02-28 | 13 | -0/+15 |
| | | | | | |||||
| | * | | | Update inline_javascript.rb to lint uses of the javascript filter as well as ↵ | Connor Shea | 2018-02-28 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | script tags. | ||||
| | * | | | Update inline_javascript.rb | Winnie Hellmann | 2018-02-28 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Forbid all inline script tags in Linter::InlineJavaScript | Winnie Hellmann | 2018-02-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'sh-tag-migrations-with-sidekiq' into 'master' | Rémy Coutable | 2018-03-01 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Tag migration specs with :sidekiq to clear queues between tests See merge request gitlab-org/gitlab-ce!17442 | ||||
| | * | | | | Tag migration specs with :sidekiq to clear queues between testssh-tag-migrations-with-sidekiq | Stan Hu | 2018-02-28 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | This was failing in https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/55004375 | ||||
| * | | | | | Merge branch 'build-finished-worker-spec-prepend' into 'master' | Rémy Coutable | 2018-03-01 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove use of any_instance_of in runner spec See merge request gitlab-org/gitlab-ce!17427 | ||||
| | * | | | | | Remove use of any_instance_of in runner specbuild-finished-worker-spec-prepend | Yorick Peterse | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE we prepend a module into BuildFinishedWorker. This would cause this spec to fail because RSpec doesn't support the use of "any_instance_of" with classes that include a prepended module. To work around this we just stub the "perform_async" class method instead of stubbing the "perform" instance method. | ||||
| * | | | | | | Merge branch 'sh-bump-git-2.16' into 'master' | DJ Mountney | 2018-03-01 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Bump GitLab CI image to use git 2.16 See merge request gitlab-org/gitlab-ce!17440 | ||||
| | * | | | | | Add update for packed-refs with git v2.16sh-bump-git-2.16 | Stan Hu | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Bump GitLab CI test image to use git v2.16 | Stan Hu | 2018-02-28 | 1 | -1/+1 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | git 2.15.0 has some significant performance improvements when running `git fetch` on a repository that has lots of references. See https://gitlab.com/gitlab-com/migration/issues/216#note_60672987 for more details. | ||||
| * | | | | | Merge branch 'protected-tags-bundle-refactor' into 'master' | Clement Ho | 2018-03-01 | 4 | -13/+6 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Removed protected_tags webpack bundle See merge request gitlab-org/gitlab-ce!17334 | ||||
| | * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵protected-tags-bundle-refactor | Constance Okoghenun | 2018-02-27 | 229 | -1066/+1420 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | protected-tags-bundle-refactor | ||||
| | * \ \ \ \ | Resolved conflicts in ↵ | Constance Okoghenun | 2018-02-26 | 98 | -651/+1133 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | app/assets/javascripts/pages/projects/settings/repository/show/index.js | ||||
| | * | | | | | | Removed protected_tags webpack bundle | Constance Okoghenun | 2018-02-23 | 4 | -14/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'pipelines_show_refactor' into 'master' | Jacob Schatz | 2018-02-28 | 5 | -6/+12 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Refactor pipelines show for webpack bundle tag removal See merge request gitlab-org/gitlab-ce!17127 | ||||
| | * | | | | | | Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactor | Clement Ho | 2018-02-28 | 160 | -783/+2554 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * | | | | | | | Remove unnecessary element checks | Clement Ho | 2018-02-27 | 1 | -57/+51 |
| | | | | | | | | | |||||
| | * | | | | | | | Add initPipelineDetails to pipelines build path | Clement Ho | 2018-02-27 | 4 | -124/+68 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into 'pipelines_show_refactor' | Clement Ho | 2018-02-27 | 17 | -101/+82 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into 'pipelines_show_refactor' | Clement Ho | 2018-02-27 | 320 | -1713/+2549 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| | * | | | | | | | | Fix failing paths | Jacob Schatz | 2018-02-23 | 2 | -8/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix conflicts | Jacob Schatz | 2018-02-23 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Remove webpack bundle | Jacob Schatz | 2018-02-23 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Refactor pipelines show for webpack bundle tag removal | Jacob Schatz | 2018-02-23 | 2 | -2/+70 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'enviroments-webpack-bundle-refactor' into 'master' | Jacob Schatz | 2018-02-28 | 4 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove webpack bundle tag for enviroments See merge request gitlab-org/gitlab-ce!17371 | ||||
| | * | | | | | | | | Remove webpack bundle tag for enviroments | Constance Okoghenun | 2018-02-28 | 4 | -4/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'dispatcher-cleanup' into 'master' | Jacob Schatz | 2018-02-28 | 10 | -59/+27 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup webpack config See merge request gitlab-org/gitlab-ce!17410 | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into 'dispatcher-cleanup' | Jacob Schatz | 2018-02-28 | 68 | -367/+774 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js | ||||
| * | | | | | | | | | Merge branch 'assignees-vue-component-missing-data-container' into 'master' | Filipa Lacerda | 2018-02-28 | 2 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Assignees vue component missing data container See merge request gitlab-org/gitlab-ce!17426 | ||||
| | * | | | | | | | | | Add Assignees vue component missing data container | George Tsiolis | 2018-02-28 | 2 | -0/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '4826-create-empty-wiki-when-it-s-enabled' into 'master' | Stan Hu | 2018-02-28 | 3 | -0/+54 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure wiki exists when it's enabled See merge request gitlab-org/gitlab-ce!17117 | ||||
| | * | | | | | | | | | | Add spec to prove that we don't create wiki when we update project's name4826-create-empty-wiki-when-it-s-enabled | Valery Sizov | 2018-02-28 | 1 | -0/+11 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Make sure wiki exists when it's enabled | Valery Sizov | 2018-02-26 | 2 | -0/+38 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | update changelog | Valery Sizov | 2018-02-14 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'sh-issue-43636' into 'master' | Filipa Lacerda | 2018-02-28 | 1 | -17/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pipelines mini graph spec that wasn't actually testing anything Closes #43636 See merge request gitlab-org/gitlab-ce!17428 | ||||
| | * | | | | | | | | | | | Remove pipelines mini graph spec that wasn't actually testing anythingsh-issue-43636 | Stan Hu | 2018-02-28 | 1 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was also causing crashes in Chrome V64, so it's best to remove it for now. Closes #43636 | ||||
| * | | | | | | | | | | | | Merge branch 'dispatcher-cycle-analytics' into 'master' | Jacob Schatz | 2018-02-28 | 4 | -7/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cycle analytics bundle webpack entry point See merge request gitlab-org/gitlab-ce!17407 | ||||
| | * | | | | | | | | | | | | Remove cycle analytics bundle webpack entry point | Clement Ho | 2018-02-28 | 4 | -7/+6 |
| |/ / / / / / / / / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |