summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Backport API changes needed to fix sticking in EEbackport-sticking-api-helper-changesYorick Peterse2017-03-314-22/+20
| | | | | | These changes are ported over from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1502 to reduce the number of merge conflicts that may occur.
* Merge branch 'allow-multiple-paths-in-repository-log' into 'master' Robert Speicher2017-03-301-1/+6
|\ | | | | | | | | Support >1 path in Gitlab::Git::Repository#log See merge request !10291
| * Support >1 path in Gitlab::Git::Repository#logSean McGivern2017-03-301-1/+6
| | | | | | | | | | | | This is analogous to `git log -- foo bar baz`, but not the same as `Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git log -- 'foo bar baz'`.
* | Merge branch '29843-project-subgroup-transfer' into 'security'Rémy Coutable2017-03-291-1/+1
| | | | | | | | | | | | Use full path for moving directories when changing namespace path See merge request !2078
* | Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into ↵Alfredo Sumaran2017-03-291-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Reset container width when switching to pipelines MR tab Closes #29539 See merge request !10169
| * | Reset container width when switching to pipelines MR tabEric Eastwood2017-03-281-2/+3
| |/ | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
* | Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master' Rémy Coutable2017-03-291-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Make bundle exec rake gitlab:check RAILS_ENV=production Closes #30084 See merge request !10246
| * | There might be ps utilities out there, that assume 80chars insteadSebastian Reitenbach2017-03-281-2/+2
| | | | | | | | | | | | | | | of unlimited width if they cannot detect terminal size, therefore force unlimited terminal size when checking processes via ps.
* | | Merge branch 'gitaly-socket-per-shard' into 'master' Sean McGivern2017-03-297-29/+64
|\ \ \ | | | | | | | | | | | | | | | | One Gitaly connection per storage shard See merge request !10150
| * | | Fix custom hooks restoreJacob Vosmaer2017-03-291-1/+3
| | | |
| * | | Change socket_path to gitaly_addressJacob Vosmaer2017-03-292-9/+16
| | | |
| * | | Separate GRPC channels per repository storageJacob Vosmaer2017-03-294-25/+28
| | | |
| * | | Helper method for storage path strippingJacob Vosmaer2017-03-291-0/+23
| | | |
* | | | Merge branch '23655-api-group-issues' into 'master' Rémy Coutable2017-03-292-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API group/issues default state filter Closes #23655 See merge request !10253
| * | | | Fix API group/issues default state filterAlexander Randa2017-03-282-4/+4
| | | | |
* | | | | Labels support color names in backendDongqing Hu2017-03-292-6/+12
| | | | |
* | | | | Merge branch 'make_user_mentions_case_insensitive' into 'master' Sean McGivern2017-03-291-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Make user mentions case-insensitive Closes #24493 See merge request !10285
| * | | | Make user mentions case-insensitiveblackst0ne2017-03-291-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'glensc/gitlab-ce-17325-rugged-gem-update' into 'master' Robert Speicher2017-03-281-20/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rugged to 0.25.1.1 Closes #17325, #14972, and #14765 See merge request !10286
| * | | | Use Rugged::SORT_NONE instead of Rugged::SORT_DATEAdam Niedzielski2017-03-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meaning of SORT_DATE was changed in libgit2. See https://github.com/libgit2/libgit2/commit/82d4c0e6b841ae0e466bd97ab1faec0920a6b7a2 SORT_NONE is the order produced by "git log".
| * | | | Remove unused method Gitlab::Git::Repository#commits_sinceAdam Niedzielski2017-03-281-17/+0
| |/ / /
* | | | Merge branch 'tc-api-remove-comments-endpoint' into 'master' Rémy Coutable2017-03-283-40/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Make the /notes endpoint work with noteable iid instead of id Closes #29871 See merge request !10258
| * | | | API: Make the /notes endpoint work with noteable iid instead of idToon Claes2017-03-272-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In API V4 all endpoints were changed so Merge Requests and Issues should be referred by iid, instead of id. Except the /notes endpoint was forgotten. So change the endpoints from: - /projects/:id/issues/:issue_id/notes - /projects/:id/merge_requests/:merge_request_id/notes To: - /projects/:id/issues/:issue_iid/notes - /projects/:id/merge_requests/:merge_request_iid/notes For Project Snippets nothing changes.
| * | | | Remove `:id/merge_requests/:merge_request_iid/comments` endpointsToon Claes2017-03-271-35/+0
| | | | | | | | | | | | | | | | | | | | Comments for a merge request should be obtained to the `notes` endpoint.
* | | | | Merge branch ↵Yorick Peterse2017-03-281-2/+27
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '30098-banzai-filter-mergerequestreferencefilter-has-an-n-1-query-problem' into 'master' Resolve "Banzai::Filter::MergeRequestReferenceFilter has three N+1 query problems" Closes #30098 See merge request !10252
| * | | | Get rid of a third N+1 query problemRémy Coutable2017-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Get rid of second N+1 query problemRémy Coutable2017-03-281-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Get rid of a first N+1 query problemRémy Coutable2017-03-281-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same approach in Banzai::Filter::MergeRequestReferenceFilter as we do with issues. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`Rémy Coutable2017-03-281-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Kamil Trzciński2017-03-279-0/+36
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master' Expose CI/CD status API endpoints with Gitlab::Ci::Status facility on pipeline, job and merge request for favicon See merge request !9561
| * | | Revert adding favicon to extended statuses. Change extended statues specs to ↵Shinya Maeda2017-03-232-8/+0
| | | | | | | | | | | | | | | | use core status
| * | | Fix unchanged structure. Add favicon for 'failed_allowed' and ↵Shinya Maeda2017-03-232-0/+8
| | | | | | | | | | | | | | | | 'success_warning' because it'll be used.
| * | | Add spec for spec/lib/gitlab/ci/statusShinya Maeda2017-03-231-0/+4
| | | |
| * | | Roolback unneccesary changesShinya Maeda2017-03-231-1/+1
| | | |
| * | | Remove def favicon from extended statusShinya Maeda2017-03-232-8/+0
| | | |
| * | | change favicon nameShinya Maeda2017-03-239-9/+9
| | | |
| * | | Expose only status. ci_cd_status to status. Support abstract class.Shinya Maeda2017-03-231-0/+4
| | | |
| * | | Add api points for ci cd status. Add favicon.Shinya Maeda2017-03-239-0/+36
| | | |
* | | | Implement new service for creating userGeorge Andrinopoulos2017-03-273-27/+59
| |/ / |/| |
* | | Merge branch 'improve-ee_check_compat-again' into 'master' Sean McGivern2017-03-241-107/+188
|\ \ \ | | | | | | | | | | | | | | | | Fetch deeper the tested branch before fetching master See merge request !9484
| * | | Put banners in constantsRémy Coutable2017-03-231-29/+27
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fetch deeper the tested branch before fetching masterRémy Coutable2017-03-231-98/+181
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The tested branch is clone with a deep of 20 so if it has more than 20 commits, we need to deepen its hitory to be able to find the merge-base with origin/master. Also, detect prefixed EE branch as well, i.e. `ee-<branch>`. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'fix-ci-api-regression-for-after-script' into 'master' Kamil Trzciński2017-03-241-7/+2
|\ \ \ | |/ / |/| | | | | | | | Fix after_script processing for Runners APIv4 See merge request !10185
| * | Fix after_script processing for Runners APIv4Tomasz Maczukin2017-03-231-7/+2
| |/
* | Merge branch 'increase-etag-cache-expiry-time' into 'master' Sean McGivern2017-03-231-1/+1
|\ \ | | | | | | | | | | | | Increase ETag cache expiry time See merge request !10180
| * | Increase ETag cache expiry timeAdam Niedzielski2017-03-231-1/+1
| |/ | | | | | | As discussed in #29777.
* | Introduce a new middleware for the test environment that can block requestsRémy Coutable2017-03-221-0/+61
|/ | | | | | | | | | | | The idea is that after each feature spec example, we block all incoming requests at the Rack level, go to the 'about:blank' page, and wait until the current requests reach 0. This should solve the problem where a request would end after database cleaner performed the database truncation. The problem was that a GET request can still lead to records creation (e.g. namespaces or routes). Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'gitaly-install-rake' into 'master' Robert Speicher2017-03-215-9/+94
|\ | | | | | | | | | | | | Docs and scripts to install Gitaly from source Closes gitaly#136 and #28446 See merge request !9941
| * Add gitaly source installation instructionsJacob Vosmaer2017-03-212-8/+63
| |
| * Print command output when a task failedJacob Vosmaer2017-03-211-1/+1
| | | | | | | | This helps you understand why the command failed.
View Lorry Controller Status