summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expose internal repository create method for gitalycreate-repository-internalJacob Vosmaer2017-09-191-0/+4
|
* Merge branch '37999-fix-circuit-breaker' into 'master'Douwe Maan2017-09-193-1/+7
|\ | | | | | | | | | | | | Fix the filesystem shard health check to check all configured shards Closes #37999 See merge request gitlab-org/gitlab-ce!14341
| * Fix the filesystem shard health check to check all configured shardsNick Thomas2017-09-193-1/+7
| |
* | Merge branch ↵Rémy Coutable2017-09-194-26/+105
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'refine-docs-trigger-script-and-use-a-really-long-branch-name-to-test-it' into 'master' Refine docs trigger script and use a really long branch name to test it For branch names more than 63 characters we were hitting the filesystem limit and rsync created a truncated directory. This change truncates the branch name beforehand so the Review App URL is properly shown in the merge request widget. See merge request gitlab-org/gitlab-ce!14354
| * | Refine docs trigger script and use a really long branch name to test itAchilleas Pipinellis2017-09-194-26/+105
|/ /
* | Merge branch 'sh-stop-loading-issue-discussions' into 'master'Douwe Maan2017-09-192-3/+5
|\ \ | | | | | | | | | | | | | | | | | | Remove unnecessary loading of discussions in `IssuesController#show` Closes #38034 See merge request gitlab-org/gitlab-ce!14351
| * | Remove unnecessary loading of discussions in `IssuesController#show`sh-stop-loading-issue-discussionsStan Hu2017-09-192-3/+5
| |/ | | | | | | | | | | | | | | Discussions are now done asynchronously via the `IssuesController#discussions` endpoint, so this should no longer be needed. This was taking 32% of the load time for GitLab CE issue 1. Closes #38034
* | Merge branch 'dev_time_failure_on_haml_to_gitaly' into 'master'Rémy Coutable2017-09-1923-54/+400
|\ \ | | | | | | | | | | | | Detect n+1 issues involving Gitaly See merge request gitlab-org/gitlab-ce!13996
| * | Detect n+1 issues involving GitalyAndrew Newdigate2017-09-1923-54/+400
|/ /
* | Merge branch 'sh-project-feature-eager-load' into 'master'Yorick Peterse2017-09-192-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Eliminate N+1 queries referencing issues Closes #38033 See merge request gitlab-org/gitlab-ce!14349
| * | Eliminate N+1 queries referencing issuessh-project-feature-eager-loadStan Hu2017-09-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | To load issue 1, we see that in #38033 that about 835 ms of the SQL queries were due to loading ProjectFeature. We should be able to cut this down by eagerly loading this information. Closes #38033
* | | Merge branch 'backstage/gb/qa/fix-admin-area-selector' into 'master'Rémy Coutable2017-09-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix admin area selector in GitLab QA Closes gitlab-qa#66 See merge request gitlab-org/gitlab-ce!14356
| * | | Fix admin area selector in GitLab QAGrzegorz Bizon2017-09-191-1/+1
| | |/ | |/| | | | | | | Fixes gitlab-org/gitlab-qa#66
* | | Merge branch 'rc/improve-users-api-specs' into 'master'Grzegorz Bizon2017-09-193-32/+27
|\ \ \ | | | | | | | | | | | | | | | | Improve the Users API specs by asserting against the response schema See merge request gitlab-org/gitlab-ce!14334
| * | | Improve the Users API specs by asserting against the response schemarc/improve-users-api-specsRémy Coutable2017-09-183-32/+27
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-09-1916-104/+1831
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Port of EE translations Closes #37914 See merge request gitlab-org/gitlab-ce!14340
| * | | Add Dutch as an available language.Bob Van Landuyt2017-09-181-1/+2
| | | |
| * | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-09-1815-103/+1829
| | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!2929
* | | | Merge branch 'issue_32215' into 'master'Rémy Coutable2017-09-195-6/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow DEVELOPER role to admin milestones Closes #32215 See merge request gitlab-org/gitlab-ce!14257
| * | | | Allow DEVELOPER role to admin milestonesissue_32215Felipe Artur2017-09-185-6/+26
| | | | |
* | | | | Merge branch 'standardise-small-button-classnames' into 'master'Tim Zallmann2017-09-1911-14/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change all instances of btn-sm to btn-small to keep things consistent See merge request gitlab-org/gitlab-ce!14113
| * | | | | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-1911-14/+13
|/ / / / /
* | | | | Merge branch 'zj-update-project-settings' into 'master'Grzegorz Bizon2017-09-193-3/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291
| * | | | | Fix instance default option being true as valueZeger-Jan van de Weg2017-09-182-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user selected 'Instance default' as value for the auto devops settings, this was interpreted as a true value. Now we post an empty string in this case, meaning we want to set `NULL` in the database. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37893#note_40541294
| * | | | | Remove changelog entryZeger-Jan van de Weg2017-09-151-5/+0
| | | | | |
| * | | | | Allow updating of project auto devops settingsZeger-Jan van de Weg2017-09-153-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating didn't work, as the project_id was missing to be set for the project_auto_devops model. Fixes gitlab-org/gitlab-ce#37893
* | | | | | Merge branch '34259-project-denial-of-service-via-gitmodules-fix' into 'master'Robert Speicher2017-09-193-4/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes project denial of service via gitmodules using Extended ASCII. Closes #34259 See merge request gitlab-org/gitlab-ce!14301
| * | | | | | Fixes project denial of service via gitmodules using Extended ASCII.34259-project-denial-of-service-via-gitmodules-fixTiago Botelho2017-09-153-4/+19
| | | | | | |
* | | | | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-192-16/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo editor UI fixes part 2 Closes #37830, #36247, #37829, and #36244 See merge request gitlab-org/gitlab-ce!14261
| * | | | | | | RepoEditor: Add hover color for the close icon.repo-editor-ui-fixFatih Acet2017-09-141-0/+4
| | | | | | | |
| * | | | | | | RepoEditor: Fix height of the file list.Fatih Acet2017-09-141-1/+0
| | | | | | | |
| * | | | | | | RepoEditor: Fix target branch dropdown styling.Fatih Acet2017-09-141-12/+8
| | | | | | | |
| * | | | | | | RepoEditor: Improve tab spacing and styling.Fatih Acet2017-09-141-3/+2
| | | | | | | |
* | | | | | | | Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'Fatih Acet2017-09-1910-25/+157
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
| * | | | | | | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-1810-25/+157
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* | | | | | | Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-184-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
| * | | | | | | Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-134-3/+16
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259
* | | | | | | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-183-2/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
| * | | | | | | Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-iconEric Eastwood2017-09-133-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37465 Related MRs - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13821 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14042
* | | | | | | | Merge branch '35290_allow_public_project_apis' into 'master'Rémy Coutable2017-09-184-6/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #35290 Make read-only API for public merge requests available without authentication Closes #35290 See merge request gitlab-org/gitlab-ce!13291
| * | | | | | | | fix #35290 Make read-only API for public merge requests available without ↵haseeb2017-09-184-6/+40
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | authentication
* | | | | | | | Merge branch 'add_closed_at_attribute' into 'master'Rémy Coutable2017-09-185-2/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316
| * | | | | | | | Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-165-2/+26
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-optimize-discussion-json' into 'master'Yorick Peterse2017-09-184-3/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries in loading discussions.json endpoint Closes #37955 See merge request gitlab-org/gitlab-ce!14327
| * | | | | | | | | Eliminate N+1 queries in loading discussions.json endpointsh-optimize-discussion-jsonStan Hu2017-09-184-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #37955,we see that the profile had a number of N+1 queries from repeated access to `cross_reference_not_visible_for?`. This was optimized in previous versions of GitLab by rendering all notes at once, counting the number of visible references, and then using that number to check whether a system note should be fully redacted. There was also another N+1 query calling `ProjectTeam#member?`, which did not take advantage of an optimization in prepare_notes_for_rendering that would preload the maximum access level per project. Closes #37955
* | | | | | | | | | Merge branch '37590-pipelines-mr' into 'master'Annabel Dunstone Gray2017-09-182-0/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
| * | | | | | | | | | Fix mini graph pipeline breakin in merge request view37590-pipelines-mrFilipa Lacerda2017-09-152-0/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'winh-missing-javascript-imports' into 'master'Tim Zallmann2017-09-183-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing import statements See merge request gitlab-org/gitlab-ce!14209
| * | | | | | | | | | Add missing import statementswinh-missing-javascript-importswinh2017-09-183-0/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'milestone-avatar-issuable-link' into 'master'Tim Zallmann2017-09-183-1/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes milestone issuable assignee URL Closes #33124 See merge request gitlab-org/gitlab-ce!14292