summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-192-0/+69
| | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
* Revert all changes introduced by ↵Kamil Trzcinski2016-09-192-69/+0
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
* Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-194-44/+304
|\
| * Fix validation regexs (+1 squashed commit)Kamil Trzcinski2016-09-191-2/+2
| | | | | | | | | | Squashed commits: [f9a9315] Use : to test invalid environment name
| * Fix CI job environment configuration attributesGrzegorz Bizon2016-09-191-2/+3
| |
| * Update support for dynamic environmentsKamil Trzcinski2016-09-191-0/+14
| |
| * Verify expandability of variables defined as part of environmentKamil Trzcinski2016-09-191-0/+73
| |
| * Add validation of URL and validation of nameKamil Trzcinski2016-09-191-0/+30
| |
| * Add new CI configuration entry for the environmentGrzegorz Bizon2016-09-191-0/+125
| |
| * fixDrew Blessing2016-09-151-8/+3
| |
| * Add support for column limits in add_column_with_defaultDrew Blessing2016-09-151-42/+64
| |
* | Fix spec failuresKamil Trzcinski2016-09-191-1/+1
| |
* | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-0/+19
| |
* | Fix specs for available statusesKamil Trzcinski2016-09-161-2/+2
| |
* | Fix specs after renaming authentication_capabilitiesKamil Trzcinski2016-09-162-11/+13
| |
* | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-163-23/+23
| |
* | Fix specs after merging LFS changesKamil Trzcinski2016-09-151-3/+3
| |
* | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-152-1/+70
|\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/git_http_client_controller.rb # app/helpers/lfs_helper.rb # lib/gitlab/auth.rb # spec/requests/lfs_http_spec.rb
| * | Refactored authentication code to make it a bit clearer, added test for ↵Patricio Cano2016-09-152-2/+2
| | | | | | | | | | | | wrong SSH key.
| * | Use special characters for `lfs+deploy-key` to prevent a someone from ↵Patricio Cano2016-09-152-3/+3
| | | | | | | | | | | | creating a user with this username, and method name refactoring.
| * | Refactored handling of the `LfsToken` and added functionality to it to ↵Patricio Cano2016-09-151-0/+16
| | | | | | | | | | | | simplify external code.
| * | Refactored LFS auth logic when using SSH to use its own API endpoint ↵Patricio Cano2016-09-152-5/+5
| | | | | | | | | | | | `/lfs_authenticate` and added tests.
| * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ↵Patricio Cano2016-09-152-3/+40
| | | | | | | | | | | | a 1 use only token.
| * | Added LFS support to SSHPatricio Cano2016-09-151-0/+16
| |/ | | | | | | - Required on the GitLab Rails side is mostly authentication and API related.
* | Fix most of specsKamil Trzcinski2016-09-152-4/+19
| |
* | Fix existing authorization specsKamil Trzcinski2016-09-151-5/+12
| |
* | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-157-2/+112
|\ \ | |/ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch 'houqp-master' into 'master' Robert Speicher2016-09-141-0/+7
| |\ | | | | | | | | | | | | | | | | | | Fix wiki headeline linking Fixes #21817 See merge request !6300
| | * Fix URLs with anchors in wikiQingping Hou2016-09-131-0/+7
| | |
| * | Allow trailing newline in secret base64 dataJacob Vosmaer2016-09-131-0/+5
| |/
| * Import GitHub release notesAndrew Smith2016-09-132-2/+82
| | | | | | | | | | # Conflicts: # lib/gitlab/github_import/importer.rb
| * Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-123-0/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add original author tag line when importing from GitHub if there isn't a linked GitLab account ## What does this MR do? If there we've found a linked GitLab user for a creator of an issue or comment don't add the 'Created By:' line. ## What are the relevant issue numbers? Closes #21569 See merge request !6081
| | * Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-083-0/+18
| | |
* | | Add access specsKamil Trzcinski2016-09-152-30/+147
|/ /
* | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-091-3/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict ldap return attributes ## What does this MR do? Fixes the CE part of #13821. We really only ever need uid, dn, cn, and mail attributes, and in some cases, even less. This merge request strips the request down to those four attributes by default, and allows the caller to specify others, if needed. ## Why was this MR needed? This will improve performance especially in cases where the connection is slow between GitLab and LDAP, or when the LDAP object has lots of attributes we don't care about. See merge request !6187
| * | Request only the LDAP attributes we needDrew Blessing2016-09-091-3/+68
| | |
* | | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-092-9/+33
| | |
* | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-091-1/+85
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security and safety improvements for gitlab-workhorse integration Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60 - Use a custom content type when sending data to gitlab-workhorse - Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse This will allow us to build features in gitlab-workhorse that require more trust, and protect us against programming mistakes in the future. This is designed so that no action is required for installations from source. For omnibus-gitlab we need to add code that manages the shared secret. See merge request !5907
| * | Constants in specsJacob Vosmaer2016-09-061-1/+1
| | |
| * | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-051-1/+85
| | |
* | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-081-0/+115
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smartly calculate real running time and pending time ## What does this MR do? Try to smartly calculate the running time and pending time for pipelines, instead of just use wall clock time from start to end. The algorithm is based on: > Suppose we have A, B, and C jobs: > * A: from 1 to 3 > * B: from 2 to 4 > * C: from 6 to 7 > The processing time should be accumulated from 1 to 4, and 6 to 7, totally 4, excluding retires, and calculate on `%w[success failed running canceled]` jobs (if a job is not finished yet, assume it's `Time.now`) ## Are there points in the code the reviewer needs to double check? I would actually like to test `Gitlab::Ci::PipelineDuration#process_segments`, but it's a private method right now and it's not very convenient to test it. Is there a way to test it without changing the original code too much? Note that I would like to avoid saving merged segments because it's not used and should be garbage collected. ## Screenshots: ![Screen_Shot_2016-09-05_at_6.45.32_PM](/uploads/a82bfaf316661091e383b743a2f11334/Screen_Shot_2016-09-05_at_6.45.32_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #18260, #19804 See merge request !6084
| * | | Sort by database, feedback:Lin Jen-Shin2016-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14991226 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14994233
| * | | Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-061-4/+4
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14992064
| * | | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0223-71/+109
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (289 commits) Fix a typo Change minimum Unicorns required to two Update memory requirements Change the inline code to codeblocks for the new features doc guideline Update CHANGELOG with 8.11.4 entries. removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop' Change widths of content in MR pipeline tab Add curve to generic commit status pipeline Rubocop syntax 2.3 Some minor updates for upgrade guides for 8.12. Remove inconsistent font weight for sidebar's labels Replace play icon font with svg Project tools visibility level Added todo filter tests Fixed project filtering Review changes, simplified dropdown init Removed select2 from todos feature spec Removed inline JS and improved dropdown labels Added type and action dropdowns, need to finalize by removing all inline and polishing off the selected dropdown states Completed project filter dropdown, still need to move it from inline to ProjectSelect.js (or different) ...
| * | | | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-021-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retries and probably also manual actions! Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14735478 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14737804
| * | | | It's renamed to periodsLin Jen-Shin2016-08-311-2/+2
| | | | |
| * | | | Add test cases from:Lin Jen-Shin2016-08-301-0/+28
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14709761
| * | | | Rename to periods since it's easier to understandLin Jen-Shin2016-08-301-1/+1
| | | | |
| * | | | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-291-0/+95
| | | | |
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-081-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
View Lorry Controller Status