summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '26375-markdown-footnotes-not-working' into 'master'Lin Jen-Shin2019-01-1712-21/+237
|\ | | | | | | | | | | | | Markdown footnotes not working Closes #26375 See merge request gitlab-org/gitlab-ce!24168
| * Bumping the CACHE_COMMONMARK_VERSION26375-markdown-footnotes-not-workingBrett Walker2019-01-171-1/+1
| | | | | | | | | | Since the rendering of footnotes is changed, the cached html need to be updated
| * Update to nokogiri 1.10.1Brett Walker2019-01-174-8/+8
| |
| * Refactoring and addressing review commentsBrett Walker2019-01-176-47/+88
| | | | | | | | and additional spec
| * Updates based on review commentsBrett Walker2019-01-103-9/+16
| |
| * Update nokogiri to 1.10.0Brett Walker2019-01-082-9/+9
| | | | | | | | and truncato to 0.7.11
| * Properly process footnotes in markdownBrett Walker2019-01-086-3/+171
| | | | | | | | | | All the ids and classes were stripped. Add them back in and make ids unique
* | Merge branch 'backup_restore_fix_issue_46891' into 'master'Rémy Coutable2019-01-172-2/+13
|\ \ | | | | | | | | | | | | Modify file restore to rectify tar issue See merge request gitlab-org/gitlab-ce!24000
| * | Modify file restore to rectify tar issueJason Colyer2019-01-171-1/+1
| | | | | | | | | | | | | | | Fixed typo in run_pipeline! function -> Open3.pieline to Open3.pipeline
| * | Modify file restore to rectify tar issueJason Colyer2019-01-171-6/+4
| | | | | | | | | | | | | | | | | | | | | Adjusted run_pipeline! function to match rubocop syntax requirements Adjusted run_pipeline! function to use variable instead of string interpolation
| * | Modify file restore to rectify tar issueJason Colyer2019-01-171-6/+4
| | | | | | | | | | | | | | | | | | Changed run_pipeline! function to have use $ in regex Changed run_pipeline! function to use Open3.pipeline instead of Open3.pipeline_start
| * | Added changelog entryJason Colyer2019-01-161-0/+5
| | |
| * | Modified files.rb to handle tar errorJason Colyer2019-01-161-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Changed the run_pipeline! function to instead use Open3.pipeline_start In doing so, the code is able to grab the last STDERR. In the case where the error is the one from older tar versions (relating to ./), it will not raise a Backup::Error. All other instances of command failure will result in Backup::Error being raised.
* | | Merge branch 'cleanup-leagcy-artifact-migration' into 'master'Andreas Brandl2019-01-175-1/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleanup legacy artifact background migration Closes #46866 See merge request gitlab-org/gitlab-ce!24144
| * | | Cleanup legacy artifact background migrationShinya Maeda2019-01-175-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add migration and spec commit 3cc12e1268a6865f524d8fab1804f018312fdf5a Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Jan 8 19:34:31 2019 +0900 Add changelog to this change commit 5006fc96e38db514956a35f53ae8ee536548a2e9 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Jan 8 19:32:56 2019 +0900 Remove partial index from ci_builds artifact_file ok Update schema commit 3c956bdc02b195bc67d0327bf3748a631ea5466d Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Jan 7 21:41:27 2019 +0900 Add frozen_string_literal: true commit 8c827cd616890160e6e8908843403a6f20c03236 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Jan 7 21:40:06 2019 +0900 Set batch size 100 commit aeee559777d3bdeadfd2b9bb61d460f2dc1fa8a6 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Jan 4 18:33:05 2019 +0900 Cleanup legacy artifact background migration
* | | | Merge branch ↵Annabel Dunstone Gray2019-01-175-59/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42769-remove-expansion-hover-animation-from-status-icon-buttons' into 'master' Resolve "Remove expansion hover animation from status icon buttons" Closes #42769 See merge request gitlab-org/gitlab-ce!24268
| * | | | Remove animation from pipeline status icon buttonsNathan Friend2019-01-175-59/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expansion hover animation caused a number of layout headaches; this commit removes the animation and replaces them with hover/active/focus styles. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/42769
* | | | | Merge branch 'docs/allow-edits-maintainers-forks' into 'master'Achilleas Pipinellis2019-01-175-7/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor "Allow edits from maintainers in forks" docs See merge request gitlab-org/gitlab-ce!24426
| * | | | | Refactor "Allow edits from maintainers in forks" docsAchilleas Pipinellis2019-01-175-7/+68
| | | | | |
* | | | | | Merge branch '47988-improve-milestone-queries-with-subq' into 'master'Andreas Brandl2019-01-179-23/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve MilestonesFinder to accept project and group relations Closes #47988 See merge request gitlab-org/gitlab-ce!24325
| * | | | | | Fix MilestonesFinder to pass relations to scopeHeinrich Lee Yu2019-01-129-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of querying relations into ids we just pass them to the model scope because the scope supports it now. Also changes other calls to `Milestone.for_projects_and_groups`
* | | | | | | Merge branch ↵Lin Jen-Shin2019-01-173-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56363-inconsitent-file-size-indication-across-different-ci-pages' into 'master' Show CI artifacts size with 3 significant digits Closes #56363 See merge request gitlab-org/gitlab-ce!24387
| * | | | | | | Show CI artifacts size with 3 significant digitsVladimir Shushlin2019-01-173-3/+9
|/ / / / / / /
* | | | | | | Merge branch 'winh-dropdown-toggle-width' into 'master'Phil Hughes2019-01-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change width of .dropdown-menu-toggle to 160px See merge request gitlab-org/gitlab-ce!24391
| * | | | | | | Change width of .dropdown-menu-toggle to 160pxWinnie Hellmann2019-01-151-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'dz-backport-ee-changes' into 'master'Rémy Coutable2019-01-171-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport github import fix from EE See merge request gitlab-org/gitlab-ce!24462
| * | | | | | | | Backport github import fix from EEDmitriy Zaporozhets2019-01-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For codebase consistency Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'dimitrieh-master-patch-26246' into 'master'Phil Hughes2019-01-171-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update issue template with user journey, persona label additions, and clarification between success metrics and acceptance criteria See merge request gitlab-org/gitlab-ce!24428
| * | | | | | | | Update issue template with user journey, persona label additions, and ↵Dimitrie Hoekstra2019-01-171-3/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | clarification between success metrics and acceptance criteria
* | | | | | | | Merge branch 'an-opentracing-factory' into 'master'Kamil Trzciński2019-01-179-0/+294
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conditionally initialize the global opentracing tracer See merge request gitlab-org/gitlab-ce!24186
| * | | | | | | Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-179-0/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
* | | | | | | | Merge branch 'retry-node-jobs' into 'master'Lin Jen-Shin2019-01-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retry Node QA jobs See merge request gitlab-org/gitlab-ce!24438
| * | | | | | | | Retry Node QA jobs upon system and API failureRémy Coutable2019-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'gitaly-update-1.13.0' into 'master'Sean McGivern2019-01-172-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.13.0 See merge request gitlab-org/gitlab-ce!24429
| * | | | | | | | | Add changelog for Gitaly upgradeAndrew Newdigate2019-01-171-0/+5
| | | | | | | | | |
| * | | | | | | | | Upgrade Gitaly to 1.13.0Andrew Newdigate2019-01-161-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'docs/minor-fix-for-yaml-topic' into 'master'Achilleas Pipinellis2019-01-171-13/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix text and markdown See merge request gitlab-org/gitlab-ce!24446
| * | | | | | | | | Fix text and markdownEvan Read2019-01-171-13/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'api-import-external-repos' into 'master'Dmitriy Zaporozhets2019-01-178-20/+230
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API for importing external repos Closes #52636 See merge request gitlab-org/gitlab-ce!22809
| * | | | | | | | | | API for importing external reposBen2019-01-178-20/+230
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'remove-issues-import-csv-feature-flag' into 'master'Sean McGivern2019-01-174-17/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove import_issues_csv feature flag See merge request gitlab-org/gitlab-ce!24324
| * | | | | | | | | Remove import_issues_csv feature flagHeinrich Lee Yu2019-01-114-17/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Also remove test for the feature flag
* | | | | | | | | Merge branch 'docs/minor-section-restructure' into 'master'Marcia Ramos2019-01-171-6/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Promote sections and minor improvements See merge request gitlab-org/gitlab-ce!24410
| * | | | | | | | | Promote sections and minor improvementsEvan Read2019-01-161-6/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch 'auto-devops-custom-domains' into 'master'Kamil Trzciński2019-01-173-0/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for custom hosts/domains Closes #46954 See merge request gitlab-org/gitlab-ce!24248
| * | | | | | | | | Added support for custom hosts/domainsAaron Walker2019-01-173-0/+17
|/ / / / / / / / /
* | | | | | | | | Merge branch '52363-modifies-environment-scope-field-on-cluster-page' into ↵Stan Hu2019-01-173-10/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changes UI on environment scope on clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24376
| * | | | | | | | | Changes environment scope UI on clusters pageMayra Cabrera2019-01-153-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies clusters form to display a disabled text field for environment scope. This changes is needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
* | | | | | | | | | Merge branch 'qa-script-for-personal-access-token-cleanup' into 'master'Sanad Liaquat2019-01-177-13/+85
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add script to revoke personal access tokens See merge request gitlab-org/gitlab-ce!24318
| * | | | | | | | | Created some more qa elementsSanad Liaquat2019-01-163-9/+12
| | | | | | | | | |