summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-statsStan Hu2018-01-023-7/+12
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation iterated across the entire patch set to determine the number of lines added, deleted, and changed. Rugged has a native method `Rugged::Diff#stat` that does this already, which appears to be a little faster and require less RAM than doing this ourselves. Improves performance in #41524
* | | | | | | | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-037-43/+121
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate repo forking to Gitaly Closes gitaly#825 See merge request gitlab-org/gitlab-ce!16018
| * | | | | | | | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-027-43/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#825
* | | | | | | | | Merge branch 'sh-fix-seed-fu-ci' into 'master'Robert Speicher2018-01-033-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `rake db:seed_fu` not doing anything in CI Closes #41517 See merge request gitlab-org/gitlab-ce!16146
| * | | | | | | | | Fix `rake db:seed_fu` not doing anything in CIsh-fix-seed-fu-ciStan Hu2018-01-023-3/+5
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default behavior of seed_fu is to load the fixtures using the RAILS_ENV environment. In CI, since we set RAILS_ENV=test, nothing is ever loaded. Instead of `rake db:seed_fu`, use `rake gitlab:setup`, which sets up MySQL properly with limits. Closes #41517
* | | | | | | | | Merge branch '34534-switch-to-axios' into 'master'Filipa Lacerda2018-01-0340-386/+304
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch some bundles to use Axios Closes #41043 See merge request gitlab-org/gitlab-ce!15951
| * | | | | | | | | Add changelog for some vue-resource to Axios refactor34534-switch-to-axiosEric Eastwood2018-01-021-0/+5
| | | | | | | | | |
| * | | | | | | | | Switch boards to AxiosEric Eastwood2018-01-0215-148/+131
| | | | | | | | | |
| * | | | | | | | | Switch blob/notebook to AxiosEric Eastwood2018-01-022-39/+23
| | | | | | | | | |
| * | | | | | | | | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-0215-99/+75
| | | | | | | | | |
| * | | | | | | | | Switch issue_show to AxiosEric Eastwood2018-01-025-99/+67
| | | | | | | | | |
| * | | | | | | | | Fix mergeUrlParams encoding query parametersEric Eastwood2018-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: /-/boards/1/issues.json?page=1&per=50&scope=all&utf8=✓&state=opened&milestone_title=#upcoming After: /-/boards/1/issues.json?page=1&per=50&scope=all&utf8=%E2%9C%93&state=opened&milestone_title=%23upcoming
| * | | | | | | | | Add `X-Requested-With: XMLHttpRequest` header so Rails can recognize XHREric Eastwood2018-01-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3732
* | | | | | | | | | Merge branch 'jramsay-4012-i18n-compare' into 'master'Douwe Maan2018-01-034-26/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add i18n helpers to branch comparison view See merge request gitlab-org/gitlab-ce!16031
| * | | | | | | | | | Replace use of capture_haml with captureJames Ramsay2018-01-032-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Add changelog entryjramsay-4012-i18n-compareJames Ramsay2018-01-031-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Fix incorrect case of ruby varsJames Ramsay2018-01-031-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Remove superfluous i18n namespacesJames Ramsay2018-01-033-7/+7
| | | | | | | | | | |
| * | | | | | | | | | Add i18n helpers to branch comparison viewJames Ramsay2018-01-023-26/+23
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-036-7/+34
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| * | | | | | | | | refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-importJames Lopez2018-01-032-3/+3
| | | | | | | | | |
| * | | | | | | | | add note to import sourcesJames Lopez2018-01-031-0/+1
| | | | | | | | | |
| * | | | | | | | | refactor code to use new import typeJames Lopez2018-01-034-7/+9
| | | | | | | | | |
| * | | | | | | | | fix missing create services callJames Lopez2018-01-022-3/+1
| | | | | | | | | |
| * | | | | | | | | fix branch complexityJames Lopez2018-01-021-5/+11
| | | | | | | | | |
| * | | | | | | | | fix wiki checkJames Lopez2018-01-022-0/+3
| | | | | | | | | |
| * | | | | | | | | add extra spec checkJames Lopez2018-01-021-1/+2
| | | | | | | | | |
| * | | | | | | | | Update 41424-gitlab-rake-gitlab-import-repos-schedules-an-import.ymlJames Lopez2018-01-021-1/+1
| | | | | | | | | |
| * | | | | | | | | add changelogJames Lopez2018-01-021-0/+5
| | | | | | | | | |
| * | | | | | | | | Fix import scheduled on bare repo importJames Lopez2018-01-023-1/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-encoding-method-lookup' into 'master'Grzegorz Bizon2018-01-031-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix method lookup See merge request gitlab-org/gitlab-ce!16191
| * | | | | | | | | | Fix method lookupfix-encoding-method-lookupJacob Vosmaer2018-01-031-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'tz-ide-file-icons' into 'master'Sean McGivern2018-01-0310-31/+804
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi File Editor File icons See merge request gitlab-org/gitlab-ce!16100
| * | | | | | | | | | Multi File Editor File iconsTim Zallmann2018-01-0310-31/+804
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '41120-performance-bar-auto-scroll' into 'master'Tim Zallmann2018-01-031-10/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Performance bar prevent the auto-scroll-to-bottom when visiting a job's page" Closes #41120 See merge request gitlab-org/gitlab-ce!16084
| * | | | | | | | | | Cache document query41120-performance-bar-auto-scrollFilipa Lacerda2018-01-021-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 41120-performance-bar-auto-scrollFilipa Lacerda2018-01-02960-7707/+9056
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (120 commits) Update CHANGELOG.md for 10.3.3 Fix user membership destroy relation Use heredoc so it's more clear Put all menus under menu module Introduce common project settings and just put Introduce Factory::Resource::DeployKey Introduce expand_deploy_keys Introduce Menu::Side Add documents for GitLab utilities Clears visual token on second backspace Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs. Add breadcrumbs to User Settings sub-views Rename asset sync related AWS variables Allow logged in user to change his password Fix 404 error after a user edits an issue description and solves the reCAPTCHA Fix links to old commits in merge requests Typos correction on the advise of @smcgivern Documenting that resolved JIRA tickets are not automatically transitioned Forking a project to a namespace with lower visibility. Keep typographic hierarchy in User Settings ...
| * | | | | | | | | | Use non cached variables to get scroll position because of the performance barFilipa Lacerda2017-12-211-10/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'align-chart-docs' into 'master'Marin Jankovski2018-01-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align chart docs with readme See merge request gitlab-org/gitlab-ce!16185
| * | | | | | | | | | | Align chart docs with readmealign-chart-docsJoshua Lambert2018-01-031-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jprovazn-search-issues' into 'master'Sean McGivern2018-01-033-8/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip projects filter on issues search See merge request gitlab-org/gitlab-ce!16117
| * | | | | | | | | | | | Skip projects filter on issues searchjprovazn-search-issuesJan Provaznik2018-01-023-8/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for issues, an additional subquery is added which filters only issues in a project. If global context is used (no project is specified) this query filters all projects user has access to. In that case we can skip this filter because filtering only projects user has access to is added anyway. The filter is used only if a custom project context is specified Related to #40540
* | | | | | | | | | | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-0311-49/+300
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
| * | | | | | | | | | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-026-52/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
| * | | | | | | | | | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-274-35/+116
| | | | | | | | | | | | |
| * | | | | | | | | | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-278-23/+177
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '41357-empty-state-mr' into 'master'Annabel Dunstone Gray2018-01-032-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Modify the empty state of changes in MR" Closes #41357 See merge request gitlab-org/gitlab-ce!16072
| * | | | | | | | | | | | | Resolve "Modify the empty state of changes in MR"Filipa Lacerda2018-01-032-9/+11
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix/remove-unnecessary-sidebar-element-alignment' into 'master'Annabel Dunstone Gray2018-01-032-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary sidebar element realignment See merge request gitlab-org/gitlab-ce!16159
| * | | | | | | | | | | | | Remove unnecessary sidebar element realignmentGeorge Tsiolis2018-01-022-4/+5
| |/ / / / / / / / / / / /
View Lorry Controller Status