summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-1214-26/+54
| | | | | Since we migrated all PersonlAccessTokens to store only its hash in the DB, the token value can no longer be shown to the user.
* Merge branch 'sh-strip-trailing-whitespace-job-app-vue' into 'master'Filipa Lacerda2018-11-081-3/+3
|\ | | | | | | | | Strip trailing whitespace in job_app.vue See merge request gitlab-org/gitlab-ce!22897
| * Strip trailing whitespace in job_app.vuesh-strip-trailing-whitespace-job-app-vueStan Hu2018-11-071-3/+3
| | | | | | | | This caused unnecessary conflicts in EE.
* | Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'Sean McGivern2018-11-0826-1234/+89
|\ \ | | | | | | | | | | | | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" See merge request gitlab-org/gitlab-ce!22891
| * | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-0726-1234/+89
| | | | | | | | | | | | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* | | Merge branch 'docs/fix-mysql-docs-links' into 'master'Achilleas Pipinellis2018-11-081-21/+27
|\ \ \ | | | | | | | | | | | | | | | | Fix broken links and other minor improvements See merge request gitlab-org/gitlab-ce!22858
| * | | Fix broken links and other minor improvementsEvan Read2018-11-081-21/+27
|/ / /
* | | Merge branch 'docs/fix-version-number-ce-doc' into 'master'Achilleas Pipinellis2018-11-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Feature backported to CE in 11.5, not 10.7 Closes #53648 See merge request gitlab-org/gitlab-ce!22892
| * | | Feature backported to CE in 11.5, not 10.7docs/fix-version-number-ce-docEvan Read2018-11-081-1/+1
| | | |
* | | | Merge branch 'docs/fix-various-404s' into 'master'Achilleas Pipinellis2018-11-084-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Markdown so renderer parses links correctly, fixing 404s See merge request gitlab-org/gitlab-ce!22895
| * | | | Fix Markdown so renderer parses links correctly, fixing 404sdocs/fix-various-404sEvan Read2018-11-084-9/+9
| | | | | | | | | | | | | | | | | | | | Also corrects capitalisation of Git.
* | | | | Merge branch '_acet-discussion-redesign' into 'master'Mike Greiling2018-11-0824-276/+629
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussions redesign Closes #29294 See merge request gitlab-org/gitlab-ce!22333
| * | | | | Discussions redesignFatih Acet2018-11-0824-276/+629
|/ / / / /
* | | | | Merge branch 'ee-backport-4753-tracing-mvc' into 'master'Sean McGivern2018-11-083-5/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | backport changes from gitlab-ee!7903 See merge request gitlab-org/gitlab-ce!22767
| * | | | | backport changes from gitlab-ee!7903Simon Knox2018-11-083-5/+26
|/ / / / /
* | | | | Merge branch 'qa-issues-filter-history-only' into 'master'Sanad Liaquat2018-11-083-0/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix for the filter spec failure Closes gitlab-org/quality/nightly#34 and gitlab-org/quality/nightly#30 See merge request gitlab-org/gitlab-ce!22862
| * | | | Fix for the filter spec failureRamya Authappan2018-11-083-0/+11
|/ / / /
* | | | Merge branch 'docs-autodevops-rbac' into 'master'Evan Read2018-11-081-56/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds documentation for restricted project service account in deployment jobs Closes #51717 See merge request gitlab-org/gitlab-ce!22810
| * | | | Adds documentation for restricted project service account in deployment jobsMayra Cabrera2018-11-081-56/+63
|/ / / /
* | | | Merge branch 'mk/import-bare-repo-from-hashed-storage-docs' into 'master'Evan Read2018-11-081-1/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that we do not support importing bare repositories from hashed storage in certain cases Closes #41423 See merge request gitlab-org/gitlab-ce!22783
| * | | | Improve wording and consistencyMichael Kozono2018-11-071-18/+19
| | | | |
| * | | | Add an example of the stored project pathMichael Kozono2018-11-071-2/+9
| | | | |
| * | | | Add steps to manually migrate projectsMichael Kozono2018-11-071-1/+18
| | | | |
| * | | | Document limitation of bare repository importMichael Kozono2018-11-051-1/+46
| | | | |
* | | | | Merge branch 'ml-qa-git-protocol-v2-spec' into 'master'Nick Thomas2018-11-087-13/+211
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Add e2e test of push over SSH using Git protocol v2 See merge request gitlab-org/gitlab-ce!22548
| * | | | Add e2e test of push over SSH over Git protocol v2ml-qa-git-protocol-v2-specMark Lapierre2018-11-077-13/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new end-to-end test to check that Git protocol v2 can be used to push over SSH. Includes a change in Git::Repository to use Runtime::Env.debug? to enable logging instead of .verbose?
* | | | | Merge branch 'docs/add-warning-for-registry-configuration' into 'master'Evan Read2018-11-071-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Emphasis the importance of auth registry See merge request gitlab-org/gitlab-ce!22843
| * | | | | Emphasis the importance of auth registrydocs/add-warning-for-registry-configurationSteve Azzopardi2018-11-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The container registry requires the `auth` config to be set up properly or users will be able to download images that they are not authorized to do so. For example https://gitlab.com/gitlab-org/gitlab-runner/issues/3652
* | | | | | Merge branch 'fix-stuck-import-jobs-query-performance-issue' into 'master'Douwe Maan2018-11-074-35/+51
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | StuckImportJobsWorker query performance optimization See merge request gitlab-org/gitlab-ce!22879
| * | | | | StuckImportJobsWorker query performance optimizationTiago Botelho2018-11-074-35/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the performance of fetching the enqueued projects for StuckImportJobsWorker, preventing a statement timeout.
* | | | | | Merge branch 'button-icon' into 'master'Tim Zallmann2018-11-071-0/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Adds a btn-icon class See merge request gitlab-org/gitlab-ce!22870
| * | | | | Adds a btn-icon classbutton-iconsamdbeckham2018-11-071-0/+4
| | | | | |
* | | | | | Merge branch 'gt-align-sign-in-button' into 'master'Mike Greiling2018-11-072-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align sign in button Closes #53673 See merge request gitlab-org/gitlab-ce!22888
| * | | | | | Align sign in buttonGeorge Tsiolis2018-11-072-1/+6
| | | | | | |
* | | | | | | Merge branch 'prevent-override-of-attr_encrypted' into 'master'Stan Hu2018-11-071-5/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent attr_encrypted models from being overriden Closes gitlab-ee#8234 See merge request gitlab-org/gitlab-ce!22764
| * | | | | | | Prevent attr_encrypted models from being overridenStan Hu2018-11-071-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing spec in spec/controllers/admin/hooks_controller_spec.rb attr_encrypted expects models to have their attribute methods defined, or it will override them with standard Ruby accessors. Migration specs that rolled back the state of the database after columns were migrated to encrypted values were interfering with these definitions. To ensure that the SystemHook specs pass, we need to call `SystemHook.define_attribute_methods` to ensure that attr_encrypted sees the right methods that reflect the latest state of the database. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8234
* | | | | | | | Merge branch 'sh-paginate-bitbucket-server-imports' into 'master'Douglas Barbosa Alexandre2018-11-0710-20/+132
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paginate Bitbucket Server importer projects See merge request gitlab-org/gitlab-ce!22825
| * | | | | | | | Paginate Bitbucket Server importer projectsStan Hu2018-11-0710-20/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent delays in loading the page and reduce memory usage, limit the number of projects shown at 25 per page. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021
* | | | | | | | | Merge branch 'danger-mr-title-warning' into 'master'Robert Speicher2018-11-071-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn when MR titles are too long. See merge request gitlab-org/gitlab-ce!22845
| * | | | | | | | | Warn when MR titles are too longdanger-mr-title-warningYorick Peterse2018-11-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a Danger check to produce a warning for MR titles greater than 72 characters. This is necessary because when squash on merge is used, the MR title will be used for the commit message (at least by default). This in turn leads to commit messages that violate our commit message guidelines. For more information, refer to https://gitlab.com/gitlab-org/release/framework/issues/24.
* | | | | | | | | | Merge branch 'jira-ping-differentiate-cloud' into 'master'Sean McGivern2018-11-073-2/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping - Differentiate Jira Server and Cloud Closes #51043 See merge request gitlab-org/gitlab-ce!22791
| * | | | | | | | | | Usage ping - Differentiate Jira Server and Cloudjira-ping-differentiate-cloudMario de la Ossa2018-11-073-2/+34
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ml-fix-create-merge-spec-qa' into 'master'Robert Speicher2018-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix e2e create merge request test Closes gitlab-org/quality/nightly#32 See merge request gitlab-org/gitlab-ce!22877
| * | | | | | | | | | | Fix e2e create merge request testml-fix-create-merge-spec-qaMark Lapierre2018-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QA selector to 'New label' button on empty labels page
* | | | | | | | | | | | Merge branch 'bvl-patches-via-mail' into 'master'Douwe Maan2018-11-0731-13/+1065
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to add patches to merge requests created via email Closes #40830 See merge request gitlab-org/gitlab-ce!22723
| * | | | | | | | | | | | Allow limiting quick actions to executeBob Van Landuyt2018-11-076-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we don't want to trigger any quick actions that cause side effects. For example when building a record to validate. This allows listing the quick actions that need to be performed.
| * | | | | | | | | | | | Apply patches when creating MR via emailBob Van Landuyt2018-11-0726-4/+1022
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to add patches as attachments to merge request created via email. When an email to create a merge request is sent, all the attachments ending in `.patch` will be applied to the branch specified in the subject of the email. If the branch did not exist, it will be created from the HEAD of the repository. When the patches could not be applied, the error message will be replied to the user. The patches can have a maximum combined size of 2MB for now.
* | | | | | | | | | | | | Merge branch 'dz-fix-initialize-shards' into 'master'Dmitriy Zaporozhets2018-11-071-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in initializers/fill_shards See merge request gitlab-org/gitlab-ce!22871
| * | | | | | | | | | | | | Fix syntax error in initializers/fill_shardsDmitriy Zaporozhets2018-11-071-4/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'issue_7478' into 'master'Fatih Acet2018-11-077-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport - Chart showing issues created per month See merge request gitlab-org/gitlab-ce!22793