summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-1818-333/+66
|
* Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' ↵Douwe Maan2018-07-183-1/+39
|\ | | | | | | | | | | | | | | | | into 'master' Improve feedback when a developer cannot push in an empty repository Closes #27456 See merge request gitlab-org/gitlab-ce!20519
| * Improves remote message when a developer is unable to push in an empty ↵27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-183-1/+39
| | | | | | | | repository
* | Merge branch 'rd-48920-backend-support-for-clarifying-search-bar' into 'master'Douwe Maan2018-07-182-2/+18
|\ \ | | | | | | | | | | | | | | | | | | Add avatar_url attr to the response of the autocomplete endpoint Closes #48920 See merge request gitlab-org/gitlab-ce!20661
| * | Add avatar_url attr to the response of the autocomplete endpointRubén Dávila2018-07-172-2/+18
| | |
* | | Merge branch 'gitaly-remove-worktree' into 'master'Sean McGivern2018-07-188-210/+38
|\ \ \ | | | | | | | | | | | | | | | | Remove unreachable Git code See merge request gitlab-org/gitlab-ce!20670
| * | | Remove unreachable Git codeJacob Vosmaer (GitLab)2018-07-188-210/+38
|/ / /
* | | Merge branch 'frozen-string-enable-apps-services-inner-more' into 'master'Rémy Coutable2018-07-1899-3/+207
|\ \ \ | | | | | | | | | | | | | | | | Enable more frozen string in app/services/**/*.rb See merge request gitlab-org/gitlab-ce!20677
| * | | Enable more frozen string in app/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-moregfyoung2018-07-1799-3/+207
| | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | Merge branch 'osw-fallback-to-collection-when-no-diff-refs' into 'master'Sean McGivern2018-07-184-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render MR page when no persisted diff_refs or diffs size Closes #49342 See merge request gitlab-org/gitlab-ce!20680
| * | | | Render MR page when no persisted diff_refs or diffs sizeOswaldo Ferreira2018-07-184-1/+31
| | | | |
* | | | | Merge branch 'Docs-Repo-Size' into 'master'Tomasz Maczukin2018-07-181-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update index.md to add link to reducing repo size doc See merge request gitlab-org/gitlab-ce!20281
| * | | | | Update index.md to add link to reducing repo size docMarcel Amirault2018-07-181-1/+2
|/ / / / /
* | | | | Merge branch '45318-FE-junit-tests' into 'master'Phil Hughes2018-07-1813-0/+869
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backports security reusable components into CE to use in JUnit report See merge request gitlab-org/gitlab-ce!20613
| * | | | | Removes commented code45318-FE-junit-testsFilipa Lacerda2018-07-171-17/+0
| | | | | |
| * | | | | Regenerate i18n filesFilipa Lacerda2018-07-161-0/+3
| | | | | |
| * | | | | [ci skip] Merge branch 'master' into 45318-FE-junit-testsFilipa Lacerda2018-07-16146-1726/+1754
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (49 commits) Add changelog entry Fix `transform` typo Fix archived parameter for projects API Enable frozen string in apps/uploaders/*.rb Fix invalid link to GitLab.com architecture.md i18n: externalize strings from 'app/views/import' Remove Repository#lookup and unreachable rugged code refactor code based on feedback Trigger rails5 tests either by variable or ref name Fix link in help doc which was linking to old mono-repo, now in its own repo SubmoduleHelper - Project is not always available as an instance variable Allow Danger step to fail update webpack to v4.16 Backport logger changes from EE Add the CI Job trigger as the build trigger Remove flaky and redundant expectations use fileuploader dynamic path method in uploads manager and add spec fix typo in uploads manager add small comment to download method in uploads manager refactor uploads manager ...
| * | | | | Backports security reports reusable components into CE code baseFilipa Lacerda2018-07-1312-0/+883
| | | | | |
* | | | | | Merge branch '47419-Fix-breadcrumbs' into 'master'Phil Hughes2018-07-188-0/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "broken breadcrumb in admin/user when switching tabs" Closes #47419 See merge request gitlab-org/gitlab-ce!19608
| * | | | | | Fix broken breadcrumb in admin/userRobin Naundorf2018-07-178-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix broken breadcrumb when switching tabs in admin/user Closes #47419
* | | | | | | Merge branch 'features/show-project-id-on-home-panel' into 'master'Phil Hughes2018-07-184-34/+98
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features/show project id on home panel Closes #46342 See merge request gitlab-org/gitlab-ce!20305
| * | | | | | | Features/show project id on home panelTuğçe Nur Taş2018-07-184-34/+98
|/ / / / / / /
* | | | | | | Merge branch 'jivl-dev-master-into-com-master' into 'master'Felipe Artur2018-07-174-1/+36
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge dev master to CE .com master as part of the security release process Closes #49133 See merge request gitlab-org/gitlab-ce!20681
| * | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jivl-dev-master-into-com-masterJose2018-07-174-1/+36
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | jivl-dev-master-into-com-master
| * | | | | | Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-173-1/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix symlink vulnerability in project import See merge request gitlab/gitlabhq!2440
| | * | | | | | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | | | | | | |
| | * | | | | | Fix symlink vulnerability in project importStan Hu2018-07-173-1/+14
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
| * | | | | | Update CHANGELOG.md for 10.7.7GitLab Release Tools Bot2018-07-171-0/+7
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 10.8.6GitLab Release Tools Bot2018-07-171-0/+8
| | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CHANGELOG.md for 11.0.4GitLab Release Tools Bot2018-07-171-0/+7
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch '48804-redesign-gcp-banner' into 'master'Mike Greiling2018-07-175-48/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Redesign GCP banner" Closes #48804 See merge request gitlab-org/gitlab-ce!20542
| * | | | | | | Resolve "Redesign GCP banner"Taurie Davis2018-07-175-48/+28
|/ / / / / / /
* | | | | | | Merge branch ↵Clement Ho2018-07-173-3/+30
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49257-metrics-drop-down-doesn-t-show-all-environment-some-not-clickable' into 'master' Resolve "Metrics drop down doesn't show all environment, some not clickable" Closes #49257 See merge request gitlab-org/gitlab-ce!20651
| * | | | | | Resolve "Metrics drop down doesn't show all environment, some not clickable"Jose Ivan Vargas2018-07-173-3/+30
|/ / / / / /
* | | | | | Merge branch 'fix-web-ide-header-button-background' into 'master'Filipa Lacerda2018-07-171-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ide-tree-header button background See merge request gitlab-org/gitlab-ce!20662
| * | | | | | Fix ide-tree-header button backgroundPaul Slaughter2018-07-171-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'extract-ee-specific-banzai-filters' into 'master'Robert Speicher2018-07-173-10/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract EE-specific lines from Banzai pipelines See merge request gitlab-org/gitlab-ce!20636
| * | | | | | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filtersSean McGivern2018-07-133-10/+28
| | | | | | |
* | | | | | | Merge branch 'frozen-string-enable-apps-services-inner' into 'master'Rémy Coutable2018-07-17101-3/+208
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in app/services/**/*.rb See merge request gitlab-org/gitlab-ce!20656
| * | | | | | | Enable frozen string in apps/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-innergfyoung2018-07-16101-3/+208
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For directories application_settings --> labels. Partially addresses #47424.
* | | | | | | Merge branch 'update-specific-runners-help-url' into 'master'Clement Ho2018-07-173-11/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update specific runners help URL See merge request gitlab-org/gitlab-ce!20213
| * | | | | | | Update specific runners help URLGeorge Tsiolis2018-07-173-11/+14
|/ / / / / / /
* | | | | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵Douwe Maan2018-07-1716-41/+258
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109
| * | | | | | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-172-9/+13
| | | | | | | |
| * | | | | | | Simplify WikiPage#hook_attrs specSean McGivern2018-07-171-6/+4
| | | | | | | |
| * | | | | | | Clarify web hook image rewriting doc exampleSean McGivern2018-07-171-2/+2
| | | | | | | |
| * | | | | | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-061929-33482/+64436
| |\ \ \ \ \ \ \
| * | | | | | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-067-32/+139
| | | | | | | | |
| * | | | | | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-2010-45/+95
| | | | | | | | |