summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-143-5/+8
| | | | | | |
* | | | | | | Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-131-15/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove problematic LDAP::Person validation for new strategy Closes #42412 and #42359 See merge request gitlab-org/gitlab-ce!16727
| * | | | | | | Revert problematic LDAP person validation that threw exceptionsDrew Blessing2018-02-131-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructors shouldn't throw exceptions. We also learned that different LDAP servers behave a bit unexpectedly sometimes - returning attributes we didn't ask for, or returned attributes with language subtypes.
* | | | | | | | Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-131-7/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092
| * | | | | | | Remove Sentry reporting for query limitingYorick Peterse2018-02-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Sentry, while useful, poses two problems you have to choose from: 1. All errors are reported separately, making it easy to create issues but also making it next to impossible to see other errors (due to the sheer volume of threshold errors). 2. Errors can be grouped or merged together, reducing the noise. This however also means it's (as far as I can tell) much harder to automatically create GitLab issues from Sentry for the offending controllers. Since both solutions are terrible I decided to go with a third option: not using Sentry for this at all. Instead we'll investigate using Prometheus alerts and Grafana dashboards for this, which has the added benefit of being able to more accurately measure the behaviour over time. Note that throwing errors in test environments is still enabled, and whitelisting is still necessary to prevent that from happening (and that in turn still requires that developers create issues).
* | | | | | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-131-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "PrepareUntrackedUploads PostgreSQL syntax error" Closes #42881 See merge request gitlab-org/gitlab-ce!17019
| * | | | | | | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-121-1/+10
| | | | | | | |
| * | | | | | | Fix last batch size equals max batch size errorMichael Kozono2018-02-121-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-121-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated katex library Closes #43032 See merge request gitlab-org/gitlab-ce!15864
| * \ \ \ \ \ \ \ Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-1242-250/+656
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-05175-1353/+4471
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Removed the katex precompile steps from the application configurationJose Ivan Vargas2017-12-211-1/+0
| | | | | | | | | |
| * | | | | | | | | added katex.js and load it via webpackJose Ivan Vargas2017-12-211-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable query limiting warnings for now on GitLab.com See merge request gitlab-org/gitlab-ce!17067
| * | | | | | | | | | Disable query limiting warnings for now on GitLab.comStan Hu2018-02-121-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-121-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honour workhorse provided file name See merge request gitlab-org/gitlab-ce!17059
| * | | | | | | | | | Honour workhorse provided file nameac/4878-fix-attachments-extAlessio Caiazza2018-02-121-4/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the attempt to unify file uploading at workhorse level gitlab-org/gitlab-workhorse!230 we moved to a prefix-based tempfile creation in order to avoid upload collisions. Artifacts and LFS uploads already set original_filename to workhorse provided filename This commit add the same feature to `Gitlab::Middleware::Multipart`
* | | | | | | | | | Revert "Merge branch ↵rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-121-22/+6
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
* | | | | | | | | Create an empty wiki when there is no wiki in the gitlab export bundleValery Sizov2018-02-122-2/+26
|/ / / / / / / /
* | | | | | | | Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-091-3/+3
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Fixes gitlab-development-kit#321
* | | | | | | Remove allow_n_plus_1 from Git::Repository#branches_filterAhmad Sherif2018-02-081-11/+8
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ceYorick Peterse2018-02-081-4/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988
| * | | | | | Handle uniqueness on fork_network_member creationBob Van Landuyt2018-02-081-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the migration might be queued already and be rescheduled when it fails on a uniqueness error, this should help clearing the background migration queue faster.
* | | | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master'Sean McGivern2018-02-081-4/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Move Namespace to Gitaly using OPT-OUT See merge request gitlab-org/gitlab-ce!15910
| * | | | | | Move Namespace to Gitaly using OPT-OUTZeger-Jan van de Weg2017-12-131-4/+8
| | | | | | |
* | | | | | | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-083-5/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#985
* | | | | | | Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-071-8/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache Gitaly FindCommit RPC response See merge request gitlab-org/gitlab-ce!16949
| * | | | | | | Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-071-8/+30
| | | | | | | |
* | | | | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-073-26/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| * | | | | | | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-071-0/+2
| | | | | | | | |
| * | | | | | | | Make prometheus service querying approach much nicer wrt to arity and ↵Pawel Chojnacki2018-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default function params
| * | | | | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0672-309/+704
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * \ \ \ \ \ \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3128-375/+895
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-2946-237/+987
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-1786-409/+1825
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-12/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix prometheus client testsPawel Chojnacki2018-01-041-4/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Add test checking if prometheus integration is enabled after prometheus is ↵Pawel Chojnacki2018-01-042-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed
| * | | | | | | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-021-10/+4
| | | | | | | | | | | |
| * | | | | | | | | | | wipPawel Chojnacki2018-01-023-21/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-071-4/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-072-24/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827
| * | | | | | | | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-072-24/+21
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refs hash is used to determine what branches and tags have a commit as head in the network graph. The previous implementation depended on Rugged#references. The problem with this implementation was that it depended on rugged, but also that it iterated over all references and thus loading more data than needed if for example the project uses CI/CD environments, Pipelines, or Merge Requests. Given only refs are checked the network cares about the GraphHelper#refs method has no need to reject those, simplifying the method. Closes gitlab-org/gitaly#880
* | | | | | | | | | | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'Sean McGivern2018-02-073-1/+91
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport LFS File Locking API Closes #35856 See merge request gitlab-org/gitlab-ce!16935
| * | | | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-1/+91
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '41763-search-api' into 'master'Sean McGivern2018-02-072-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search API Closes #41763 See merge request gitlab-org/gitlab-ce!16878
| * | | | | | | | | | | Return only limited pagination headers for search API endpointsJarka Kadlecová2018-02-062-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Support search in APIJarka Kadlecová2018-02-063-11/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-072-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI linter fails to work" Closes #41209 See merge request gitlab-org/gitlab-ce!16922