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
AgeCommit message (Collapse)Author
2018-03-19Merge branch 'profile-notifications-dropdown-fix' into 'master'Filipa Lacerda
Fixed profile notifications not being editable Closes #44198 See merge request gitlab-org/gitlab-ce!17808
2018-03-19Merge branch 'fix-dropzone-project-show' into 'master'Jacob Schatz
Fix dropzone project show Closes #44137 See merge request gitlab-org/gitlab-ce!17784
2018-03-19Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński
Clarify ambiguous with_artifacts implication Closes #44138 See merge request gitlab-org/gitlab-ce!17720
2018-03-19Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7James Lopez
2018-03-16Revert "Merge branch '35475-lazy-diff' into 'master'"James Lopez
This reverts commit e4fded68248c0989b4c31921f1c9f8103c65aef7.
2018-03-16Merge branch 'ci-lint-dispatcher-fix' into 'master'Filipa Lacerda
Change path of CI lints create index.js file Closes #44181 See merge request gitlab-org/gitlab-ce!17751
2018-03-14Merge branch '35475-lazy-diff' into 'master'Fatih Acet
Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" Closes #35475 See merge request gitlab-org/gitlab-ce!15200
2018-03-13Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes
Fix "Remove source branch" button in MR widget during MWPS state Closes #42814 and #4281 See merge request gitlab-org/gitlab-ce!17192
2018-03-08Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 10-6-stable-frozenJames Lopez
# Conflicts: # GITLAB_PAGES_VERSION
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-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-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-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-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-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-07Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan
Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
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-07Revert "Cleanup after adding MR diff's commit_count"James Lopez
This reverts commit 0b7d108 Fixed confict in schema.rb
2018-03-07Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan
Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
2018-03-07Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets
Show plugins list on system hooks page Closes #40812 See merge request gitlab-org/gitlab-ce!17518
2018-03-06Add feature test for plugins on system hooks pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-06Merge branch 'sh-dashboard-sort-fix' into 'master'Douwe Maan
Fix project dashboard showing the wrong timestamps Closes #27181 See merge request gitlab-org/gitlab-ce!17504
2018-03-06Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵Rémy Coutable
into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
2018-03-06Add overview of branches and a filter for active/stale branchesTakuya Noguchi
2018-03-06Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński
Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
2018-03-06Revert unnecessary code running_or_pending_build_count removalShinya Maeda
2018-03-06Merge branch '38587-pipelines-empty-state' into 'master'Phil Hughes
Resolve "Pipelines view should handle empty state and buttons properly" Closes #38587 See merge request gitlab-org/gitlab-ce!17433
2018-03-06Introduce FailedToExtractError. Fix spec. Add DNS test mock.Shinya Maeda
2018-03-06Fix project dashboard showing the wrong timestampsStan Hu
Use the max of the `last_activity_at` and `last_repository_updated_at` columns. The latter is updated only when a push happens, but the former is updated whenever any activity (e.g. issue creation) happens. Closes #27181
2018-03-06Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher
Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
2018-03-05CI/CD-only projects FEEric Eastwood
See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
2018-03-05Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan
Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
2018-03-05[ci skip] Merge branch 'master' into 38587-pipelines-empty-stateFilipa Lacerda
* master: (52 commits) Projects and groups badges API Keep a commit around if its sha is present #43691: DiffNotes not counted by ContributionsCalendar Cleanup after adding MR diff's commit_count Fix MR merge commit cross-references to the MR itself Fix n+1 issue by not reloading fully loaded blobs Add "added" type on changelog Use limited count queries also for scoped searches Update changelog Rename quick actions handler Adds updated_at filter to issues and merge_requests API Update API: add search param to branches Add changelog entry LabelsSelect DropdownValueCollapsed Component LabelsSelect DropdownValue Component LabelsSelect DropdownTitle Component LabelsSelect DropdownSearchInput Component LabelsSelect DropdownHiddenInput Component LabelsSelect DropdownHeader Component LabelsSelect DropdownFooter Component ...
2018-03-05Merge branch 'jprovazn-count-cleanup' into 'master'Robert Speicher
Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513
2018-03-05Cleanup after adding MR diff's commit_countJan Provaznik
* processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
2018-03-05Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05Replace deprecated path_with_namespace with full_pathDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵Rémy Coutable
into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482
2018-03-05Manage empty states in Pipelines pageFilipa Lacerda
Adds i18n Adds test Fix broken tests Fixes empty tab state for external CI
2018-03-02Fix quick actions for users who cannot update issues and MRsSean McGivern
There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions.
2018-03-02Remove IDE from CEPhil Hughes
2018-03-01Remove u2f webpack bundleMike Greiling
2018-03-01Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan
Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
2018-03-01Merge branch '41777-include-cycle-time-in-usage-ping' into 'master'Douwe Maan
Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793
2018-03-01Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński
Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052
2018-03-01Adapt cycle analytics spec helper and cycle analytics usage data specTiago Botelho
2018-03-01Removing the two factor check when the user sets a new passwordFrancisco Javier López