summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-1212-43/+25
| | | | Having a distinct class just for that was a bit overkill
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-1224-323/+334
| | | | Rename classes to (hopefully) clearer names while we're doing that.
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-1218-300/+388
| | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
* Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-122-3/+5
|
* Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-1210-20/+20
|
* Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-123-60/+52
|
* Merge branch 'evn-add-profiler' into 'master'Stan Hu2017-10-121-0/+10
|\ | | | | | | | | Add link to gitlab-profiler See merge request gitlab-org/gitlab-ce!14775
| * Different wording to make it more generalevn-add-profilerernstvn2017-10-091-3/+3
| |
| * Add link to gitlab-profilerernstvn2017-10-091-0/+10
| |
* | Merge branch 'new-mr-repo-editor' into 'master'Clement Ho2017-10-1211-68/+260
|\ \ | | | | | | | | | | | | | | | | | | Add create merge checkbox. Closes #38626 See merge request gitlab-org/gitlab-ce!14665
| * | Add create merge checkbox.Jacob Schatz2017-10-1211-68/+260
|/ /
* | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-123-4/+68
|\ \ | | | | | | | | | | | | | | | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab admin Closes #26763 and #18392 See merge request gitlab-org/gitlab-ce!14751
| * | fix code style issuesVratislav Kalenda2017-10-101-2/+10
| | |
| * | fill in changelog entryVratislav Kalenda2017-10-101-2/+2
| | |
| * | refactor access handlingVratislav Kalenda2017-10-101-5/+12
| | |
| * | fix lintVratislav Kalenda2017-10-081-6/+3
| | |
| * | remove whitespaceVratislav Kalenda2017-10-082-4/+1
| | |
| * | Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-083-0/+55
| | |
* | | Merge branch 'update-licenses.csv' into 'master'Rémy Coutable2017-10-121-102/+52
|\ \ \ | | | | | | | | | | | | | | | | Update dependencies license list See merge request gitlab-org/gitlab-ce!14845
| * | | Update licensesLin Jen-Shin2017-10-121-102/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followed the command from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-4-update-the-dependencies-license-list bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv
* | | | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-122-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the format of rugged alternate directory list Closes #39046 See merge request gitlab-org/gitlab-ce!14840
| * | | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-122-2/+3
| | | | | | | | | | | | | | | | | | | | Fixes #39046
* | | | | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-124-14/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "remove source branch" checkbox from merge widget being ignored Closes #34897 See merge request gitlab-org/gitlab-ce!14832
| * | | | | fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
| | | | | |
| * | | | | fix for discussionMicael Bergeron2017-10-121-3/+4
| | | | | |
| * | | | | [ci-skip] add changelogmicael.bergeron2017-10-111-0/+5
| | | | | |
| * | | | | fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
| | | | | |
| * | | | | add specmicael.bergeron2017-10-112-7/+22
| | | | | |
* | | | | | Merge branch 'update-installation-doc-for-10-1' into 'master'Rémy Coutable2017-10-122-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation doc for 10.1 See merge request gitlab-org/gitlab-ce!14843
| * | | | | | Update doc accordingly to:update-installation-doc-for-10-1Lin Jen-Shin2017-10-122-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1
* | | | | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-122-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Gitlab::Git::Repository#fetch` command Closes gitaly#586 See merge request gitlab-org/gitlab-ce!14772
| * | | | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-092-0/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-124-8/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix multiple notifications from being sent for multiple labels Closes #37691 See merge request gitlab-org/gitlab-ce!14798
| * | | | | | | fix a wrong method call in the refactormicael.bergeron2017-10-121-1/+1
| | | | | | | |
| * | | | | | | [ci-skip] add changelog37691-subscription-fires-multiple-notificationsmicael.bergeron2017-10-101-0/+5
| | | | | | | |
| * | | | | | | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-103-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also refactor the email_helper support spec to watch for multiple emails being sent.
* | | | | | | | Merge branch 'update-templates' into 'master'Rémy Coutable2017-10-1219-21/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates See merge request gitlab-org/gitlab-ce!14844
| * | | | | | | | Update templates via:Lin Jen-Shin2017-10-1219-21/+85
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | bin/rake gitlab:update_templates
* | | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-127-28/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Cache issuable template names See merge request gitlab-org/gitlab-ce!14823
| * | | | | | | Cache issuable template namesSean McGivern2017-10-126-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were looking these up on each request to an issue page, because the form is pre-filled, as is the template dropdown. That was unnecessary: we could just treat these as 'special' repository files (like the rendered README) and cache them in Redis until they change on a push.
| * | | | | | | Match full file path in FileDetectorSean McGivern2017-10-123-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basename appears to have been a holdover from the past - it doesn't look necessary now. Some of the regexes were unanchored on one side, so explicitly ensure that they only match the root. Apart from that, this means that pushing to foo/README.md will no longer invalidate the main README cache for a project.
* | | | | | | | Merge branch 'dm-api-authentication' into 'master'Robert Speicher2017-10-125-105/+108
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Move all API authentication code to APIGuard See merge request gitlab-org/gitlab-ce!14528
| * | | | | | | Move all API authentication code to APIGuardDouwe Maan2017-10-125-105/+108
| | | | | | | |
* | | | | | | | Merge branch '39001-mr-tabs-hover' into 'master'Phil Hughes2017-10-121-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes from CSS refactor Closes #39001 and #38939 See merge request gitlab-org/gitlab-ce!14828
| * | | | | | | | Fixes from CSS refactorAnnabel Dunstone Gray2017-10-121-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch '35652-prometheus-service-page-shows-error' into 'master'Phil Hughes2017-10-123-5/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Prometheus service page shows error" Closes #35652 See merge request gitlab-org/gitlab-ce!14771
| * | | | | | | | Resolve "Prometheus service page shows error"Jose Ivan Vargas Lopez2017-10-123-5/+18
|/ / / / / / / /
* | | | | | | | Merge branch 'winh-shorten-inclusive-language-example-docs' into 'master'Achilleas Pipinellis2017-10-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten example translation for inclusive language See merge request gitlab-org/gitlab-ce!14833
| * | | | | | | | Shorten example translation for inclusive languagewinh-shorten-inclusive-language-example-docsWinnie Hellmann2017-10-111-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/gke-cluster' into 'master'Achilleas Pipinellis2017-10-124-59/+172
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for GKE integration See merge request gitlab-org/gitlab-ce!14712
View Lorry Controller Status