| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master' | Sean McGivern | 2017-08-10 | 2 | -26/+60 |
| |\ | | | | | | | | | Fix conflicting redirect search See merge request !13357 | ||||
| | * | Fix stylemk-fix-case-insensitive-redirect-matching | Michael Kozono | 2017-08-09 | 1 | -3/+3 |
| | | | |||||
| | * | Fix conflicting redirect search | Michael Kozono | 2017-08-08 | 2 | -26/+60 |
| | | | |||||
| * | | Prevent user from changing username with container registry tags | Michael Kozono | 2017-08-09 | 1 | -0/+11 |
| | | | |||||
| * | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-cop | Rémy Coutable | 2017-08-09 | 5 | -6/+6 |
| |/ | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch ↵ | Rémy Coutable | 2017-08-08 | 1 | -0/+5 |
| |\ | | | | | | | | | | | | | | | | | '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359 | ||||
| | * | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one | blackst0ne | 2017-08-08 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'gitaly-find-commit' into 'master' | Dmitriy Zaporozhets | 2017-08-08 | 1 | -3/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094 | ||||
| | * | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commit | Alejandro Rodríguez | 2017-08-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Refactor Gitlab::Git::Commit to include a repository | Alejandro Rodríguez | 2017-08-07 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 1 | -0/+26 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207 | ||||
| | * | | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 1 | -0/+26 |
| | | | | |||||
| * | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master' | Robert Speicher | 2017-08-07 | 1 | -9/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268 | ||||
| | * | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitaly | Ahmad Sherif | 2017-08-07 | 1 | -9/+21 |
| | |/ / | | | | | | | | | | Closes gitaly#443 | ||||
| * | | | Merge branch '32844-issuables-performance' into 'master' | Sean McGivern | 2017-08-07 | 1 | -4/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326 | ||||
| | * | | | Move some after_create parts to worker to improve performance32844-issuables-performance | Jarka Kadlecova | 2017-08-07 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Merge branch '35761-convdev-perc' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store & use ConvDev percentages returned by Version app Closes #35761 See merge request !13217 | ||||
| | * | | | | Store & use ConvDev percentages returned by Version app35761-convdev-perc | Jarka Kadlecova | 2017-08-07 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Merge branch 'backport-ee-2251' into 'master' | Sean McGivern | 2017-08-07 | 1 | -10/+0 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275 | ||||
| | * | | | | Backport changes in ↵ | Nick Thomas | 2017-08-07 | 1 | -10/+0 |
| | | |_|/ | |/| | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE | ||||
| * | | | | Merge branch 'group-milestone-references-system-notes' into 'master' | Robert Speicher | 2017-08-07 | 1 | -7/+31 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289 | ||||
| | * | | | Support references to group milestones | Sean McGivern | 2017-08-07 | 1 | -7/+31 |
| | |/ / | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references. | ||||
| * | | | Merge branch 'wiki_title' into 'master' | Robert Speicher | 2017-08-07 | 2 | -13/+36 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | add feature rename wiki title Closes #27800 See merge request !10069 | ||||
| | * | | | Allow wiki pages to be renamed in the UI | wendy0402 | 2017-08-03 | 2 | -13/+36 |
| | | | | | |||||
| * | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+24 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Improve various parts of Dashboard::ProjectsController See merge request !13319 | ||||
| | * | | | | Memoize a user's personal projects count | Yorick Peterse | 2017-08-07 | 1 | -0/+24 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method User#projects_limit_left would run "personal_projects.count" but such a query is not memoized. As a result multiple calls to User#projects_limit_left would result in multiple COUNT(*) queries being executed. To work around this this commit adds User#personal_projects_count which simply memoizes the result of the COUNT(*) in an instance variable. | ||||
| * | | | | GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError | Bob Van Landuyt | 2017-08-07 | 1 | -17/+18 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker' | Douwe Maan | 2017-08-07 | 1 | -10/+30 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb | ||||
| | * | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master' | Robert Speicher | 2017-08-04 | 1 | -10/+30 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#last_commit_for_path to Gitaly Closes gitaly#433 See merge request !13200 | ||||
| | | * | | | Migrate Repository#last_commit_for_path to Gitaly | Ahmad Sherif | 2017-08-03 | 1 | -10/+30 |
| | | | | | | | | | | | | | | | | | | | | | Closes gitaly#433 | ||||
| * | | | | | Add a Circuitbreaker for storage paths | Bob Van Landuyt | 2017-08-04 | 1 | -1/+68 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-jira-integration' into 'master' | Rémy Coutable | 2017-08-04 | 1 | -0/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it See merge request !13240 | ||||
| | * | | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it | Mehdi Lahmam | 2017-08-03 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'use-rspec-support-helper' into 'master' | Rémy Coutable | 2017-08-03 | 5 | -21/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't include EmailHelpers manually, pick with rspec See merge request !13257 | ||||
| | * | | | | | Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helper | Lin Jen-Shin | 2017-08-03 | 5 | -21/+5 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now. | ||||
| * | | | | | fix #35133 strip new lines from ssh keys | haseeb | 2017-08-03 | 1 | -6/+8 |
| |/ / / / | |||||
| * | | | | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 71 | -356/+356 |
| | |/ / |/| | | |||||
| * | | | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup | Robert Speicher | 2017-08-01 | 25 | -36/+36 |
| |/ / | |||||
| * | | Merge branch '33620-remove-events-from-notification_settings' into 'master' | Douwe Maan | 2017-08-01 | 1 | -8/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Remove `events` from `notification_settings`" Closes #33620 See merge request !13152 | ||||
| | * | | Remove events column from notification settings33620-remove-events-from-notification_settings | Sean McGivern | 2017-07-31 | 1 | -8/+4 |
| | |/ | | | | | | | | | This was migrated to separate columns in 9.4, and now just needs to be removed for real. | ||||
| * | | Merge branch '28283-legacy-storage-format' into 'master' | Sean McGivern | 2017-08-01 | 8 | -28/+60 |
| |\ \ | | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149 | ||||
| | * | | Rename more path_with_namespace -> full_path or disk_path | Gabriel Mazetto | 2017-08-01 | 1 | -7/+11 |
| | | | | |||||
| | * | | Rename path_with_namespace -> disk_path when dealing with the filesystem | Gabriel Mazetto | 2017-08-01 | 3 | -10/+10 |
| | | | | |||||
| | * | | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 5 | -11/+39 |
| | |/ | |||||
| * | | Exclude keys linked to other projectsmk-fix-deploy-key-deletion | Michael Kozono | 2017-07-28 | 1 | -9/+33 |
| |/ | |||||
| * | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵ | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | fix merge miss | Shinya Maeda | 2017-07-28 | 1 | -0/+4 |
| | | |||||
| * | init | Shinya Maeda | 2017-07-28 | 3 | -4/+15 |
| | | |||||
| * | Merge branch '32483-jira-error' into 'master' | Sean McGivern | 2017-07-28 | 1 | -7/+24 |
| |\ | | | | | | | | | | | | | Display specific error message when JIRA test fails Closes #32483 See merge request !13100 | ||||
| | * | Display specific error message when JIRA test fails32483-jira-error | Jarka Kadlecova | 2017-07-27 | 1 | -7/+24 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |