summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::GitAndrew Newdigate2017-08-247-7/+65
|/ / / / / / / /
* | | | | | | | Merge branch '36262_merge_request_reference_in_merge_commit_global' into ↵Sean McGivern2017-08-244-5/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' fix Merge request reference in merge commit is not global Closes #36262 See merge request !13518
| * | | | | | | | [ci skip] changelog entry added for full merge request ref changeshaseeb2017-08-232-1/+5
| | | | | | | | |
| * | | | | | | | fixes failing tests for full reference changehaseeb2017-08-132-3/+3
| | | | | | | | |
| * | | | | | | | fix Merge request reference in merge commit is not globalhaseeb2017-08-131-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/gb/avoid-races-when-cleaning-db-in-tests' into 'master'Sean McGivern2017-08-241-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve transient failures related to testing migrations Closes #36745 See merge request !13761
| * | | | | | | | | Invalidate cache before cleaning db in tests after contextfix/gb/avoid-races-when-cleaning-db-in-testsGrzegorz Bizon2017-08-231-3/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-add-pipeline-source-variable' into 'master'Grzegorz Bizon2017-08-244-2/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose CI_PIPELINE_SOURCE on CI jobs Closes #34165 See merge request !13759
| * | | | | | | | | Expose CI_PIPELINE_SOURCE on CI jobsZeger-Jan van de Weg2017-08-234-2/+21
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | It was missing and expected it wouldn't hurt anyone
* | | | | | | | | Merge branch 'sh-fix-branch-count' into 'master'Douwe Maan2017-08-242-1/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent number of branches when remote branches are present Closes #36934 See merge request !13784
| * | | | | | | | | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-232-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of project mirrors would see that the number of branches did not match the number in the branch dropdown because remote branches were counted when Rugged was in use. With Gitaly, only local branches are counted. Closes #36934
* | | | | | | | | | Merge branch 'use_full_path_in_project_avatar_url_webhook' into 'master'Robert Speicher2017-08-232-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use full path of project's avatar in webhooks Closes #36539 See merge request !13649
| * | | | | | | | | | Use full path of project's avatar in webhooksblackst0ne2017-08-182-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-234-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support simple string LDAP attribute specifications, and search for name rather… Closes #36841 See merge request !13776
| * | | | | | | | | | | Support simple string LDAP attribute specifications, and search for name ↵dm-ldap-adapter-attributesDouwe Maan2017-08-234-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than username attributes
* | | | | | | | | | | | Merge branch '36709-gpg-status' into 'master'Clement Ho2017-08-233-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of gpg status Closes #36709 See merge request !13772
| * | | | | | | | | | | Fix alignment of gpg status36709-gpg-statusAnnabel Dunstone Gray2017-08-233-6/+7
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'zj-fix-fe-blank-button' into 'master'Clement Ho2017-08-232-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix blank button not resetting project template value Closes #36816 See merge request !13757
| * | | | | | | | | | | Fix blank button not resetting project template valueZeger-Jan van de Weg2017-08-232-1/+6
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The button didn't override a value, so the old value was posted again.
* | | | | | | | | | | Merge branch '36883-update-license-approval-process' into 'master'Douwe Maan2017-08-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update licensing query guidelines Closes #36883 See merge request !13768
| * | | | | | | | | | | Update licensing query guidelinesNick Thomas2017-08-231-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'Robert Speicher2017-08-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly encode Gitaly RawBlame request params See merge request !13764
| * | | | | | | | | | | Properly encode Gitaly RawBlame request paramsfix/gitlay-raw-blame-request-encodingAhmad Sherif2017-08-231-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-2325-71/+301
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the number of open issues and merge requests Closes #36622 See merge request !13639
| * | | | | | | | | | | Cache the number of open issues and merge requestsYorick Peterse2017-08-2325-71/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every project page displays a navigation menu that in turn displays the number of open issues and merge requests. This means that for every project page we run two COUNT(*) queries, each taking up roughly 30 milliseconds on GitLab.com. By caching these numbers and refreshing them whenever necessary we can reduce loading times of all these pages by up to roughly 60 milliseconds. The number of open issues does not include confidential issues. This is a trade-off to keep the code simple and to ensure refreshing the data only needs 2 COUNT(*) queries instead of 3. A downside is that if a project only has 5 confidential issues the counter will be set to 0. Because we now have 3 similar counting service classes the code previously used in Projects::ForksCountService has mostly been moved to Projects::CountService, which in turn is reused by the various service classes. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36622
* | | | | | | | | | | | Merge branch 'bvl-improve-bare-project-import' into 'master'Sean McGivern2017-08-238-81/+272
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the import take subgroups into account Closes #36664 and #30546 See merge request !13670
| * | | | | | | | | | | Fix error when importing a GitHub-wiki repositorybvl-improve-bare-project-importBob Van Landuyt2017-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would occur when Wiki's are enabled on GitHub, but there is no wiki repository
| * | | | | | | | | | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-235-70/+101
| | | | | | | | | | | |
| * | | | | | | | | | | Improve bare repository importBob Van Landuyt2017-08-234-63/+223
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow imports into nested groups - Make sure it sets the correct visibility level when creating new groups While doing this, I moved the import into a testable class, that made it easier to improve.
* | | | | | | | | | | Update CHANGELOG.md for 9.5.1Simon Knox2017-08-236-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch '36806-update-rbnacl' into 'master'Douwe Maan2017-08-232-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the rbnacl gem to 4.0.2 Closes #36806 See merge request !13740
| * | | | | | | | | | Update the rbnacl gem to 4.0.2Nick Thomas2017-08-222-4/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-235-4/+45
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
| * | | | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-226-5/+46
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-233-9/+46
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tooltip from filtered search user Closes #36696 See merge request !13752
| * | | | | | | | | | | Remove tooltip from filtered search userremove-tooltip-filtered-search-userClement Ho2017-08-223-9/+46
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-237-11/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix displaying events of removed events and events without commit messages Closes #36685 and #36722 See merge request !13721
| * | | | | | | | | | | | Fix display of push events for removed refsfix-push-events-branch-removalsYorick Peterse2017-08-227-11/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
* | | | | | | | | | | | | Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into ↵Douwe Maan2017-08-235-1/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add migration to remove pending delete projects with non-existing namespace Closes #36541 See merge request !13598
| * | | | | | | | | | | | | Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projectsToon Claes2017-08-222-26/+22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Migration to remove pending delete projects with non-existing namespaceToon Claes2017-08-225-1/+111
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There might be some projects where the namespace was removed, but the project wasn't. For these the projects still have a `namespace_id` set. So this adds a post-deploy migration remove all projects that are pending delete, and have a `namespace_id` that is non-existing.
* | | | | | | | | | | | | Merge branch 'rs-fix-admin-logs-timeout' into 'master'Douwe Maan2017-08-233-16/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a potential timeout in `Gitlab::Logger.read_latest` See merge request !13751
| * | | | | | | | | | | | | Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-222-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should be defining the list of loggers in the controller, not the view.
| * | | | | | | | | | | | | Fix a potential timeout in `Gitlab::Logger.read_latest`Robert Speicher2017-08-221-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this method was called for a file that didn't exist, we attempted to first `build` it. But if the file wasn't writeable, such as a symlink pointing to an unmounted filesystem, the method would just hang and eventually timeout. Further, this was entirely pointless since we were creating a file and then shelling out to `tail`, eventually returning an empty Array. Now we just skip building it and return the empty Array straight away.
* | | | | | | | | | | | | | Merge branch 'rs-stub-storage-availability-check' into 'master'Douwe Maan2017-08-232-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stub `ForkedStorageCheck.storage_available?` by default in all specs See merge request !13726
| * | | | | | | | | | | | | | Stub `ForkedStorageCheck.storage_available?` by default in all specsrs-stub-storage-availability-checkRobert Speicher2017-08-222-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `:broken_storage` metadata to examples to disable this behavior only when necessary.
* | | | | | | | | | | | | | | Merge branch 'fix-broken-testing-of-some-integrations' into 'master'Douwe Maan2017-08-233-16/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to test some project integrations Closes gitlab-ee#3194 See merge request !13729
| * | | | | | | | | | | | | | Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-223-16/+40
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable webpack.optimize because it's breaking karma in EE See merge request !13720
| * | | | | | | | | | | | | | disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
| | | | | | | | | | | | | | |