Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2018-03-08Add auto generated svgs to gitignoreauto-generate-svgsClement Ho
2018-03-08Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' ↵Phil Hughes
into 'master' Move MemoryGraph and MemoryUsage vue components See merge request gitlab-org/gitlab-ce!17533
2018-03-08Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes
Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
2018-03-08Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis
2018-03-08Fix Error 500 when updating a projectStan Hu
If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
2018-03-08Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse
Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
2018-03-08Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern
Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
2018-03-08[CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto
2018-03-08Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik
This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
2018-03-08Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern
Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
2018-03-08Merge branch ↵Kamil Trzciński
'43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' Resolve "Change Clear Runners cache UJS action to an API request" Closes #43770 See merge request gitlab-org/gitlab-ce!17466
2018-03-08Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan
Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
2018-03-08Merge branch 'unassign-when-leaving' into 'master'Robert Speicher
Don't delete todos or unassign issues and MRs when a user leaves a project Closes #43899 See merge request gitlab-org/gitlab-ce!17615
2018-03-08Hides Triggers if integration only has one eventJames Edwards-Jones
Removes confusing/unnecessary checkboxes when trying to configure an integration. If there is only one supported event we don't need to allow these to be individually disabled since the integration can be disabled instead. E.g. Project Integrations for GitHub, Bugzilla, Asana, Pipeline emails and Gemnasium Allows integrations to override which triggers are configurable
2018-03-08Address frontend feedbackBob Van Landuyt
2018-03-08Don't delete todos or unassign issues and MRs when a user leaves a projectDouwe Maan
2018-03-08Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda
backport of custom metrics for the common metrics section of CE See merge request gitlab-org/gitlab-ce!17586
2018-03-08backport of custom metrics for the common metrics section of CEJose Ivan Vargas
2018-03-08Merge branch 'da-update-project-activity' into 'master'Stan Hu
Update project activity when pushing to a wiki repository See merge request gitlab-org/gitlab-ce!17621
2018-03-08Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan
Create CI/CD-only projects from GitHub -- CE backport See merge request gitlab-org/gitlab-ce!17432
2018-03-08Merge branch 'backport-ee-3892-to-ce' into 'master'Douwe Maan
Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE See merge request gitlab-org/gitlab-ce!17608
2018-03-07Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'Clement Ho
Move SidebarAssignees vue component See merge request gitlab-org/gitlab-ce!17398
2018-03-07Update project activity when pushing to a wiki repositoryDouglas Barbosa Alexandre
2018-03-07Resolve "Add a mention and link to doc for security implications in the ↵Mayra Cabrera
Kubernetes cluster page"
2018-03-07Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'Douwe Maan
# Conflicts: # locale/gitlab.pot
2018-03-07Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan
Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
2018-03-07[ci skip] Merge branch 'master' into ↵Filipa Lacerda
43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (68 commits) Upgrade Workhorse to 4.0.0 naming things Update GitLab Pages to v0.7.0 Minor fixes in API doc Use Project#full_name instead of name_with_namespace Fix tests not completely disabling Gitaly Move OperationService#UserRemoveBranch Move OperationService#UserCreateBranch Move CommitService#Languages to OPT_OUT Move RefService#CreateBranch to OPT_OUT Move RefService#DeleteBranch to OPT_OUT Move OperationService#UserRevert to OPT_OUT Move OperationService#UserAddTag to OPT_OUT Move CommitService::CommitPatch to OPT_OUT Change to Pacific Time Zone Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5' Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5' Remove wrong assumption about Runners cache GC Add CommonMark markdown engine add nginx_status monitoring details ...
2018-03-07Move SidebarAssignees vue componentGeorge Tsiolis
2018-03-07Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho
Resolve "Make margin around dropdown dividers 4px" Closes #39444 See merge request gitlab-org/gitlab-ce!17517
2018-03-07Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher
Reduce number of FindCommit calls from RefsController#logs_tree Closes gitaly#1057 See merge request gitlab-org/gitlab-ce!17566
2018-03-07Service integration displays validation errors on test failJames Edwards-Jones
Fixes attempts to update a service integration which had `can_test?` set to true but validations were causing the "Test and save changes" button to return "Something went wrong on our end." Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6
2018-03-07Backport changes from EE's GithubService integrationJames Edwards-Jones
Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
2018-03-07Merge branch '4326-fix-js-or-true' into 'master'Clement Ho
Fix a JS bug in the websocket terminal See merge request gitlab-org/gitlab-ce!17470
2018-03-07Backport relevant changes from EE ↵Tiago Botelho
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE
2018-03-07Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda
Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
2018-03-07Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan
Use Project#full_name instead of name_with_namespace See merge request gitlab-org/gitlab-ce!17601
2018-03-07Only allow users that can merge to push to sourceBob Van Landuyt
We only allow users that can merge the merge request to push to the fork.
2018-03-07Link correct project when adding file to empty MRBob Van Landuyt
When creating a cross project merge request without changes. The MR widget shows the option to create a new file. It would however link to the wrong project.
2018-03-07Use Project#source_of_merge_requests-relationBob Van Landuyt
Using the relation `Project#source_of_merge_requests` in `Ci::CreatePipelineService` That way we take advantage of all the `ActiveRecord::Relation` magic
2018-03-07Limit queries to a user-branch combinationBob Van Landuyt
The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
2018-03-07Add documentation for allowing maintainers to pushBob Van Landuyt
2018-03-07CE backport for creating CI/CD projects from GitHubRubén Dávila
2018-03-07Allow maintainers to edit directly in a forkBob Van Landuyt
2018-03-07Merge remote-tracking branch 'dev/master'Robert Speicher
2018-03-07Memoize Repository#empty? instead of double caching the valueStan Hu
We saw that in a customer instance, `empty?` was cached to be `true` even though `has_visible_content?` and `exists?` were `true`. This double caching can run into edge cases because there's no guarantee that the inner values will properly expire the outer one, especially if there is Redis replication lag. Consider this scenario: 1. `exists?` and `has_visible_content?` are false 2. `empty?` is expired 3. A subsequent call to `empty?` returns `true` because `exists?` is false even though `empty` is true 4. `exists?` and `has_visible_content?` are then expired 5. `exists?` and `has_visible_content?` are set to true 6. `empty?` is still stuck in the wrong value as `true` Closes #43882
2018-03-07Allow abilities on forks while MR is openBob Van Landuyt
When an MR is created using `allow_maintainer_to_push`, we enable some abilities while the MR is open. This should allow every user with developer abilities on the target project, to push to the source project.
2018-03-07Allow a user to select `allow maintainer to push`Bob Van Landuyt
When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
2018-03-07Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-07Merge branch 'mr-commit-optimization' into 'master'Sean McGivern
Use persisted/memoized value for MRs sha's instead of doing git lookups See merge request gitlab-org/gitlab-ce!17555
2018-03-07Merge branch 'jprovazn-api' into 'master'Sean McGivern
Add discussion API See merge request gitlab-org/gitlab-ce!17510