| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory ↵refactor-clusters | Shinya Maeda | 2017-11-06 | 1 | -81/+0 |
| | | | | | name. Use ArgumentError | ||||
| * | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 1 | -0/+5 |
| |\ | |||||
| | * | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttons | Filipa Lacerda | 2017-11-06 | 1 | -0/+5 |
| | |\ | | | | | | | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981 | ||||
| | | * | Improve discussion_line_code set and update notes_controller_spec | Luke "Jared" Bennett | 2017-10-21 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 2 | -0/+63 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'issue_39176' into 'master' | Douwe Maan | 2017-11-03 | 1 | -0/+13 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Render 404 when polling commit notes without having permissions Closes #39176 See merge request gitlab-org/gitlab-ce!15140 | ||||
| | | * | | Render 404 when polling commit notes without having permissionsissue_39176 | Felipe Artur | 2017-11-03 | 1 | -0/+13 |
| | | | | | |||||
| | * | | | Merge branch 'bvl-unlink-fixes' into 'master' | Douwe Maan | 2017-11-03 | 1 | -0/+50 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some bugs related to forked projects of which the source was deleted. Closes #39667 See merge request gitlab-org/gitlab-ce!15150 | ||||
| | | * | | | Find the LFS-objects for a fork within a the fork network | Bob Van Landuyt | 2017-11-03 | 1 | -0/+50 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 4 | -96/+96 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master' | Stan Hu | 2017-11-02 | 1 | -11/+0 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove Filesystem check metrics that use too much CPU to handle requests See merge request gitlab-org/gitlab-ce!15158 | ||||
| | | * | | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730 | Pawel Chojnacki | 2017-11-02 | 1 | -11/+0 |
| | | |/ / / | |||||
| | * | | | | Merge branch 'dm-remove-private-token' into 'master' | Sean McGivern | 2017-11-02 | 1 | -58/+28 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Private Tokens Closes #38595 and #38447 See merge request gitlab-org/gitlab-ce!14838 | ||||
| | | * | | | | Remove authentication using user.private_token | Douwe Maan | 2017-11-02 | 1 | -58/+28 |
| | | |/ / / | |||||
| | * | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 2 | -27/+68 |
| | |/ / / | |||||
| * | | | | Fix some tests | Shinya Maeda | 2017-11-03 | 1 | -74/+79 |
| | | | | | |||||
| * | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 78 | -454/+505 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Load participants async | Eric Eastwood | 2017-10-31 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Allow promoting project milestones to group milestones | Felipe Artur | 2017-10-31 | 1 | -0/+28 |
| | |/ / | |||||
| | * | | Merge branch 'zj-commit-cache' into 'master' | Sean McGivern | 2017-10-27 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863 | ||||
| | | * | | Cache commits on the repository model | Zeger-Jan van de Weg | 2017-10-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, when requesting a commit from the Repository model, the results are not cached. This means we're fetching the same commit by oid multiple times during the same request. To prevent us from doing this, we now cache results. Caching is done only based on object id (aka SHA). Given we cache on the Repository model, results are scoped to the associated project, eventhough the change of two repositories having the same oids for different commits is small. | ||||
| | * | | | Revert "Merge branch '36670-remove-edit-form' into 'master'"39441-bring-edit-form-back | Sean McGivern | 2017-10-26 | 1 | -0/+23 |
| | |/ / | | | | | | | | | | | | | This reverts commit 915e35a2992a4e51db2ac32aac8d7a29b1f4449e, reversing changes made to 9533786f522e358f372d8a0ec4b4990ae9d88f37. | ||||
| | * | | Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' ↵ | Rémy Coutable | 2017-10-23 | 78 | -453/+453 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Refactor `have_http_status` into `have_gitlab_http_status` in the specs Closes #35644 See merge request gitlab-org/gitlab-ce!14958 | ||||
| | | * | | Refactor `have_http_status` into `have_gitlab_http_status` in the specs | Jacopo | 2017-10-20 | 78 | -453/+453 |
| | | |/ | |||||
| * | | | specs for feature | Shinya Maeda | 2017-11-01 | 1 | -1/+6 |
| | | | | |||||
| * | | | specs for controller. Improved validation | Shinya Maeda | 2017-10-31 | 1 | -166/+377 |
| |/ / | |||||
| * | | Merge branch 'bvl-fix-group-atom-feed' into 'master' | Douwe Maan | 2017-10-22 | 1 | -0/+25 |
| |\ \ | | | | | | | | | | | | | | | | | | | Make sure we render events for projects within a group Closes #39305 See merge request gitlab-org/gitlab-ce!14974 | ||||
| | * | | Make sure we render events for projects within a group | Bob Van Landuyt | 2017-10-20 | 1 | -0/+25 |
| | |/ | |||||
| * | | URI decode Page-Title header to preserve UTF-8 characters | Toon Claes | 2017-10-20 | 1 | -0/+14 |
| |/ | |||||
| * | Merge branch 'not-found-in-commits' into 'master' | Douwe Maan | 2017-10-19 | 1 | -2/+29 |
| |\ | | | | | | | | | | | | | Renders 404 in commits controller if no commits are found Closes #37620 See merge request gitlab-org/gitlab-ce!14610 | ||||
| | * | Renders 404 in commits controller if no commits are found | Guilherme Vieira | 2017-10-18 | 1 | -2/+29 |
| | | | |||||
| * | | Merge branch 'sh-security-fix-backports-master' into 'master' | Robert Speicher | 2017-10-18 | 2 | -34/+67 |
| |\ \ | | | | | | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922 | ||||
| | * \ | Merge branch 'master' into sh-security-fix-backports-master | Stan Hu | 2017-10-17 | 6 | -83/+478 |
| | |\ \ | |||||
| | * | | | Merge branch 'security-10-1' into '10-1-stable' | Jen-Shin Lin | 2017-10-17 | 2 | -34/+67 |
| | | | | | | | | | | | | | | | | | | | | | Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209 | ||||
| * | | | | Merge branch '30140-restore-readme-only-preference' into 'master' | Douwe Maan | 2017-10-18 | 1 | -0/+8 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900 | ||||
| | * | | | Add readme only option as project view | Annabel Dunstone Gray | 2017-10-16 | 1 | -0/+8 |
| | |/ / | |||||
| * | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master' | Douwe Maan | 2017-10-17 | 1 | -11/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | | Allow testing on Gitaly call count See merge request gitlab-org/gitlab-ce!14837 | ||||
| | * | | | Allow testing on Gitaly call count | Zeger-Jan van de Weg | 2017-10-16 | 1 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | Previous efforts were aimed at detecting N + 1 queries, general regressions are hard to find and mitigate. | ||||
| * | | | | Merge branch 'bvl-group-trees' into 'master' | Douwe Maan | 2017-10-17 | 5 | -72/+457 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055 | ||||
| | * | | | Make sure we always return an array of hierarchies | Bob Van Landuyt | 2017-10-13 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | Even when we pass an array of only a single object | ||||
| | * | | | Nest the group_children_path inside the canonical group path | Bob Van Landuyt | 2017-10-12 | 2 | -270/+277 |
| | | | | | |||||
| | * | | | Fix spinach features | Bob Van Landuyt | 2017-10-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | And several other failures | ||||
| | * | | | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 14 | -60/+640 |
| | |\ \ \ | | |/ / | |||||
| | * | | | Don't load unneeded elements in GroupsController#show | Bob Van Landuyt | 2017-10-10 | 1 | -45/+44 |
| | | | | | |||||
| | * | | | Only expand ancestors when searching | Bob Van Landuyt | 2017-10-09 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | Not all_groups, since that would expose groups the user does not have access to | ||||
| | * | | | Make sure all ancestors are loaded when searching groups | Bob Van Landuyt | 2017-10-05 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Return an empty array when no matches are found | Bob Van Landuyt | 2017-10-04 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | Fix bug with project pagination | Bob Van Landuyt | 2017-10-04 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | When projects were listed after groups, the projects that would also have been listed on the last page containing groups would be repeated. | ||||
| | * | | | Only preload ancestors for search results in the specified parent | Bob Van Landuyt | 2017-10-04 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering we want all to preload all the ancestors upto the specified parent group. - root - subgroup - nested-group - project So when searching 'project', on the 'subgroup' page we want to preload 'nested-group' but not 'subgroup' or 'root' | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |