summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prepare for GitLab UI area chart changes55910-enable-new-echarts-metrics-dashboard-by-defaultAdriel Santiago2019-01-162-15/+33
* Merge branch 'add-security-release-template' into 'master'Robert Speicher2019-01-161-0/+69
|\
| * use 11.4, 11.3, and 11.2 throughout templateJames Ritchey2019-01-151-1/+1
| * add initial security release templateadd-security-release-templateJames Ritchey2018-10-301-0/+69
* | Merge branch '56309-read-only-controller-doesn-t-account-for-relative-paths-f...Stan Hu2019-01-162-12/+40
|\ \
| * | Bang up predicate methods and use #internal_route?Ash McKenzie2019-01-161-3/+7
| * | Allow sidekiq admin requests, regardless of rootAsh McKenzie2019-01-162-10/+34
* | | Merge branch '44488-open-editor-when-creating-a-new-changelog-entry' into 'ma...Robert Speicher2019-01-161-1/+9
|\ \ \
| * | | Opens specified text editor when creating a new changelog entryTiago Botelho2019-01-141-1/+9
* | | | Merge branch 'use-global-recaptcha-source' into 'master'Stan Hu2019-01-161-1/+1
|\ \ \ \
| * | | | Use globally-available reCAPTCHA sourceDaniel Stone2019-01-151-1/+1
* | | | | Merge branch 'fix-rubocop-ee-module-injection-detection' into 'master'Rémy Coutable2019-01-162-3/+42
|\ \ \ \ \
| * | | | | Fix detecting nested EE constants in RuboCopYorick Peterse2019-01-162-3/+42
* | | | | | Merge branch 'docs-rename-feature-proposal' into 'master'Rémy Coutable2019-01-162-9/+9
|\ \ \ \ \ \
| * | | | | | Adopt label renaming from ~"feature proposal" toLin Jen-Shin2019-01-152-9/+9
* | | | | | | Merge branch 'master' into 'master'Rémy Coutable2019-01-1612-31/+246
|\ \ \ \ \ \ \
| * | | | | | | Add test case to check that branches are correctly listed after CRUD operationsWalmyr2019-01-1612-31/+246
|/ / / / / / /
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-01-166-5/+79
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'security-2770-verify-bundle-import-files' into 'master'Yorick Peterse2019-01-166-5/+79
| |\ \ \ \ \ \ \
| | * | | | | | | Validate bundle files before unpacking themNick Thomas2019-01-106-5/+79
* | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2019-01-161-0/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Update CHANGELOG.md for 11.6.4GitLab Release Tools Bot2019-01-151-0/+7
* | | | | | | | | Merge branch 'refactor-checking-personal-project-limits' into 'master'Nick Thomas2019-01-163-12/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor checking personal project limitsYorick Peterse2019-01-163-12/+96
* | | | | | | | | | Merge branch 'bvl-dont-use-factories-in-bg-migration-specs-ce' into 'master'Rémy Coutable2019-01-1611-4/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ignore existing offenses of FactoriesInMigrationBob Van Landuyt2019-01-1610-1/+19
| * | | | | | | | | | Prevent factories in background migration specsBob Van Landuyt2019-01-161-3/+8
* | | | | | | | | | | Merge branch 'refactor-after-create-default-branch' into 'master'Nick Thomas2019-01-165-18/+406
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor code for protecting default branchesYorick Peterse2019-01-165-18/+406
* | | | | | | | | | | | Merge branch 'gt-update-changelog' into 'master'Lin Jen-Shin2019-01-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update changelog entryGeorge Tsiolis2019-01-161-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'add-badge-count-to-projects-and-groups' into 'master'Lin Jen-Shin2019-01-165-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add tests to check projects badge countGeorge Tsiolis2019-01-151-0/+3
| * | | | | | | | | | | | Remove badge count for groupsGeorge Tsiolis2019-01-151-1/+0
| * | | | | | | | | | | | Move ProjectsFinder into the controllerGeorge Tsiolis2019-01-153-2/+8
| * | | | | | | | | | | | Update badge-pill classGeorge Tsiolis2019-01-152-3/+3
| * | | | | | | | | | | | Add badge count to projects and groupsGeorge Tsiolis2019-01-153-0/+8
* | | | | | | | | | | | | Merge branch 'an-gilab-process-name' into 'master'Kamil Trzciński2019-01-164-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extract process_name from GitLab::SentryAndrew Newdigate2019-01-164-9/+14
* | | | | | | | | | | | | | Merge branch 'features/document-graphicsmagick-source-installation' into 'mas...Douwe Maan2019-01-162-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | doc graphicsmagick installation for source installAlexis Reigel2019-01-152-0/+12
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '52275-fix-master-to-be-hyperlink' into 'master'Douwe Maan2019-01-167-30/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Resolve "In Merge Request diff screen, master is not a hyperlink"Natalia Tepluhina2019-01-167-30/+92
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ac-pages-subgroups' into 'master'Nick Thomas2019-01-168-13/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Links the issue which introduced the featureac-pages-subgroupsMarcia Ramos2019-01-141-2/+1
| * | | | | | | | | | | Enable Gitlab-Pages for subgroupsAlessio Caiazza2019-01-148-12/+25
* | | | | | | | | | | | Merge branch 'fix-part-of-44990' into 'master'Nick Thomas2019-01-162-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix RSpec/FactoriesInMigrationSpecs in two filesRémy Coutable2019-01-152-7/+11
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'shared_with_group_path' into 'master'Nick Thomas2019-01-165-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add group full path to project's shared_with_groupsMathieu Parent2019-01-155-1/+15