summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate frontend markdown tests to Jestwinh-markdown-jestMartin Hobert2019-06-276-78/+77
| | | | (cherry picked from commit df66c1f9ebad9c7838b84e6468a2ef00b2a8c7a8)
* Merge branch 'vue-i18n-js-diffs-directory' into 'master'Phil Hughes2019-06-265-17/+30
|\ | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/diffs directory See merge request gitlab-org/gitlab-ce!29963
| * Vue-i18n: app/assets/javascripts/diffs directoryEzekiel Kigbo2019-06-265-17/+30
|/ | | | | i18n linting for .vue files under the app/assets/javascripts/diffs directory
* Merge branch 'graphql-error-when-authorizing-with-no-permissions-defined' ↵Bob Van Landuyt2019-06-263-19/+46
|\ | | | | | | | | | | | | into 'master' Sanity check for GraphQL authorized? See merge request gitlab-org/gitlab-ce!29921
| * Remove unused authorized_find methodgraphql-error-when-authorizing-with-no-permissions-definedLuke Duncalfe2019-06-263-25/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29921#note_184713939
| * Sanity check for GraphQL authorized?Luke Duncalfe2019-06-262-0/+51
| | | | | | | | | | | | | | | | Raise an exception if a developer calls any of the GraphQL authorization methods and a `authorize :permission` is missing from a mutation class. Previously `authorized?` would return `true` in this situation, which although technically is accurate is not what a developer is intending.
* | Merge branch 'docs-update-2fa' into 'master'Evan Read2019-06-261-3/+2
|\ \ | | | | | | | | | | | | Docs: Add more info on recovery codes See merge request gitlab-org/gitlab-ce!29879
| * | Docs: Add more info on recovery codesTristan Williams2019-06-261-3/+2
|/ /
* | Merge branch 'docs/63418-docs-feedback-update-for-11-11-1-feature-flag' into ↵Evan Read2019-06-261-1/+8
|\ \ | | | | | | | | | | | | | | | | | | 'master' Add note about Docker socket mounting See merge request gitlab-org/gitlab-ce!29924
| * | Add note about Docker socket mountingdocs/63418-docs-feedback-update-for-11-11-1-feature-flagSteve Azzopardi2019-06-251-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `docker:dind` service and the Runner has the socket mounted as well it will lead to the following error: ``` Failed to load listeners: can't create unix socket /var/run/docker.sock: device or resource busy ``` reference https://gitlab.com/gitlab-org/gitlab-ce/issues/63418
* | | Merge branch 'da-fix-cache-for-broadcast-message' into 'master'Stan Hu2019-06-252-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Set 2 weeks as the expiration time for the current broadcast message See merge request gitlab-org/gitlab-ce!30062
| * | | Set 2 weeks as the expiration time for the current broadcast messageDouglas Barbosa Alexandre2019-06-252-4/+4
| | |/ | |/|
* | | Merge branch 'da-fix-json-cache-false-values' into 'master'Stan Hu2019-06-252-2/+35
|\ \ \ | | | | | | | | | | | | | | | | Parse the cached value when it is false on Gitlab::JsonCache#read See merge request gitlab-org/gitlab-ce!30061
| * | | Parse the cached value when the it is falseDouglas Barbosa Alexandre2019-06-252-2/+35
| |/ /
* | | Merge branch 'fix/jupyter-git-v3' into 'master'Thong Kuah2019-06-252-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Fix Jupyter-Git integration See merge request gitlab-org/gitlab-ce!30020
| * | | Add changelogAmit Rathi2019-06-251-0/+5
| | | |
| * | | Use oauth2 in .git-credentialsAmit Rathi2019-06-251-1/+1
| | | |
* | | | Merge branch 'winh-board_service_spec' into 'master'Mike Greiling2019-06-251-0/+390
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing unit tests for BoardService See merge request gitlab-org/gitlab-ce!29988
| * | | | Add missing unit tests for BoardServiceWinnie Hellmann2019-06-251-0/+390
|/ / / /
* | | | Merge branch 'ashmckenzie/new-user-signup-ab-test' into 'master'Thong Kuah2019-06-257-13/+74
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | CE port of new user signup with/without reCAPTCHA A/B test (no-op) See merge request gitlab-org/gitlab-ce!29341
| * | | New RecaptchaExperimentHelper modulesAsh McKenzie2019-06-257-13/+74
|/ / / | | | | | | | | | | | | RecaptchaExperimentHelper contains helper methods to assist in the controller and view layers.
* | | Update CHANGELOG.md for 12.0.2GitLab Release Tools Bot2019-06-259-40/+17
| | | | | | | | | [ci skip]
* | | Merge branch 'sh-squelch-null-store' into 'master'Robert Speicher2019-06-251-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Squelch output of ActiveSupport::Cache::NullStore in tests See merge request gitlab-org/gitlab-ce!30055
| * | | Squelch output of ActiveSupport::Cache::NullStore in testsStan Hu2019-06-251-0/+7
|/ / / | | | | | | | | | | | | | | | When a spec fails relating to the cache, the job log can easily exceed the maximum length and make it harder to see the actual issue (e.g. https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/239803017).
* | | Merge branch 'rs-ee-inflections' into 'master'Lin Jen-Shin2019-06-251-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Copy inflections from EE See merge request gitlab-org/gitlab-ce!30041
| * | | Copy inflections from EErs-ee-inflectionsRobert Speicher2019-06-251-0/+8
| | | |
* | | | Merge branch '60697-docs-feedback-revise-operations-dashboard-docs' into ↵Marcia Ramos2019-06-251-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Docs feedback: revise operations dashboard" Closes #60697 See merge request gitlab-org/gitlab-ce!30038
| * | | | Clarify permissions for Operations dashboardAchilleas Pipinellis2019-06-251-7/+4
| |/ / /
* | | | Merge branch 'docs/add-code-comments-development-guide' into 'master'Marcia Ramos2019-06-252-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code comments development guide Closes #63132 See merge request gitlab-org/gitlab-ce!30043
| * | | | Add code comments development guideDmitriy Zaporozhets2019-06-252-0/+15
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'ce-mw-onboarding-tour-project-creation' into 'master'Filipa Lacerda2019-06-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | (CE Port) Set project path on localStorage during onboarding See merge request gitlab-org/gitlab-ce!29989
| * | | | (CE Port) Set project path on localStorage during onboardingMartin Wortschack2019-06-251-2/+2
|/ / / /
* | | | Merge branch ↵Filipa Lacerda2019-06-257-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
| * | | | Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestonesDmitriy Zaporozhets2019-06-247-15/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch ↵Grzegorz Bizon2019-06-254-3/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'require-pipeline-when-enabling-only-allow-merge-if-pipeline-succeeds' into 'master' Pipeline must be present if "Pipeline must succeed" is set See merge request gitlab-org/gitlab-ce!29926
| * | | | | Use actual_head_pipeline to enforce presenceFabio Pitino2019-06-251-2/+2
| | | | | |
| * | | | | Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeedsFabio Pitino2019-06-254-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user sets only_allow_merge_if_pipeline_succeeds, also named as "Pipeline must succeed" project setting, we require the pipeline to be present. This solves race condition issues especially with external CI providers when a build is triggered externally but no pipelines are created in GitLab yet. Document that a head pipeline is expected when using "Pipeline must succeed" setting. Also explain limitations with the use of only/except where there may not be any jobs created and the merge request will not be allowed to be merged.
* | | | | | Merge branch '63225-move-vuex-action-helper-to-jest' into 'master'Filipa Lacerda2019-06-252-5/+168
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move vuex action helper spec to Jest See merge request gitlab-org/gitlab-ce!29653
| * | | | | | Move Vuex action helper spec to JestMark Florian2019-06-252-5/+168
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a straight-forward copy of the Karma spec, with the usual Karma->Jest necessary changes. This also fixes a bug in the implementation that was causing the tests to fail, when run on Jest/node, whereby actions that return rejected promises would always fail the given test. This was due to those rejections not being caught in the same call stack in which they were created.
* | | | | | Merge branch 'winh-this-jest-docs' into 'master'Marcia Ramos2019-06-251-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that this.something is not available in Jest (docs) Closes #24809 See merge request gitlab-org/gitlab-ce!29887
| * | | | | | Clarify that this.something is not available in Jest (docs)Winnie Hellmann2019-06-251-0/+3
|/ / / / / /
* | | | | | Merge branch 'winh-jest-webpack-docs' into 'master'Marcia Ramos2019-06-251-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Clarify that Jest does not use Webpack (docs) See merge request gitlab-org/gitlab-ce!30000
| * | | | | Clarify that Jest does not use Webpack (docs)Winnie Hellmann2019-06-251-0/+2
|/ / / / /
* | | | | Merge branch 'gitaly-version-v1.49.0' into 'master'Bob Van Landuyt2019-06-254-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.49.0 Closes gitaly#1738 See merge request gitlab-org/gitlab-ce!29990
| * | | | | Fix broken worktree testGitalyBot2019-06-254-15/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | The setup was wrong, and due to Gitaly being a bit more strict it had to match up. The test is now accurate and passing again.
* | | | | Merge branch 'sh-quiet-backup-secrets-log' into 'master'Rémy Coutable2019-06-252-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence backup warnings when CRON=1 in use Closes #63703 See merge request gitlab-org/gitlab-ce!30033
| * | | | | Silence backup warnings when CRON=1 in useStan Hu2019-06-252-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CRON=1 is in use, we shouldn't generate any output or admins may be notified via e-mail about unnecessary warnings. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63703
* | | | | | Merge branch 'docs/dep-scanning-not-support-list' into 'master'Achilleas Pipinellis2019-06-251-7/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention what tools are not supported in Dependency Scanning See merge request gitlab-org/gitlab-ce!30030
| * | | | | | Mention what tools are not supported in Dependency Scanningdocs/dep-scanning-not-support-listAchilleas Pipinellis2019-06-251-7/+10
| | | | | | |
* | | | | | | Merge branch '11586-make-create-an-issue-default-for-incident-management-ce' ↵Andreas Brandl2019-06-253-4/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' CE backport: Resolve "Make "Create an issue" default for Incident Management" See merge request gitlab-org/gitlab-ce!29747
View Lorry Controller Status