summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '37204-deprecate-git-user-manual-ssh-config' into 'master'Douwe Maan2017-09-052-0/+70
|\ | | | | | | | | | | | | Deprecate custom SSH client configuration for the git user Closes #37204 See merge request !13930
| * Add a system check for the git user's custom SSH configurationNick Thomas2017-09-042-0/+70
| |
* | Merge branch 'feature/gb/kubernetes-only-pipeline-jobs' into 'master'Kamil Trzciński2017-09-043-20/+59
|\ \ | | | | | | | | | | | | | | | | | | Check if Kubernetes is required when creating pipeline jobs Closes #34785 See merge request !13849
| * \ Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobsGrzegorz Bizon2017-09-0467-172/+727
| |\ \ | | | | | | | | | | | | * master: (469 commits)
| * | | Remove an empty line from YAML processor classGrzegorz Bizon2017-09-011-1/+0
| | | |
| * | | Change CI/CD kubernetes policy keyword to `active`Grzegorz Bizon2017-09-011-1/+1
| | | |
| * | | Check if service active when using CI/CD kubernetes policyGrzegorz Bizon2017-09-011-1/+1
| | | |
| * | | Change kubernetes job policy allowed valuesGrzegorz Bizon2017-08-313-4/+11
| | | | | | | | | | | | | | | | It is now possible to use `kubernetes: configured`.
| * | | Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobsGrzegorz Bizon2017-08-3166-242/+671
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (275 commits) Decrease Metrics/PerceivedComplexity threshold to 17 Upgrade mail and nokogiri gems due to security issues Link out to stackoverflow answer on setting swappiness Document swappiness recomendations in the requirements doc Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Add changelog entry for flipping verify_certificates Default LDAP config verify_certificates to true Update share project with groups docs remove accidental console.log from karma tests update specs to match reorganized monitoring components Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Remove unused expressions policy from ci/cd config Simplify code for appending strategies in CI/CD config Raise exception when simplifiable ci entry incomplete Add changelog entry Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) ... Conflicts: lib/gitlab/ci/config/entry/policy.rb
| * | | | Make some methods in CI/CD YAML processor privateGrzegorz Bizon2017-08-311-27/+29
| | | | |
| * | | | Improve matching kubernetes job in CI/CD processorGrzegorz Bizon2017-08-311-3/+3
| | | | |
| * | | | Remove unused method from CI/CD YAML processorGrzegorz Bizon2017-08-311-6/+0
| | | | |
| * | | | Check if kubernetes required before creating a jobGrzegorz Bizon2017-08-262-8/+22
| | | | |
| * | | | Use new complex only/except policy internal schemeGrzegorz Bizon2017-08-262-1/+5
| | | | |
* | | | | Merge branch 'move-git-operation-service' into 'master'Sean McGivern2017-09-042-0/+169
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Move GitOperationService to Gitlab::Git See merge request !13984
| * | | | Move GitOperationService to Gitlab::Gitmove-git-operation-serviceJacob Vosmaer2017-09-012-0/+169
| | | | |
* | | | | Merge branch 'git-operation-service-to-git' into 'master'Sean McGivern2017-09-042-1/+105
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Prepare GitOperationService for moving to Gitlab::Git See merge request !13773
| * | | | Add Gitlab::Git::Repository#==Jacob Vosmaer2017-09-011-0/+4
| | | | |
| * | | | Prepare GitOperationService for move to Gitlab::GitJacob Vosmaer2017-08-312-1/+101
| | |/ / | |/| |
* | | | Merge branch 'bvl-only-require-po-parser-in-rake' into 'master'Douwe Maan2017-09-042-2/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Only require `simple_po_parser` in rake task that needs it Closes #37379 See merge request !14018
| * | | Only require `simple_po_parser` in rake task that needs itbvl-only-require-po-parser-in-rakeBob Van Landuyt2017-09-042-2/+1
| | | | | | | | | | | | | | | | | | | | That way we don't need to install it in production, since it's really not needed there.
* | | | Merge branch ↵Kamil Trzciński2017-09-044-4/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch' into 'master' Protected runner executes jobs on protected branch [Solution 1] Closes #33281 See merge request !13194
| * | | | Fix specShinya Maeda2017-09-031-2/+4
| | | | |
| * | | | Improve API arguments as StringShinya Maeda2017-09-031-1/+2
| | | | |
| * | | | Add API supportShinya Maeda2017-09-032-1/+3
| | | | |
| * | | | Add the rest of specsShinya Maeda2017-09-031-5/+7
| | | | |
| * | | | Add spec. Fix runner setting page. It worked.Shinya Maeda2017-09-031-1/+1
| | | | |
| * | | | Update application code by the db schema changeShinya Maeda2017-09-031-1/+6
| |/ / /
* | | | Merge branch 'zj-sort-templates' into 'master'Kamil Trzciński2017-09-041-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Sort templates when fetching them Closes #37153 See merge request !13920
| * | | Sort templates when fetching themZeger-Jan van de Weg2017-08-311-1/+5
| | | | | | | | | | | | | | | | | | | | Used to rely on the underlying filesystem to sort the entries, now its forced to be sorted on the name of the template.
* | | | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-021-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-3128-113/+234
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-3136-96/+319
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-3034-145/+363
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-2327-646/+373
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json
| * \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-1761-151/+356
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
| * \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-1223-63/+519
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance Better categorize test coverage results Add option to disable project export on instance - db changes Better caching and indexing of broadcast messages Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Document rspec-retry and rspec-flaky Fix cop description Retrieve and sync flaky specs report from and to S3 Use a new RspecFlakyListener to detect flaky specs Fix formatting of patch_versions.md [skip ci] Enable Timecop safe mode Show error message for API 500 error in tests, and Fix merge request diff deserialisation when too_large was absent Delete correct key from `session` after authenticating using U2F Bumps omniauth-ldap gem version to 2.0.4 Pending delete projects no longer return 500 error in Admins projects view Do not run the `ee_compat_check` job for stableish branches Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. ...
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-1023-38/+39
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (42 commits) alternative route for download archive Add missing command to compile GetText files Prevent user from changing username with container registry tags Rename RPC 'Exists' to 'RepositoryExists' Fix the sticky changes bar on commits page Fix ee_compat_check when EE branch uses a prefix Removed display styles when hiding the fly out navigation Explain why we use select all for project_url_constrainer.rb Fix pikaday being undefined Add a helper to stub storage settings with defaults Enable the Layout/SpaceBeforeBlockBraces cop update Install from Source instructions Translations can be picked without asking for exceptions Ask for exceptions in advance Don't require stackprof in Gemfile Synchronous Korean translation in zanata Use full path of user's avatar in webhooks Update icon color on hover Align all nav items in sidebar Fix height of collapsed sidebar items ...
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-0850-470/+1144
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (481 commits) Make sure that we have author and committer disable file upload button while uploading Fix bar chart does not display label at hour 0 Fixed activity not loading on project homepage Expose noteable_iid in Note Fix fly-out width when it has long items Add a test to show that threshold 40 would corrupt Add changelog entry Raise encoding confidence threshold to 50 Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/` Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/` Add Italian translations of Pipeline Schedules Restrict InlineJavaScript for haml_lint to dev and test environment Incorporate Gitaly's CommitService.FindCommit RPC Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit fix repo_edit_button_spec.js fix test failures in repo_preview_spec.js fix repo_loading_file_spec tests Refactor Gitlab::Git::Commit to include a repository use 100vh instead of flip flopping between the two - works on all suported browsers ...
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-071-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix order of CI lint ace editor loading Fix spec Fix spec Fix spec Add changelog fix Add a spec for concurrent process Add changelog essential add CHANGELOG.md for !13208 adjust user contribution calendar time formatting fix rubocop violations 👮 fix mysql syntax for date INTERVAL arithmatic add tests for proper timezone date grouping within ContributionsCalendar adjust timezone for date grouping in contributions calendar use timezone-aware Date.current instead of Date.today in ContributionsCalendar class display system timezone underneath activity calendar ...
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-0420-63/+370
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (162 commits) Since mysql is not a priority anymore, test it less Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Install yarn via apt in update guides Use long curl options Remove monkey-patched Array.prototype.first() and last() methods Openshift Getting Started 35659 Rename Pipelines tab to CI / CD in new navigation Don't bother going through an entire Banzai pipeline for empty text Add active state for pipelines settings on old nav Bump rspec to 3.6.0 Resolve "Specific Async Script Loading by using a Page Variable" Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'" another rubocop style fix Use mixin for new dropdown style Migrate Repository#last_commit_for_path to Gitaly Migrate blame loading to Gitaly ...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-0131-81/+283
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Add code review guidelines related to Build [CI skip]. Make time span dropdown style on cycle analytics page consistent Add 204. Remove duplicated method. Make sure we didn't commit conflicts Fix bug in blob test Always fetch branches before finding the merge base, otherwise we could find an outdated merge base Fixes dropdown margin in sidebar Docs add blog articles Inline script cleanup globals and easy Add option to use CommitLanguages RPC CI fixes for gitaly-ruby fix Allow logged in users to read user list under public restriction Small refactor in LegacyNamespace and moved back send_update_instructions Rename ensure_dir_exist -> ensure_storage_path_exist Added some extra TODOs for the Legacy Storage refactor Make disk_path keyword argument and optional Rename more path_with_namespace -> full_path or disk_path Rename path_with_namespace -> disk_path when dealing with the filesystem Rename many path_with_namespace -> full_path ...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-3162-702/+1131
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/concerns/notes_actions.rb # spec/features/task_lists_spec.rb # spec/support/features/issuable_slash_commands_shared_examples.rb
| * | | | | | | | | | | | | | | | Add full JSON endpoints for issue notes and discussionsDouwe Maan2017-07-211-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '17849-allow-admin-to-restrict-min-key-length-and-techno' into ↵Robert Speicher2017-09-014-48/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add settings for minimum key strength and allowed key type Closes #17849 See merge request !13712
| * | | | | | | | | | | | | | | | | Move the key restriction validation to its own classNick Thomas2017-08-301-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Address review commentsNick Thomas2017-08-302-10/+7
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Rework the permissions model for SSH key restrictionsNick Thomas2017-08-303-37/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `allowed_key_types` is removed and the `minimum_<type>_bits` fields are renamed to `<tech>_key_restriction`. A special sentinel value (`-1`) signifies that the key type is disabled. This also feeds through to the UI - checkboxes per key type are out, inline selection of "forbidden" and "allowed" (i.e., no restrictions) are in. As with the previous model, unknown key types are disallowed, even if the underlying ssh daemon happens to support them. The defaults have also been changed from the lowest known bit size to "no restriction". So if someone does happen to have a 768-bit RSA key, it will continue to work on upgrade, at least until the administrator restricts them.
| * | | | | | | | | | | | | | | | | Add settings for minimum key strength and allowed key typeNick Thomas2017-08-305-48/+100
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an amalgamation of: * Cory Hinshaw: Initial implementation !5552 * Rémy Coutable: Updates !9350 * Nick Thomas: Resolve conflicts and add ED25519 support !13712
* | | | | | | | | | | | | | | | | Merge branch 'bvl-validate-po-files' into 'master'Douwe Maan2017-09-016-0/+381
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate PO files in static analysis See merge request !13000
View Lorry Controller Status