summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0410-39/+65
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0325-92/+537
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-2834-158/+1034
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed specsLuke "Jared" Bennett2017-04-281-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove unneeded helper includeLuke "Jared" Bennett2017-04-281-2/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed view to correct propertyLuke "Jared" Bennett2017-04-281-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-283-2/+11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-2646-195/+450
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-15110-522/+2340
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml # config/webpack.config.js
| * | | | | | | | | | | | | | | | [ci skip] Remove loadscript class in favour of backend conditionalLuke "Jared" Bennett2017-04-131-1/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-04395-2973/+11142
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for ↵Luke Bennett2017-01-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raven and created raven_config, required by application.js Added is_production to define sentry environment Removed as much jQuery as possible Added public_sentry_dsn application_settings helper method Use URI module instead of regex for public dsn Removed raven-vue and load raven on if sentry is enabled Add load_script spec added raven_config spec added class_spec_helper and tests added sentry_helper spec added feature spec
* | | | | | | | | | | | | | | | | | Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-051-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus service Closes #31451 See merge request !10994
| * | | | | | | | | | | | | | | | | | Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fixJose Ivan Vargas2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-041-0/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Added specsJose Ivan Vargas2017-05-041-5/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-041-1/+5
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-271-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab uses the import_project method in GitLab Shell, This method uses a timeout for the operation, hardcoded to 800 seconds. With this MR the timeout is now configurable in the gitlab_shell settings.
* | | | | | | | | | | | | | | | | | Fix email receiver metrics eventsfix-email-receiver-metricsSean McGivern2017-05-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Project#inspect` isn't very useful for examining usage of these features.
* | | | | | | | | | | | | | | | | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-052-15/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display slash commands outcome when previewing Markdown Closes #21531 See merge request !10054
| * | | | | | | | | | | | | | | | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-042-15/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window".
* | | | | | | | | | | | | | | | | | | Some small updates for Spanish translations.Ruben Davila2017-05-043-3/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0423-98/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
| * | | | | | | | | | | | | | | | | | | Fix wording of Cycle Analytics stage legendsDouwe Maan2017-05-043-3/+3
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018
| | * | | | | | | | | | | | | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+6
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' Douwe Maan2017-05-041-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort the network graph both by commit date and topographically Closes #30973 See merge request !11057
| | * | | | | | | | | | | | | | | | | | Sort the network graph both by commit date and topographically.30973-network-graph-sorted-by-date-and-topoTimothy Andrew2017-05-041-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, we sorted commits by date, which seemed to work okay. - The one edge case where this failed was when multiple commits have the same commit date (for example: when a range of commits are cherry picked with a single command, they all have the same commit date [and different author dates]). - Commits with the same commit date would be sorted arbitrarily, and usually break the network graph. - This commit solves the problem by both sorting by date, and by sorting topographically (parents aren't displayed until all their children are displayed) - Include review comments from @adamniedzielski A more detailed explanation is present here: https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
| * | | | | | | | | | | | | | | | | | | Merge branch 'gitlab-shell-compile' into 'master' Rémy Coutable2017-05-041-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile gitlab-shell go executables See merge request !11039
| | * | | | | | | | | | | | | | | | | | Compile gitlab-shell go executablesJacob Vosmaer2017-05-041-2/+8
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-043-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022
| | * | | | | | | | | | | | | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-023-3/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch '2247-emails-forwarded-to-service-desk-email-don-t-come' into ↵Sean McGivern2017-05-041-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle incoming emails from aliases correctly See merge request !11079
| | * | | | | | | | | | | | | | | | | | Handle incoming emails from aliases correctly2247-emails-forwarded-to-service-desk-email-don-t-comeSean McGivern2017-05-031-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These set the 'actual' destination email in one of the Delivered-To lines, so check those too.
| * | | | | | | | | | | | | | | | | | | Merge branch '31647-fix-snippet-content_html' into 'master' Rémy Coutable2017-05-042-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching large snippet HTML content on MySQL databases Closes #31647 See merge request !11024
| | * | | | | | | | | | | | | | | | | | | Fix caching large snippet HTML content on MySQL databasesNick Thomas2017-05-032-0/+3
| | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch '31544-size-of-project-from-api' into 'master' Rémy Coutable2017-05-041-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Size of project from API" Closes #31544 See merge request !11013
| | * | | | | | | | | | | | | | | | | | Expose project statistics on single requests via the APIMark Fletcher2017-05-031-5/+9
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + The statistics parameter was already accepted * This commit ensure that it is respected for GET /projects/:id endpoint + Add documentation of the parameter and update the example response for stats
| * | | | | | | | | | | | | | | | | | Merge branch '31671-merge-request-message-contains-carriage-returns' into ↵Douwe Maan2017-05-031-21/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' removes the possibility of commit messages having carriage returns Closes #31671 See merge request !11077
| | * | | | | | | | | | | | | | | | | removes the possibility of commit messages having carriage returnsTiago Botelho2017-05-031-21/+0
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-031-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048
| | * | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-2/+10
| | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix project tree saver and fork spec failuresJames Lopez2017-05-031-0/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2017-05-032-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28408-feature-proposal-include-search-options-to-pipelines-api' into 'master' Resolve "Feature Proposal: Include search options to pipelines API" Closes #28408 See merge request !9367
| | * | | | | | | | | | | | | | | | | Improve documentationShinya Maeda2017-05-031-5/+5
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Add constant as ALLOWED_INDEXED_COLUMNSShinya Maeda2017-05-031-1/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Use HasStatus::AVAILABLE_STATUSES instead of hard codingShinya Maeda2017-05-031-1/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Revert "Use JSON type for sorting parameter (halfway)"Shinya Maeda2017-05-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 34127cb13ad72f65a24bdc8fc051363d3edd77cb.