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
2017-02-07Use normal associations instead of polymorphic.Ruben Davila
We can't properly use foreign keys on columns that are configured for polymorphic associations which has disadvantages related to data integrity and storage. Given we only use time tracking for Issues and Merge Requests we're moving to the usage of regular associations.
2017-02-06Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan
Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
2017-02-06Merge branch 'master' into 'jej-pages-to-ce'James Edwards-Jones
# Conflicts: # db/schema.rb
2017-02-05Add traits for ProjectFeatures to Project factorySemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
2017-02-03Merge branch 'rs-event-traits' into 'master' Rémy Coutable
Add traits for the different Event types to the Event factory See merge request !8870
2017-02-03Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones
2017-02-03Remove backlog lists from factoriesDouglas Barbosa Alexandre
2017-02-02Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin
fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
2017-02-02Add traits for the different Event types to the Event factoryRobert Speicher
2017-02-01Update commentsKamil Trzcinski
2017-02-01Verify trusted certificate chainKamil Trzcinski
2017-02-01Pages domain model specsKamil Trzcinski
2017-01-26Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet
Fix /explore sorting (trending) Closes #27044 See merge request !8792
2017-01-26Fix /explore sorting (trending)Eric Eastwood
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27044
2017-01-26Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin
fix-git-hooks-when-creating-file * upstream/master: Ensure we have a project with a repo in GitlabMarkdownHelper specs Revert "Make sure TraceReader uses Encoding.default_external" Make sure TraceReader uses Encoding.default_external Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip] Use `:empty_project` where possible in finder specs Use `empty_project` where possible in controller specs Use `:empty_project` where possible in helper specs Don’t count tasks that are not defined as list items correctly Use a project factory with a repository where necessary Use `:empty_project` where possible throughout spec/lib Use hashrocket for dasherized attribute Remove markdown file extension and add anchor to link Fixed builds info link on project settings page Factories with a project association use `:empty_project` by default Update enviroments.md the example for deleting an environment is missing the "s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1" wil 404
2017-01-26Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin
fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
2017-01-26Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable
Factories with a project association use `:empty_project` by default See merge request !8770
2017-01-25Use a project factory with a repository where necessaryRobert Speicher
2017-01-25Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon
Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1078 See merge request !8657
2017-01-25Merge branch 'no_project_notes' into 'master' Sean McGivern
Support notes without a project (personal snippets notes) See merge request !8468
2017-01-25Factories with a project association use `:empty_project` by defaultRobert Speicher
2017-01-24Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
backport-ee-changes-for-build-minutes
2017-01-23Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński
Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503
2017-01-20Backport changes introduced by ↵Kamil Trzcinski
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1083
2017-01-19Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern
Notify the user who set auto-merge when merge is not possible Closes #23524 See merge request !8056
2017-01-19Support notes without projectJarka Kadlecova
2017-01-18Merge branch 'rs-repository-project-trait' into 'master' Rémy Coutable
Add a `:repository` trait to the `:empty_project` factory See merge request !8605
2017-01-18Pass memoizable warnings attribute to stage objectGrzegorz Bizon
2017-01-18Add a `:repository` trait to the `:empty_project` factoryRobert Speicher
Right now this is a no-op. We're going to add it as a trait argument to all existing usages of the `:project` factory, so that later we can flip `:empty_project` to just be `:project`, forcing developers to opt-in to the slower option when their tests truly require it.
2017-01-15Backport backend work for time tracking.Ruben Davila
2017-01-14Notify the user who set auto-merge when merge conflict occurstwonegatives
2017-01-13Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable
Move dashboard archived projects spinach tests to rspec See merge request !8431
2017-01-04Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin
* master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
2017-01-04Add test example for pipeline with yaml errorsGrzegorz Bizon
2017-01-04Move dashboard archived projects spinach tests to rspecSemyon Pupkov
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2017-01-03fix pipelines/index.html.haml merge conflictRegis
2016-12-27Add missing specs for new methods in pipeline classGrzegorz Bizon
2016-12-26Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern
Add more storage statistics See merge request !7754
2016-12-24merge master and fix application.rb conflictRegis
2016-12-22Fix viewing "build failed" TODOsNick Thomas
2016-12-21Add more storage statisticsMarkus Koller
This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
2016-12-21Add specs for pipeline entity and improve factoryGrzegorz Bizon
[ci skip]
2016-12-20Add terminal UI and controller actionsFatih Acet
2016-12-19Add terminals to the Kubernetes deployment serviceNick Thomas
2016-12-19Merge branch 'master' into fix-yaml-variablesLin Jen-Shin
* master: (327 commits) Always use `fixture_file_upload` helper to upload files in tests. Add CHANGELOG Move admin application spinach test to rspec Move admin deploy keys spinach test to rspec Fix rubocop failures Store mattermost_url in settings Improve Mattermost Session specs Ensure the session is destroyed Improve session tests Setup mattermost session Fix query in Projects::ProjectMembersController to fetch members Improve test for sort dropdown on members page Fix sort dropdown alignment Undo changes on members search button stylesheet Use factories to create project/group membership on specs Remove unused id from shared members sort dropdown Fix sort functionality on project/group members to return invited users Refactor MembersHelper#filter_group_project_member_path Remove unnecessary curly braces from sort dropdown partial Sort group/project members alphabetically by default ...
2016-12-16Add a `scopes` column to the `personal_access_tokens` tableTimothy Andrew
2016-12-15Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan
Fix missing Note access checks in by moving Note#search to updated NoteFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested ### Note lookup without access check - [x] :white_check_mark: app/finders/notes_finder.rb:13 :download_code check - [x] :white_check_mark: app/finders/notes_finder.rb:19 `SnippetsFinder` - [x] :white_check_mark: app/models/note.rb:121 [`Issue#visible_to_user`] - [x] :white_check_mark: lib/gitlab/project_search_results.rb:113 - This is the only use of `app/models/note.rb:121` above, but importantly has no access checks at all. This means it leaks MR comments and snippets when those features are `team-only` in addition to the issue comments which would be fixed by `app/models/note.rb:121`. - It is only called from SearchController where `can?(current_user, :download_code, @project)` is checked, so commit comments are not leaked. ### Previous discussions - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_13_13 `: download_code` check on commit - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_19_19 `SnippetsFinder` should be used - `SnippetsFinder` should check if the snippets feature is enabled -> https://gitlab.com/gitlab-org/gitlab-ce/issues/25223 ### Acceptance criteria met? - [x] Tests added for new code - [x] TODO comments removed - [x] Squashed and removed skipped tests - [x] Changelog entry - [ ] State Gitlab versions affected and issue severity in description - [ ] Create technical debt issue for NotesFinder. - Either split into `NotesFinder::ForTarget` and `NotesFinder::Search` or consider object per notable type such as `NotesFinder::OnIssue`. For the first option could create `NotesFinder::Base` which is either inherited from or which can be included in the other two. - Avoid case statement anti-pattern in this finder with use of `NotesFinder::OnCommit` etc. Consider something on the finder for this? `Model.finder(user, project)` - Move `inc_author` to the controller, and implement `related_notes` to replace `non_diff_notes`/`mr_and_commit_notes` See merge request !2035
2016-12-15Convert CI YAML variables keys into stringsLin Jen-Shin
So that this would be more consistent with the other variables, which all of them are string based. Closes #25554
2016-12-15Introduce deployment services, starting with a KubernetesServiceNick Thomas
2016-12-14Merge branch 'build-statuses' into 'master' Rémy Coutable
Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989