Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-long | Alejandro Rodríguez | 2018-02-01 | 1 | -4/+42 |
| | | | | This was affecting the performance of `Gitlab::Git::Repository#squash`. | ||||
* | Merge branch 'gitaly-970-repo-write-config' into 'master' | Robert Speicher | 2018-02-01 | 1 | -0/+38 |
|\ | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#write_config to Gitaly Closes gitaly#970 See merge request gitlab-org/gitlab-ce!16730 | ||||
| * | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-config | Kim "BKC" Carlbäcker | 2018-01-31 | 1 | -0/+38 |
| | | | | | | | | - Add tests for Repository#write_config | ||||
* | | Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master' | Rémy Coutable | 2018-02-01 | 2 | -0/+61 |
|\ \ | | | | | | | | | | | | | | | | | | | Hide pipeline schedule 'take ownership' for current owner Closes #35285 See merge request gitlab-org/gitlab-ce!12986 | ||||
| * | | Hide pipeline schedule 'take ownership' for current owner | Mark Fletcher | 2018-02-01 | 2 | -0/+61 |
| | | | |||||
* | | | Merge branch 'ph-axios-3' into 'master' | Filipa Lacerda | 2018-02-01 | 2 | -41/+113 |
|\ \ \ | | | | | | | | | | | | | | | | | More conversions to axios See merge request gitlab-org/gitlab-ce!16848 | ||||
| * | | | fixed infinite loop crashing testsph-axios-3 | Phil Hughes | 2018-02-01 | 1 | -8/+13 |
| | | | | |||||
| * | | | Converted pager.js to axios | Phil Hughes | 2018-02-01 | 1 | -15/+61 |
| | | | | |||||
| * | | | Converted mini_pipeline_graph_dropdown.js to axios | Phil Hughes | 2018-02-01 | 1 | -26/+47 |
| | | | | |||||
* | | | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into ↵ | Filipa Lacerda | 2018-02-01 | 1 | -0/+104 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Realtime update of pipeline status in Files view Closes #35779 See merge request gitlab-org/gitlab-ce!16523 | ||||
| * | | | | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-view | Jose Ivan Vargas | 2018-02-01 | 1 | -27/+58 |
| | | | | | |||||
| * | | | | Added realtime prop and corrected specs | Jose Ivan Vargas | 2018-01-30 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Added pipeline status to the files view | Jose Ivan Vargas | 2018-01-30 | 1 | -0/+68 |
| | | | | | |||||
* | | | | | Merge branch '36009-user-default-project-creator-in-factories' into 'master' | Robert Speicher | 2018-02-01 | 24 | -33/+46 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Make user/author use project.creator in most factories Closes #36009 See merge request gitlab-org/gitlab-ce!13321 | ||||
| * | | | | Fix a JSON schema that doesn't include enough fields | Rémy Coutable | 2018-01-31 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Make user/author use project.creator in most factories | Rémy Coutable | 2018-01-31 | 23 | -33/+42 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch '30106-group-issues' into 'master' | Sean McGivern | 2018-02-01 | 4 | -49/+181 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | View all issues of all subgroups on the group issue page Closes #30106 and #39388 See merge request gitlab-org/gitlab-ce!16706 | ||||
| * | | | | Include subgroup issuables on the group page30106-group-issues | Jarka Kadlecová | 2018-02-01 | 4 | -49/+181 |
| | | | | | |||||
* | | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master' | Rémy Coutable | 2018-02-01 | 25 | -45/+45 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752 | ||||
| * | | | | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 25 | -45/+45 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'repository-log-disable-walk' into 'master' | Douwe Maan | 2018-01-31 | 1 | -38/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Remove Rugged::Walk implementation of #log See merge request gitlab-org/gitlab-ce!16798 | ||||
| * | | | | Remove Rugged::Walk implementation of #logrepository-log-disable-walk | Jacob Vosmaer | 2018-01-31 | 1 | -38/+0 |
| | | | | | |||||
* | | | | | Merge branch 'fl-mr-widget' into 'master' | Phil Hughes | 2018-01-31 | 1 | -83/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move mr widget related links into a vue file See merge request gitlab-org/gitlab-ce!16825 | ||||
| * | | | | | Move mr widget related links into a vue file | Filipa Lacerda | 2018-01-30 | 1 | -83/+48 |
| | | | | | | |||||
* | | | | | | Use axios instead of jquery ajax for setCiStatusFavicon | Clement Ho | 2018-01-31 | 2 | -28/+32 |
| | | | | | | |||||
* | | | | | | Merge branch 'rugged-reference-cache-rescue' into 'master' | Sean McGivern | 2018-01-31 | 2 | -17/+11 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770 | ||||
| * | | | | | Remove Rugged exception in cache rescuerugged-reference-cache-rescue | Jacob Vosmaer | 2018-01-30 | 2 | -17/+11 |
| | | | | | | |||||
* | | | | | | Merge branch 'sh-fix-project-members-api-perf' into 'master' | Rémy Coutable | 2018-01-31 | 1 | -0/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints See merge request gitlab-org/gitlab-ce!16751 | ||||
| * | | | | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API ↵sh-fix-project-members-api-perf | Stan Hu | 2018-01-30 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoints We can simplify the code quite a bit and improve performance by using grape-entity merge fields: https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields Relates to #42030 | ||||
* | | | | | | | Merge branch 'zj-gitaly-server-info' into 'master' | Sean McGivern | 2018-01-31 | 2 | -0/+45 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794 | ||||
| * | | | | | | | Gitaly Server info for admin panel | Zeger-Jan van de Weg | 2018-01-31 | 2 | -0/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything. | ||||
* | | | | | | | | Merge branch 'sh-fix-events-collection' into 'master' | Rémy Coutable | 2018-01-31 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix not all events being shown in group dashboard Closes #42560 See merge request gitlab-org/gitlab-ce!16819 | ||||
| * | | | | | | | Fix not all events being shown in group dashboardsh-fix-events-collection | Stan Hu | 2018-01-30 | 1 | -0/+24 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The group activity feed was limited to the first 20 projects found in the group, which caused activity from some projects to be omitted. A limit of 20 is applied to the query for events, so the extra pagination does little in the way of performance. Closes #42560 | ||||
* | | | | | | | Merge branch '4635-unify-jobs-and-builds-sepc' into 'master' | Rémy Coutable | 2018-01-31 | 2 | -52/+73 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify and split CE/EE for spec/requests/api/jobs_spec.rb See merge request gitlab-org/gitlab-ce!16804 | ||||
| * | | | | | | | Make those files as close as EE to reduce conflicts4635-unify-jobs-and-builds-sepc | Lin Jen-Shin | 2018-01-31 | 2 | -52/+73 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'ph-ajax-to-axios' into 'master' | Filipa Lacerda | 2018-01-31 | 9 | -166/+142 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Converted $.ajax calls in some JS files to axios See merge request gitlab-org/gitlab-ce!16717 | ||||
| * | | | | | | | fixed failing specsph-ajax-to-axios | Phil Hughes | 2018-01-30 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | fixed more unhandled promise rejections | Phil Hughes | 2018-01-30 | 2 | -5/+13 |
| | | | | | | | | |||||
| * | | | | | | | fixed unhandled promise rejection | Phil Hughes | 2018-01-30 | 1 | -2/+4 |
| | | | | | | | | |||||
| * | | | | | | | changed commits.js to axios | Phil Hughes | 2018-01-30 | 1 | -12/+31 |
| | | | | | | | | |||||
| * | | | | | | | converted blob viewer to axios | Phil Hughes | 2018-01-30 | 1 | -19/+17 |
| | | | | | | | | |||||
| * | | | | | | | spec fixes after API axios change | Phil Hughes | 2018-01-30 | 3 | -11/+19 |
| | | | | | | | | |||||
| * | | | | | | | Converted API.js to axios | Phil Hughes | 2018-01-30 | 1 | -115/+56 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master' | Robert Speicher | 2018-01-30 | 2 | -21/+25 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#delete_refs to Gitaly Closes gitaly#967 See merge request gitlab-org/gitlab-ce!16723 | ||||
| * | | | | | | | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitaly | Ahmad Sherif | 2018-01-30 | 2 | -21/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#967 | ||||
* | | | | | | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master' | Grzegorz Bizon | 2018-01-30 | 7 | -49/+167 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the cardinality of GitLab metrics Closes #41771 See merge request gitlab-org/gitlab-ce!16443 | ||||
| * | | | | | | | | Rename Concern -> Methods41771-reduce-cardinality-of-metrics | Pawel Chojnacki | 2018-01-29 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | use public_send where appropriate | Pawel Chojnacki | 2018-01-29 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | before -> after | Pawel Chojnacki | 2018-01-29 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | use define_method to define devine_metric_method. (couldn't resist) | Pawel Chojnacki | 2018-01-29 | 1 | -15/+12 |
| | | | | | | | | |