summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Add a thin encapsulation around .pluck(:id)Nick Thomas2019-03-285-14/+19
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Inherit from ApplicationRecord instead of ActiveRecord::BaseNick Thomas2019-03-28149-150/+150
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'winh-jest-gon' into 'master'Filipa Lacerda2019-03-295-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set gon.ee in Jest Closes #59634 See merge request gitlab-org/gitlab-ce!26713
| * | | | | | | | | | | | | | | | | | Set gon.ee in Jestwinh-jest-gonWinnie Hellmann2019-03-282-9/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Ignore Jest config from ESLintWinnie Hellmann2019-03-282-1/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Extract IS_EE config helperWinnie Hellmann2019-03-282-5/+10
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '10735-geo-gitlab-revision-can-return-not-consistent-results' ↵Sean McGivern2019-03-293-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use a fixed git abbrev parameter when we fetch a git revision See merge request gitlab-org/gitlab-ce!26707
| * | | | | | | | | | | | | | | | | | Use a fixed git abbrev parameter when we fetch a git revision10735-geo-gitlab-revision-can-return-not-consistent-resultsValery Sizov2019-03-283-2/+7
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'leipert-port-scsslint' into 'master'Filipa Lacerda2019-03-291-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport scss-lint config from EE See merge request gitlab-org/gitlab-ce!26711
| * | | | | | | | | | | | | | | | | | Backport scss-lint config from EELukas Eipert2019-03-281-1/+3
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '10085-resovle-ee-diff' into 'master'Filipa Lacerda2019-03-291-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds EE validators to CE file See merge request gitlab-org/gitlab-ce!26736
| * | | | | | | | | | | | | | | | | | Adds EE validators to CE fileSarah Groff Hennigh-Palermo2019-03-291-0/+6
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'winh-jest-helpers' into 'master'Phil Hughes2019-03-2911-0/+235
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy missing helpers from Karma to Jest See merge request gitlab-org/gitlab-ce!26729
| * | | | | | | | | | | | | | | | | | Copy missing helpers from Karma to JestWinnie Hellmann2019-03-2811-0/+235
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy missing helpers from Karma to Jest
* | | | | | | | | | | | | | | | | | Merge branch 'tr-add-requested-resource-metric-ce' into 'master'Phil Hughes2019-03-294-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add requested resources to cluster health - ce port See merge request gitlab-org/gitlab-ce!26326
| * | | | | | | | | | | | | | | | | Add requested resources to cluster health - ce portTristan Read2019-03-294-6/+14
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'patch-30' into 'master'Evan Read2019-03-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | README.md: fix URL to CI Lint See merge request gitlab-org/gitlab-ce!26580
| * | | | | | | | | | | | | | | | | README.md: fix URL to CI LintDamian Nowak2019-03-261-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs-ci-intro-illustration' into 'master'Mike Lewis2019-03-293-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update CI/CD intro - workflow illustration Closes #59108 See merge request gitlab-org/gitlab-ce!26733
| * | | | | | | | | | | | | | | | | | Update ci workflow illustrationMarcia Ramos2019-03-283-1/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '9420-truncate-long-tags' into 'master'Mike Greiling2019-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate long tags in runners table See merge request gitlab-org/gitlab-ce!26666
| * | | | | | | | | | | | | | | | | Truncate long tags in runners tableSarah Groff Hennigh-Palermo2019-03-281-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ce-reduce-diff-with-ce-in-spec-helpers' into 'master'Lin Jen-Shin2019-03-286-7/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Reduce diff with EE in `spec/helpers` Closes gitlab-ee#10143 See merge request gitlab-org/gitlab-ce!26706
| * | | | | | | | | | | | | | | | [CE] Reduce the diff with EE in spec/helpers/projects_helper_spec.rbRémy Coutable2019-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | [CE] Reduce the diff with EE in spec/helpers/merge_requests_helper_spec.rbRémy Coutable2019-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | [CE] Reduce the diff with EE in spec/helpers/issuables_helper_spec.rbRémy Coutable2019-03-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | [CE] Reduce the diff with EE in spec/helpers/group_helper_spec.rbRémy Coutable2019-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | [CE] Reduce the diff with EE in spec/helpers/auth_helper_spec.rbRémy Coutable2019-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | [CE] Reduce the diff with EE in spec/helpers/appearances_helper_spec.rbRémy Coutable2019-03-281-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'related-mr-link-cutoff' into 'master'docs-ci-variables-move-9-0-renamingAnnabel Dunstone Gray2019-03-282-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't cutoff letters in MR and Issue links See merge request gitlab-org/gitlab-ce!25910
| * | | | | | | | | | | | | | | | Don't cutoff letters in MR and Issue linksgfyoung2019-03-282-0/+6
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Mike Greiling2019-03-282-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.55.0 See merge request gitlab-org/gitlab-ce!26664
| * | | | | | | | | | | | | | | Merge branch 'master' into 'renovate/gitlab-svgs-1.x'Lukas 'Eipi' Eipert2019-03-282-5/+5
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json
* | | | | | | | | | | | | | | Merge branch '24936-remove-type-from-review-app-name' into 'master'Mike Greiling2019-03-282-10/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant group name from environment name on the "Environments" page Closes #24936 See merge request gitlab-org/gitlab-ce!25600
| * | | | | | | | | | | | | | | Remove folder from environment nameNathan Friend2019-03-182-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, environments grouped together in a "folder" would include the folder name in the UI. This information was unnecessary since the folder is also shown in the UI. In addition, this commit also makes some minor changes to how tooltips are displayed for both environments and folders.
* | | | | | | | | | | | | | | | Merge branch 'standardize-click-and-go-to' into 'master'Rémy Coutable2019-03-2855-90/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize usage of `click_` and `go_to` on GUI tests See merge request gitlab-org/gitlab-ce!26328
| * | | | | | | | | | | | | | | Standardize usage of `click_` and `go_to` on GUI testsWalmyr2019-03-2855-90/+84
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR addresses the following issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/57043 Based on the following comment: https://gitlab.com/gitlab-org/gitlab-ce/issues/57043#note_136663994
* | | | | | | | | | | | | | | Merge branch 'id-get-blobs-performance' into 'master'Douwe Maan2019-03-281-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize old_blob and new_blob to improve performance See merge request gitlab-org/gitlab-ce!26604
| * | | | | | | | | | | | | | | Memoize old_blob and new_blob to improve performanceIgor2019-03-281-2/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'docs-document-qa-specific-branch-naming' into 'master'Rémy Coutable2019-03-281-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the branch naming conventions for QA-only changes See merge request gitlab-org/gitlab-ce!26704
| * | | | | | | | | | | | | | Document the branch naming conventions for QA-only changesRémy Coutable2019-03-281-0/+18
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'remove-cng-job' into 'master'Robert Speicher2019-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove cloud-native-job from CI See merge request gitlab-org/gitlab-ce!25605
| * | | | | | | | | | | | | | Make cloud release job manual, as a fallbackBalasankar "Balu" C2019-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | | | | | | | Merge branch 'knative-update' into 'master'Grzegorz Bizon2019-03-283-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Knative version bump 0.2.2 -> 0.3.0 See merge request gitlab-org/gitlab-ce!26459
| * | | | | | | | | | | | | | | Knative version bump 0.2.2 -> 0.3.0Chris Baumbauer2019-03-283-3/+8
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch ↵Phil Hughes2019-03-283-13/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master' Remove EE differences for monitoring dashboard See merge request gitlab-org/gitlab-ce!26574
| * | | | | | | | | | | | | | | Remove EE differences for monitoring dashboardSimon Knox2019-03-273-13/+62
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '59079-fix-jupyter-render-loop' into 'master'Phil Hughes2019-03-282-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix jupyter rendering bug that ended in an infinite loop Closes #59079 See merge request gitlab-org/gitlab-ce!26667
| * | | | | | | | | | | | | | | | Fix jupyter rendering bug that ended in an infinite loopROSPARS Benoit2019-03-272-14/+20
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '10518-boards-css' into 'master'Phil Hughes2019-03-281-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for boards.scss Closes gitlab-ee#10518 See merge request gitlab-org/gitlab-ce!26647