summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-212-10/+2
|\ | | | | | | | | | | | | | | | | Move pre_process into render_result This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`. The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details. See merge request !4830
| * Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-212-10/+2
| | | | | | | | | | | | | | | | | | | | | | The method Banzai::Renderer.pre_process would always be called, regardless of whether the Markdown to render was already cached or not. In cache the document _was_ cached the output of the pre-processing pipeline was ignored resulting in it doing nothing but wasting CPU cycles. This commit moves Banzai::Renderer.pre_process into Banzai::Renderer.render_result so that it's _only_ used when needed.
* | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-37/+14
|\ \ | | | | | | | | | | | | Optimize Banzai::Filter::RelativeLinkFilter See merge request !4813
| * | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-37/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of git operations were being repeated, for example, to build a url you would ask if the path was a Tree, which would call a recursive routine in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would call a recursive routine at Gitlab::Git::Blob#find, making reference to the same git objects several times. Now we call Rugged::Tree#path, which allows us to determine the type of the path in one pass. Some other minor improvement added, like saving commonly used references instead of calculating them each time.
* | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-211-5/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix builds API response that did not include commit data ## What does this MR do? This is fix for problem with builds API response not including information about commit this build is created for. ## What are the relevant issue numbers? Closes #18476 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4827
| * | | Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-5/+1
| | |/ | |/|
* | | Merge branch 'show-image-id-on-registry-page' into 'master' Rémy Coutable2016-06-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show proper image ID on registry page ## What does this MR do? Display the container registry image ID (from the config blob) instead of the first image layer ID ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To show proper image ID on container_registry page. This only supports manifest V2, since the manifest V1 doesn't expose information about Image ID. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18159. ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_13.16.44](/uploads/db0d3ed8c8b90fafc8dbf1644c2354b0/Screen_Shot_2016-06-21_at_13.16.44.png) - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4821
| * | | Show proper image ID on registry pageKamil Trzcinski2016-06-211-0/+1
| | | |
* | | | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-213-6/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to fetch LFS from CI ## What does this MR do? This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI). ## What is left? - [x] Write tests covering a new authorization mechanism cc @grzesiek @marin See merge request !4465
| * | | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-211-0/+2
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-2172-260/+2136
| |\ \ \ | | |/ /
| * | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-1063-504/+808
| |\ \ \
| * | | | WIPKamil Trzcinski2016-06-033-6/+8
| | | | |
* | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2110-134/+209
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
| * | | | | fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| | | | | |
| * | | | | Incorporate reviewZ.J. van de Weg2016-06-204-11/+19
| | | | | |
| * | | | | Run rake gitlab:update_templatesZ.J. van de Weg2016-06-201-1/+1
| | | | | |
| * | | | | Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-201-1/+1
| | | | | |
| * | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-205-47/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit builds on the groundwork in ee008e300b1ec0abcc90e6a30816ec0754cea0dd, which refactored the backend so the same code could be used for new dropdowns. In this commit its used for templates for the `.gitlab-ci.yml` files.
| * | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-209-134/+176
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-213-9/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to lock runner on a specific project Make it possible to lock runner on a specific project. ![Screen_Shot_2016-06-20_at_4.03.08_PM](/uploads/186378643a20106ff0b67b6fd8bd7f28/Screen_Shot_2016-06-20_at_4.03.08_PM.png) ---- ![Screen_Shot_2016-06-20_at_9.54.52_PM](/uploads/c479abdffaf19f383bb6b5a42bdd6cc3/Screen_Shot_2016-06-20_at_9.54.52_PM.png) ---- ![Screen_Shot_2016-06-20_at_9.56.26_PM](/uploads/6ad838679b0c28a1fe2e20e9224387ea/Screen_Shot_2016-06-20_at_9.56.26_PM.png) Closes #3407 See merge request !4093
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-2044-123/+1504
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (353 commits) Put some admin settings in dropdown Add styleguide on configuration settings documentation Remove Duplicated keys add UNIQUE index to fingerprint Avoid autoload issue such as 'Mail::Parsers::AddressStruct' Move appearance settings as sub tab to application settings use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Grammar and typographic changes to artifacts documentation Tweak grammar Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji ...
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-1732-122/+542
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (337 commits) Update CHANGELOG for !4659 Center the header logo for all Devise emails Add previews for all customized Devise emails Customize the Devise `unlock_instructions` email Customize the Devise `reset_password_instructions` email Customize the Devise `password_change` emails Use gitlab-git 10.2.0 Use Git cached counters on project show page Fix indentation scss-lint errors Added title attribute to enties in tree view Closes #18353 Banzai::Filter::ExternalLinkFilter use XPath Reduce queries in IssueReferenceFilter Use gitlab_git 10.1.4 Fixed ordering in Project.find_with_namespace Fix images in emails Banzai::Filter::UploadLinkFilter use XPath Turn Group#owners into a has_many association Make project_id nullable CHANGELOG [ci skip] CHANGELOG [ci skip] ...
| * | | | | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4641#note_12444891
| * | | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-141-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prefer-assign_to: Give 409 Conflict whenever the runner was already enabled We're checking return value rather than rescuing exceptions Prefer Runner#assign_to instead of creating directly
| | * | | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-2/+5
| | | | | | | |
| | * | | | | | Prefer Runner#assign_to instead of creating directlyLin Jen-Shin2016-06-141-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-1421-139/+232
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (147 commits) Update CHANGELOG Remove deprecated issues_tracker and issues_tracker_id from project Schema doesn’t reflect the changes of the last 3 migrations Revert CHANGELOG Also rename "find" in the specs Change to new Notes styleguide Add guide on changing a document's location Change logs.md location in README Move logs/logs.md to administration/logs.md Make "four phase test" Only show branches for revert / cherry-pick Instrument all Banzai::ReferenceParser classes Removed old comment from update_column_in_batches Update columns in batches until no rows are left Remove counters from Pipeline navigation Handle NULL migration errors in migration helpers Fix typo causing related branches to Error 500 Improved SVG sanitizer specs to include smoke tests for clean. Refactored SVG sanitizer Added SVG sanitizer fix to the changelog ...
| * | | | | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+1
| | | | | | | |
| * | | | | | | Prefer attributes_for_keys so that it ignores nilsLin Jen-Shin2016-06-091-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a test for setting locked.
| * | | | | | | WIP, try to add views for locked runnersLin Jen-Shin2016-06-093-2/+4
| | | | | | | |
* | | | | | | | Merge branch '18760-remove-explicate-assignment-on-metrics-action' into ↵Yorick Peterse2016-06-211-2/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove explicit Gitlab::Metrics.action assignments, are already automatic. See merge request !4731
| * | | | | | | Remove explicit Gitlab::Metrics.action assignments, are already automatic.18760-remove-explicate-assignment-on-metrics-actionPaco Guzman2016-06-181-2/+0
| | | | | | | |
* | | | | | | | Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit push email diff size Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller), following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85. Emails on push can get very large if they contain a lot of files that sneak under the single-file limit. https://gitlab.com/gitlab-org/gitlab-ee/issues/490 See merge request !4566
| * | | | | | | Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-171-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Limit push email diff size to 30 files or 150 KB, whichever comes first.
* | | | | | | use rails root joinJames Lopez2016-06-201-1/+1
| | | | | | |
* | | | | | | fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
| | | | | | |
* | | | | | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-182-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777 See merge request !4777
| * | | | | | | Fix RangeError exceptions when referring to issues or merge requests outside ↵Stan Hu2016-06-182-1/+7
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of max database values When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values. Closes #18777
* | | | | | | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. An exception would be raised if the filter was called with an invalid URI. Mainly because we weren't catching the `Addressable` exception. 2. This commit fixes it and adds a spec for the filter.
* | | | | | Merge branch 'gh-webhooks' into 'master' Robert Speicher2016-06-171-5/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid that GitHub import fails when retrieving Webhooks for non GitHub admins Closes #18729 See merge request !4723
| * | | | | | Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
| | | | | | |
* | | | | | | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-172-69/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs also added.
* | | | | | | Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-174-35/+40
| | | | | | |
* | | | | | | Add endpoints for Award EmojiZ.J. van de Weg2016-06-174-1/+107
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This only supports Issues and MergeRequests right now because of the consistency of the routes those models provide.
* | | | | | Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-173-22/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track method call times/counts as a single metric This changes method call tracking so only a single metric is emitted regardless of the number of calls. This allows us to more accurately measure the total execution time of a method as well as the number of times a method is called. See 851e3ff7578973c2206628424eac3b951a3c656d for more details. Method call tracking tracked calls individually meaning the end statistics may not always be accurate enough to get a good understanding of where time is spent. See merge request !4754
| * | | | | | Track method call times/counts as a single metricYorick Peterse2016-06-173-22/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we'd create a separate Metric instance for every method call that would exceed the method call threshold. This is problematic because it doesn't provide us with information to accurately get the _total_ execution time of a particular method. For example, if the method "Foo#bar" was called 4 times with a runtime of ~10 milliseconds we'd end up with 4 different Metric instances. If we were to then get the average/95th percentile/etc of the timings this would be roughly 10 milliseconds. However, the _actual_ total time spent in this method would be around 40 milliseconds. To solve this problem we now create a single Metric instance per method. This Metric instance contains the _total_ real/CPU time and the call count for every instrumented method.
* | | | | | | Merge branch 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-172-0/+91
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added API endpoint for Sidekiq Metrics. ## What does this MR do? It adds an API endpoint to gather metrics about Sidekiq, it's jobs, queues, and processes. ## Why was this MR needed? There was no API endpoint for Sidekiq information. ## What are the relevant issue numbers? Fixes #7171 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !4653
| * | | | | | Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.Patricio Cano2016-06-171-0/+1
| | | | | | |
| * | | | | | Fixed Rubocop errorPatricio Cano2016-06-171-0/+90
| | | | | | |