summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP parallel DB migrationsparallel-db-migrationsYorick Peterse2018-07-182-0/+148
* Merge branch 'deploy_tokens_view_improvement' into 'master'Phil Hughes2018-07-182-8/+13
|\
| * Update _form.html.haml (deploy tokens) to improve display of scopesMarcel Amirault2018-07-182-8/+13
|/
* Merge branch '4525-fix-project-indexes' into 'master'Yorick Peterse2018-07-183-0/+29
|\
| * Improve projects indexes4525-fix-project-indexesValery Sizov2018-07-163-0/+29
* | Merge branch '_acet-fix-outdated-discussions' into 'master'Tim Zallmann2018-07-1815-20/+146
|\ \
| * | Fix showing outdated discussions on Changes tab_acet-fix-outdated-discussionsFatih Acet2018-07-1815-20/+146
* | | Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' into...Douwe Maan2018-07-183-1/+39
|\ \ \
| * | | Improves remote message when a developer is unable to push in an empty reposi...27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-183-1/+39
* | | | 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 endpointRubén Dávila2018-07-172-2/+18
* | | | | Merge branch 'gitaly-remove-worktree' into 'master'Sean McGivern2018-07-188-210/+38
|\ \ \ \ \
| * | | | | 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/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-moregfyoung2018-07-1799-3/+207
| | |_|/ / | |/| | |
* | | | | 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 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 docMarcel Amirault2018-07-181-1/+2
|/ / / / / /
* | | | | | Merge branch '45318-FE-junit-tests' into 'master'Phil Hughes2018-07-1813-0/+869
|\ \ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Fix broken breadcrumb in admin/userRobin Naundorf2018-07-178-0/+57
* | | | | | | | Merge branch 'features/show-project-id-on-home-panel' into 'master'Phil Hughes2018-07-184-34/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jivl-dev-master-...jivl-dev-master-into-com-masterJose2018-07-174-1/+36
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-173-1/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | * | | | | | | Fix symlink vulnerability in project importStan Hu2018-07-173-1/+14
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Update CHANGELOG.md for 10.7.7GitLab Release Tools Bot2018-07-171-0/+7
| * | | | | | | Update CHANGELOG.md for 10.8.6GitLab Release Tools Bot2018-07-171-0/+8
| * | | | | | | Update CHANGELOG.md for 11.0.4GitLab Release Tools Bot2018-07-171-0/+7
* | | | | | | | Merge branch '48804-redesign-gcp-banner' into 'master'Mike Greiling2018-07-175-48/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Redesign GCP banner"Taurie Davis2018-07-175-48/+28
|/ / / / / / / /
* | | | | | | | Merge branch '49257-metrics-drop-down-doesn-t-show-all-environment-some-not-c...Clement Ho2018-07-173-3/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | 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 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 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 apps/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-innergfyoung2018-07-16101-3/+208
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'update-specific-runners-help-url' into 'master'Clement Ho2018-07-173-11/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Update specific runners help URLGeorge Tsiolis2018-07-173-11/+14
|/ / / / / / / /
* | | | | | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into 'mas...Douwe Maan2018-07-1716-41/+258
|\ \ \ \ \ \ \ \
| * | | | | | | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-172-9/+13