summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-requestFabio Pitino2019-05-313-22/+10
|
* Merge branch '60987-emoji-picker-popup' into 'master'Kushal Pandya2019-05-313-0/+7
|\ | | | | | | | | | | | | Fix emoji picker popup is not always fully visible Closes #60987 See merge request gitlab-org/gitlab-ce!28984
| * Fix emoji picker visibility issueFatih Acet2019-05-313-0/+7
| |
* | Merge branch '59587-add-graphql-logging' into 'master'Sean McGivern2019-05-3110-19/+238
|\ \ | |/ |/| | | | | | | | | Add logging to GraphQL Closes #59587 See merge request gitlab-org/gitlab-ce!27885
| * Apply reviewer feedback59587-add-graphql-loggingcharlie ablett2019-05-317-55/+82
| | | | | | | | | | | | | | | | | | | | | | | | - Comply doc with guidelines - Improve tests for readability and completeness - Separate out phases visually with newlines - Add `format_message` test - test readability - code and test structure/styling - static query analyzers - call `as_json` on `provided_variables` - add exception handling
| * Move complexity/depth to `final_value`charlieablett2019-05-304-38/+33
| | | | | | | | | | | | Tidy tests according to reviewer comments. Move complexity and depth calls from `initial_value` to `final_value` Log variables as json
| * Add `graphql_json` logfile documentationcharlieablett2019-05-301-0/+13
| |
| * Call analyzers from LoggerAnalyzercharlieablett2019-05-306-51/+51
| | | | | | | | | | - Add changelog file - Fix failing tests
| * Add GraphQL logging feature flagcharlieablett2019-05-302-2/+19
| |
| * Restructure complexity analyzercharlieablett2019-05-304-30/+78
| | | | | | | | | | Remove instance variables for class re-use, test individual methods, use `monotonic_time`
| * Implement logger analyzercharlieablett2019-05-307-39/+108
| | | | | | | | | | | | | | - Modify GraphqlLogger to subclass JsonLogger - Replace the single-line analyser with one that can log all the GraphQL query related information in one place. - Implement analyzer behavior with spec
| * New logfile for graphql queriescharlieablett2019-05-304-1/+51
| | | | | | | | | | Specify dedicated logfile and logger class for GraphQL queries. Move complexity analyzer to a dedicated class.
* | Merge branch 'remove-legacy-artifacts-related-code' into 'master'Kamil Trzciński2019-05-3124-522/+94
|\ \ | | | | | | | | | | | | | | | | | | Remove legacy artifact related code Closes #58595 See merge request gitlab-org/gitlab-ce!26475
| * | Remove legacy artifact related coderemove-legacy-artifacts-related-codeShinya Maeda2019-05-3124-522/+94
| | | | | | | | | | | | | | | | | | We've already migrated all the legacy artifacts to the new realm, which is ci_job_artifacts table. It's time to remove the old code base that is no longer used.
* | | Merge branch '62432-fix-participants-wrapping' into 'master'Annabel Dunstone Gray2019-05-312-4/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix participants list padding Closes #62432 See merge request gitlab-org/gitlab-ce!28873
| * | | Update participants paddingJacques Erasmus2019-05-312-4/+7
|/ / / | | | | | | | | | Updated the padding to our standard size
* | | Merge branch 'docs-its-relative-5' into 'master'Achilleas Pipinellis2019-05-3116-31/+30
|\ \ \ | | | | | | | | | | | | | | | | Docs: Convert links in various docs to relative See merge request gitlab-org/gitlab-ce!28967
| * | | Docs: Convert links in various docs to relativeMarcel Amirault2019-05-3116-31/+30
|/ / /
* | | Merge branch 'docs-its-relative-4' into 'master'Achilleas Pipinellis2019-05-3112-29/+29
|\ \ \ | | | | | | | | | | | | | | | | Docs: Convert remaining links in /user to relative See merge request gitlab-org/gitlab-ce!28964
| * | | Docs: Convert remaining links in /user to relativeMarcel Amirault2019-05-3112-29/+29
|/ / /
* | | Merge branch 'docs-hackathon-1' into 'master'Achilleas Pipinellis2019-05-311-10/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add introduced column to table in Personal Access Tokens doc Closes #60531 See merge request gitlab-org/gitlab-ce!28874
| * | | Docs: Add introduced column to table in Personal Access Tokens docMarcel Amirault2019-05-311-10/+8
|/ / /
* | | Merge branch 'docs-its-relative-3' into 'master'Achilleas Pipinellis2019-05-3112-33/+33
|\ \ \ | | | | | | | | | | | | | | | | Docs: Finish changing links to relative in user/project (part 2) See merge request gitlab-org/gitlab-ce!28934
| * | | Docs: Finish changing links to relative in user/project (part 2)Marcel Amirault2019-05-3112-33/+33
|/ / /
* | | Merge branch 'docs-its-relative-2' into 'master'Achilleas Pipinellis2019-05-3121-54/+46
|\ \ \ | | | | | | | | | | | | | | | | Docs: Change links to relative in /user/project (Part 1) See merge request gitlab-org/gitlab-ce!28920
| * | | Docs: Change links to relative in /user/project (Part 1)Marcel Amirault2019-05-3121-54/+46
|/ / /
* | | Merge branch 'docs-hackathon-4' into 'master'Achilleas Pipinellis2019-05-311-132/+129
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clean up tables in permissions doc Closes #59249 See merge request gitlab-org/gitlab-ce!28908
| * | | Docs: Clean up tables in permissions docMarcel Amirault2019-05-311-132/+129
|/ / /
* | | Merge branch 'add-constraint-for-milestone-dates' into 'master'Sean McGivern2019-05-315-16/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Limit milestones to before year 9999 Closes #58576 See merge request gitlab-org/gitlab-ce!28742
| * | | Change query to work on mysql as well. Also set entire date because setting ↵Luke Picciau2019-05-315-16/+74
|/ / / | | | | | | | | | only the year can trip 'start_date_should_be_less_than_due_date'
* | | Merge branch 'ac-namespaces-stats-no-coalesce' into 'master'Andreas Brandl2019-05-315-2/+66
|\ \ \ | | | | | | | | | | | | | | | | Remove nils from project_statistics.packages_size See merge request gitlab-org/gitlab-ce!28400
| * | | Remove nils from project_statistics.packages_sizeAlessio Caiazza2019-05-315-2/+66
|/ / / | | | | | | | | | Now it defaults to 0
* | | Merge branch 'bvl-phabricator-import-issues' into 'master'Phil Hughes2019-05-3153-60/+1746
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Setup Phabricator import Closes #60562 See merge request gitlab-org/gitlab-ce!27877
| * | | Setup Phabricator importBob Van Landuyt2019-05-3153-60/+1746
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sets up all the basics for importing Phabricator tasks into GitLab issues. To import all tasks from a Phabricator instance into GitLab, we'll import all of them into a new project that will have its repository disabled. The import is hooked into a regular ProjectImport setup, but similar to the GitHub parallel importer takes care of all the imports itself. In this iteration, we're importing each page of tasks in a separate sidekiq job. The first thing we do when requesting a new page of tasks is schedule the next page to be imported. But to avoid deadlocks, we only allow a single job per worker type to run at the same time. For now we're only importing basic Issue information, this should be extended to richer information.
* | | | Merge branch '62148-groupDeleteConfirm' into 'master'Bob Van Landuyt2019-05-312-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete group confirm popup mention projects deletion Closes #62148 See merge request gitlab-org/gitlab-ce!28899
| * | | | update gitlab.pot after suggestion applyRomain Maneschi2019-05-301-1/+1
| | | | |
| * | | | Apply suggestion to app/helpers/groups_helper.rbManeschi Romain2019-05-301-1/+1
| | | | |
| * | | | delete group confirm popup mention projects deletionRomain Maneschi2019-05-292-2/+2
| | | | |
* | | | | Merge branch 'i18n-Two_Factor_Authentication-of-user-profile' into 'master'Bob Van Landuyt2019-05-317-46/+138
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of Two-Factor Authentication page in user profile See merge request gitlab-org/gitlab-ce!28749
| * \ \ \ \ Merge remote-tracking branch ↵antonyliu2019-05-310-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'origin/i18n-Two_Factor_Authentication-of-user-profile' into i18n-Two_Factor_Authentication-of-user-profile
| | * \ \ \ \ Merge remote-tracking branch ↵antonyliu2019-05-300-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'origin/i18n-Two_Factor_Authentication-of-user-profile' into i18n-Two_Factor_Authentication-of-user-profile
| | | * | | | | Fix bug for picking up string that end with html_safeantonyliu2019-05-302-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Move .html_safe outside of the _() so the parser picks up on the translation.
| | | * | | | | Apply suggestion to app/views/profiles/two_factor_auths/_codes.html.hamlantony liu2019-05-301-1/+2
| | | | | | | |
| | | * | | | | Merge branch masterantonyliu2019-05-29290-8912/+4990
| | | |\ \ \ \ \
| | | * | | | | | Regenerate locale/gitlab.potantonyliu2019-05-281-3/+3
| | | | | | | | |
| | | * | | | | | Apply suggestion to app/views/profiles/two_factor_auths/show.html.hamlantony liu2019-05-281-1/+1
| | | | | | | | |
| | | * | | | | | Externalize strings of Two-Factor Authentication page in user profileantonyliu2019-05-258-48/+136
| | | | | | | | |
| | * | | | | | | Fix bug for picking up string that end with html_safeantonyliu2019-05-302-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move .html_safe outside of the _() so the parser picks up on the translation.
| | * | | | | | | Apply suggestion to app/views/profiles/two_factor_auths/_codes.html.hamlantony liu2019-05-301-1/+2
| | | | | | | | |
| | * | | | | | | Regenerate locale/gitlab.potantonyliu2019-05-301-3/+3
| | | | | | | | |