summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a security harness scriptrs-security-harnessRobert Speicher2018-02-131-0/+55
| | | | | This script toggles a Git pre-push hook that will prevent pushing to remotes other than dev when the harness is enabled.
* Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-133-22/+3
|\ | | | | | | | | Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092
| * Remove Sentry reporting for query limitingYorick Peterse2018-02-133-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Sentry, while useful, poses two problems you have to choose from: 1. All errors are reported separately, making it easy to create issues but also making it next to impossible to see other errors (due to the sheer volume of threshold errors). 2. Errors can be grouped or merged together, reducing the noise. This however also means it's (as far as I can tell) much harder to automatically create GitLab issues from Sentry for the offending controllers. Since both solutions are terrible I decided to go with a third option: not using Sentry for this at all. Instead we'll investigate using Prometheus alerts and Grafana dashboards for this, which has the added benefit of being able to more accurately measure the behaviour over time. Note that throwing errors in test environments is still enabled, and whitelisting is still necessary to prevent that from happening (and that in turn still requires that developers create issues).
* | Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' ↵Phil Hughes2018-02-133-1/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix settings panels not expanding when fragment hash linked Closes #43198 See merge request gitlab-org/gitlab-ce!17074
| * | Fix settings panel not expanding when fragment hash linkedEric Eastwood2018-02-133-1/+35
| | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43198
* | | Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ↵Kamil Trzciński2018-02-131-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fully enable nginx-ingress metrics Closes #43189 See merge request gitlab-org/gitlab-ce!17069
| * | | Properly format values.yaml for deployed Ingresses43189-deployed-ingress-configmap-does-not-enable-metricsJoshua Lambert2018-02-121-1/+2
| | | |
* | | | Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master'Robert Speicher2018-02-135-49/+79
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port spec/fixtures/api/schemas/deployment.json from EE See merge request gitlab-org/gitlab-ce!17090
| * | | | Port some RuboCop and doc changes from EERémy Coutable2018-02-133-6/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Port spec/fixtures/api/schemas/deployment.json from EERémy Coutable2018-02-132-43/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix/remove-allow-n-plus-1-from-network-graph' into 'master'Robert Speicher2018-02-131-5/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove allow_n_plus_1 block from Network::Graph Closes #37436 and gitaly#998 See merge request gitlab-org/gitlab-ce!17087
| * | | | | Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graphAhmad Sherif2018-02-131-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37436 Closes gitaly#998
* | | | | | Merge branch 'fix/remove-allow-n-plus-1-from-delete-merged-branches-service' ↵Robert Speicher2018-02-131-11/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove allow_n_plus_1 block from DeleteMergedBranchesService Closes #37438 and gitaly#999 See merge request gitlab-org/gitlab-ce!17058
| * | | | | | Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-serviceAhmad Sherif2018-02-121-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #37438 Fixes gitaly#999
* | | | | | | Merge branch '42580-fix-lock-mr-hover-on-edit' into 'master'Phil Hughes2018-02-132-3/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes hover style for lock merge request edit link Closes #42580 See merge request gitlab-org/gitlab-ce!17065
| * | | | | | | Make Edit link style consistent on Sidebar42580-fix-lock-mr-hover-on-editAndré Luís2018-02-132-3/+10
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Especially making the link on Lock MR section work the same as others on hover
* | | | | | | Merge branch 'document-all-queues-yml' into 'master'Kamil Trzciński2018-02-131-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document all_queues.yml in sidekiq_style_guide.md See merge request gitlab-org/gitlab-ce!17079
| * | | | | | | Update sidekiq_style_guide.mddocument-all-queues-ymlDylan Griffith2018-02-131-2/+2
| | | | | | | |
| * | | | | | | Document all_queues.yml in sidekiq_style_guide.mdDylan Griffith2018-02-131-0/+3
| | | | | | | |
* | | | | | | | Merge branch '26466-natural-sort-mrs' into 'master'Sean McGivern2018-02-134-2/+52
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group MR numbers on issue show page by project and namespace Closes #26466 See merge request gitlab-org/gitlab-ce!8494
| * | | | | | | Change issue show page to group MRs by projects and namespacesJeff Stubler2018-02-134-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #26466.
* | | | | | | | Merge branch 'qa/mk-fix-artifact-creation' into 'master'Grzegorz Bizon2018-02-131-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix artifact creation in CI/CD QA spec See merge request gitlab-org/gitlab-ce!17078
| * | | | | | | | Fix artifact creationqa/mk-fix-artifact-creationMichael Kozono2018-02-121-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-02-1316-2933/+17627
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of EE-translations See merge request gitlab-org/gitlab-ce!17081
| * | | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2018-02-1316-2933/+17627
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!4481
* | | | | | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-135-119/+118
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "PrepareUntrackedUploads PostgreSQL syntax error" Closes #42881 See merge request gitlab-org/gitlab-ce!17019
| * | | | | | | | Dry up specmk-fix-no-untracked-upload-files-errorMichael Kozono2018-02-121-107/+29
| | | | | | | | |
| * | | | | | | | Add changelog entryMichael Kozono2018-02-121-0/+5
| | | | | | | | |
| * | | | | | | | Schedule PopulateUntrackedUploads if neededMichael Kozono2018-02-122-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To finish migrating untracked files to uploads for installations that were affected by https://gitlab.com/gitlab-org/gitlab-ce/issues/42881 Or just to delete the temp table if it is empty and left behind.
| * | | | | | | | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-122-26/+27
| | | | | | | | |
| * | | | | | | | Fix last batch size equals max batch size errorMichael Kozono2018-02-122-1/+25
| | | | | | | | |
* | | | | | | | | Merge branch '42923-close-issue' into 'master'Phil Hughes2018-02-1315-49/+238
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Can't close issue through buttons in the textarea on mobile" Closes #42923 See merge request gitlab-org/gitlab-ce!17043
| * | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-13132-10113/+339
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (25 commits) Addressed mr observations Clean new Flash() and stop disabling no-new (eslint) when possible Disable query limiting warnings for now on GitLab.com Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" Fix warning messages for promoting labels and milestones Fixed missing js selector for the realtime pipelines commit comp Honour workhorse provided file name Create an empty wiki when there is no wiki in the gitlab export bundle Revert and remove header_title line from labels issue Fixed bug with param config changed params passed to from a string to an object Move IssuableTimeTracker vue component Fix breadcrumb on labels page for groups Convert groups_select ajax to use axios Default CI variables to unprotected make sure there is a dependency on Gitlab::CurrentSettings is Make GITLAB_FEATURES in build_spec compatible with EE Update jquery.waitforimages & use npm version Fixed typo, updated test, and removed commented code Replaced use of $.get with axios.get and updated tests ...
| * | | | | | | | Reuse getter42923-close-issueFilipa Lacerda2018-02-126-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add loading button for better UX
| * | | | | | | | [ci skip] Merge branch 'master' into 42923-close-issueFilipa Lacerda2018-02-1261-358/+918
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP) Return a warning string if we try to encode to unsupported encoding Remove confirmation_input Resolve failures in GitHub-ish import controller specs Remove changelogs for already-released security patches Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4' Merge branch 'fix/gh-namespace-issue' into 'security-10-4' Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4' Merge branch 'fix-mermaid-xss' into 'security-10-4' Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' API - fix searching in group/project specified by path Add documentation on how to build a QA Docker image Fix english in style_guide_js.md Adds tooltip for environment name Adds CSS for child envrionments Do not attach runner to a non-exsiting network in QA Remove not needed default statement Improve docs about allowing some side effects on the constructor Move all ENV to Runtime::Env Rename .scss files to use snake_case Moves missing branch into a vue file ...
| * | | | | | | | | Put back class names used in shared testFilipa Lacerda2018-02-121-0/+2
| | | | | | | | | |
| * | | | | | | | | Makes close/reopen issue request to inside the vue appFilipa Lacerda2018-02-0913-40/+206
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-no-cache-populate-migration' into 'master'Sean McGivern2018-02-134-7/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable caching of tables for migration spec that drops a temporary table See merge request gitlab-org/gitlab-ce!16965
| * | | | | | | | | | Fix a transient failure in ↵sh-no-cache-populate-migrationRémy Coutable2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db/post_migrate/20170717111152_cleanup_move_system_upload_folder_symlink.rb where symlink already exists Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Use the latest migration in ↵Rémy Coutable2018-02-121-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/migrations/rename_reserved_project_names_spec.rb We do that because it's using factories and it's not worth it to get rid of them. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Allow to use the latest migration in migration specsRémy Coutable2018-02-121-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for migration tests that relies on factories and that are very old and/or tedious to modify to not use factories. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Call .reset_column_in_all_models! before migrating in ↵Rémy Coutable2018-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Use the :migration metadata in migration specsRémy Coutable2018-02-122-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Disable caching of tables for migration spec that drops a temporary tableStan Hu2018-02-122-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fix job failures, such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51409392.
* | | | | | | | | | | Merge branch 'sh-fix-issue-43193' into 'master'Sean McGivern2018-02-132-14/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500s creating merge requests with external issue tracker Closes #43193 See merge request gitlab-org/gitlab-ce!17073
| * | | | | | | | | | | Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193Stan Hu2018-02-122-14/+26
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When JIRA or Redmine were enabled and the branch name did not match the matching regular expression, the `issue_iid` would be `nil`, preventing users from creating merge requests. Closes #43193
* | | | | | | | | | | Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-1310-139/+135
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
| * | | | | | | | | | Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-styleWinnie Hellmann2018-02-1210-139/+135
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-1290-9702/+55
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated katex library Closes #43032 See merge request gitlab-org/gitlab-ce!15864
| * | | | | | | | | | Addressed mr observationsjivl-update-katexJose Ivan Vargas2018-02-124-19/+12
| | | | | | | | | | |