summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | Simplify the JavaScriptFixturesHelpers moduleRémy Coutable2019-03-194-49/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only storing fixtures in one place - This place changes whether we are in CE or EE We discovered with @winh that only fixtures located under spec/javascripts/fixtures are used, even in EE so there's no need to clean/create fixtures in ee/spec/javascripts/fixtures. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-ssh-pull-mirorrs-ce' into 'master'Nick Thomas2019-03-192-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE JavaScript changes for SSH pull mirrors Closes #56340 See merge request gitlab-org/gitlab-ce!26308
| * | | | | | | | | | | | | | | | | | | | | | | | Backport EE JavaScript changes for SSH pull mirrorsStan Hu2019-03-192-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the JavaScript code in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10272.
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Nick Thomas2019-03-192-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59113-review-apps-initial-seeding-is-broken-due-to-runners_registration_token-openssl-cipher-ciphererror-error-somehow' into 'master' Fix the .review-deploy-base job so that env variables are passed Closes #59113 See merge request gitlab-org/gitlab-ce!26275
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix the .review-deploy-base job so that env variables are passedRémy Coutable2019-03-192-11/+13
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix/registry2.7-delete-auth' into 'master'Dmitriy Zaporozhets2019-03-192-1/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for deleting images in registry 2.7 See merge request gitlab-org/gitlab-ce!25862
| * | | | | | | | | | | | | | | | | | | | | | | | | Add support for deleting images in registry 2.7Peter Bábics2019-03-182-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'doc-git-object-dedup' into 'master'Achilleas Pipinellis2019-03-192-0/+262
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how Git object deduplication works in GitLab See merge request gitlab-org/gitlab-ce!25770
| * | | | | | | | | | | | | | | | | | | | | | | | | | Document how Git object deduplication works in GitLabJacob Vosmaer2019-03-192-0/+262
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-html-style-guide' into 'master'Marcia Ramos2019-03-191-16/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Bring HTML Style Guide in line with docs standards See merge request gitlab-org/gitlab-ce!26252
| * | | | | | | | | | | | | | | | | | | | | | | | | Docs: Bring HTML Style Guide in line with docs standardsMarcel Amirault2019-03-191-16/+12
|/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '53139-hide-tree-single-file' into 'master'Filipa Lacerda2019-03-196-8/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collapse diff tree is only one file is present Closes #53139 See merge request gitlab-org/gitlab-ce!26280
| * | | | | | | | | | | | | | | | | | | | | | | | | Collapse diff tree is only one file is presentPhil Hughes2019-03-196-8/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53139
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '56089-merge-gitlab-keys' into 'master'Nick Thomas2019-03-199-263/+724
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the gitlab-shell "gitlab-keys" functionality into GitLab CE Closes #56089 See merge request gitlab-org/gitlab-ce!25598
| * | | | | | | | | | | | | | | | | | | | | | | | | Integrate Gitlab::Keys with Gitlab::ShellPatrick Bajao2019-03-199-263/+724
|/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this commit, some methods that aren't being used are removed from `Gitlab::Shell`. They are the ff: - `#remove_keys_not_found_in_db` - `#batch_read_key_ids` - `#list_key_ids` The corresponding methods in `Gitlab::Keys` have been removed as well.
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'revert-b24c0c8d' into 'master'Lin Jen-Shin2019-03-194-36/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "New Repository#insights_config method" See merge request gitlab-org/gitlab-ce!26315
| * | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch..."Rémy Coutable2019-03-194-36/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26183
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/users-search-results' into 'master'Sean McGivern2019-03-1921-10/+471
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add users search results to global search Closes #25973 See merge request gitlab-org/gitlab-ce!21197
| * | | | | | | | | | | | | | | | | | | | | | | | | Apply suggestion to lib/api/search.rbAlexis Reigel2019-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | un-dry the search api scopeAlexis Reigel2019-03-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | due to the usage in EE this attempt to more DRYness is not worth it.
| * | | | | | | | | | | | | | | | | | | | | | | | | return 400 on users search and feature is disabledAlexis Reigel2019-03-143-13/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the params block is evaluated when loading the class and the db connection is not available yet we can't use the feature toggle inside that block.
| * | | | | | | | | | | | | | | | | | | | | | | | | move users method to public sectionAlexis Reigel2019-03-141-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is for EE to be able to call this (elastic search)
| * | | | | | | | | | | | | | | | | | | | | | | | | add feature flag for users searchAlexis Reigel2019-03-145-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | extract helper for search scope api paramAlexis Reigel2019-03-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | check ability for user search resultsAlexis Reigel2019-03-142-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | use project_search_tabs? for user search checkAlexis Reigel2019-03-143-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | restrict user result set by the scoped groupAlexis Reigel2019-03-142-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | spec for group's user search incl. parent groupAlexis Reigel2019-03-141-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | project's user search includes group members tooAlexis Reigel2019-03-142-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | only users from groups the current user has accessAlexis Reigel2019-03-142-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | add users search to search apiAlexis Reigel2019-03-144-7/+114
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | search results: show user's status emojiAlexis Reigel2019-03-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | add changelogAlexis Reigel2019-03-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | add users search results to group scoped searchAlexis Reigel2019-03-144-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | dry up the use of the user search tabAlexis Reigel2019-03-141-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | move ability check from service class to viewAlexis Reigel2019-03-143-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | add users search results to project scoped searchAlexis Reigel2019-03-146-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | add users search results to global searchAlexis Reigel2019-03-146-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-diff-tree-filtering-flag' into 'master'Filipa Lacerda2019-03-193-38/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove diff tree filtering feature flag See merge request gitlab-org/gitlab-ce!26273
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove diff tree filtering feature flagPhil Hughes2019-03-183-38/+18
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'make-tokens-encryption-optional-for-now' into 'master'Grzegorz Bizon2019-03-194-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make runners token encryption to be optional See merge request gitlab-org/gitlab-ce!26223
| * | | | | | | | | | | | | | | | | | | | | | | | | Make runners token encryption to be optionalKamil Trzciński2019-03-184-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-rugged-0.28.0' into 'master'Rémy Coutable2019-03-193-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Rugged to 0.28.0 See merge request gitlab-org/gitlab-ce!25660
| * | | | | | | | | | | | | | | | | | | | | | | | | | Bump Rugged to 0.28.0Stan Hu2019-03-193-3/+8
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version bump makes things consistent between Gitaly and fixes a significant number of bugs: https://github.com/libgit2/libgit2/releases This also decreases disk space of Omnibus builds by ~30 MB. There is also a workaround for https://github.com/libgit2/rugged/issues/785. If Gitaly or another process changes .gitconfig while Rugged has the file loaded, Rugged::Repository#each_key will report stale values unless a lookup is done first. This bug only manifests in a spec because we are using both Gitaly and Rugged at the same time there, and we normally don't use Rugged in the CE/EE code in this way.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10471-remove-before-script-for-dast-template-ce' into 'master'Kamil Trzciński2019-03-191-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove before_script from DAST vendored template See merge request gitlab-org/gitlab-ce!26281
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove before_script from DAST vendored templateVictor Zagorodny2019-03-191-9/+8
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-46' into 'master'Achilleas Pipinellis2019-03-191-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to the gitaly repository's Beginniner's Guide documentation See merge request gitlab-org/gitlab-ce!25627
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the gitaly repo's guideLuke Duncalfe2019-02-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gitaly repository's Beginner's Guide documentation is an excellent source of information that should be read first.
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/copy-edit-pipelines' into 'master'Achilleas Pipinellis2019-03-193-43/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copyedit pipelines-related documentation Closes #59006 See merge request gitlab-org/gitlab-ce!26198
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Copyedit pipelines-related documentationEvan Read2019-03-193-43/+43
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /