summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.2.0-rc2v11.2.0-rc2GitLab Release Tools Bot2018-08-031-1/+1
* Merge branch 'sh-fix-failing-deploy-token-clones' into 'master'Robert Speicher2018-08-032-0/+13
* Merge branch 'master' into 11-2-stable-prepare-rc2Jose Vargas2018-08-02393-3207/+53269
|\
| * Merge branch 'bvl-deploy-token' into 'master'Robert Speicher2018-08-022-1/+15
| |\
| | * Fix deploy tokens without `expire_at` crashesBob Van Landuyt2018-08-022-1/+15
| |/
| * Merge branch 'leipert-get-rid-of-unneeded-commit' into 'master'Dmitriy Zaporozhets2018-08-023-41/+35
| |\
| | * Refactor pipline info box viewDmitriy Zaporozhets2018-08-022-6/+2
| | * remove unneeded `before_action`Lukas Eipert2018-08-021-5/+0
| | * remove unnecessary if clause and move logic to optional partialLukas Eipert2018-08-022-34/+35
| | * move mandatory vue entry point from optional pathLukas Eipert2018-08-022-1/+3
| * | Merge branch 'ide-row-dropdown-scroll' into 'master'Filipa Lacerda2018-08-022-2/+6
| |\ \
| | * | Fixed Web IDE row dropdowns scrolling list incorrectlyPhil Hughes2018-08-022-2/+6
| * | | Merge branch '49861-top-nav-search-bar-produces-console-error-when-unauthenti...Clement Ho2018-08-022-1/+10
| |\ \ \
| | * | | Resolve "Top nav search bar produces console error when unauthenticated"Dennis Tang2018-08-022-1/+10
| |/ / /
| * | | Merge branch '48773-gitlab-project-import-should-use-object-storage' into 'ma...Sean McGivern2018-08-0217-22/+380
| |\ \ \
| | * | | Add Object Storage to GitLab project importJames Lopez2018-08-0217-22/+380
| * | | | Merge branch 'zj-backup-migration-done' into 'master'Sean McGivern2018-08-024-175/+70
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove feature flags from lib/backupZeger-Jan van de Weg2018-07-314-175/+70
| * | | | Merge branch 'sh-freeze-strings-docs' into 'master'Yorick Peterse2018-08-021-23/+31
| |\ \ \ \
| | * | | | Rework performance section to allow for string freezingStan Hu2018-08-011-23/+31
| * | | | | Merge branch '48834-chart-versions-for-applications-installed-by-one-click-in...Dmitriy Zaporozhets2018-08-0211-10/+130
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Lock helm charts to the VERSION already specified for each application.Thong Kuah2018-08-0211-10/+130
| * | | | | Merge branch 'fix/indentation-issue' into 'master'Rémy Coutable2018-08-021-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix indentation for artifacts example in docsAdam Liter2018-08-011-2/+2
| * | | | | Merge branch '49830-use-helm-272' into 'master'Dmitriy Zaporozhets2018-08-023-2/+7
| |\ \ \ \ \
| | * | | | | Update Helm Tiller used by gitlab-managed-apps to 2.7.2Thong Kuah2018-08-023-2/+7
| | | |/ / / | | |/| | |
| * | | | | Merge branch '44824-remove-ghost-notification-settings-for-group-and-project'...Sean McGivern2018-08-025-1/+73
| |\ \ \ \ \
| | * | | | | Resolve "Remove ghost notification settings for groups and projects"🙈 jacopo beschi 🙉2018-08-025-1/+73
| |/ / / / /
| * | | | | Merge branch 'update-gitlab-shell-to-8.1.0' into 'master'Nick Thomas2018-08-021-1/+1
| |\ \ \ \ \
| | * | | | | Update GITLAB_SHELL_VERSION to 8.1.0James Lopez2018-08-021-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-08-021-1/+1
| |\ \ \ \ \
| | * | | | | Update two_factor_authentication.mdJohn Burak2018-07-311-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'frozen-string-enable-app-models' into 'master'Rémy Coutable2018-08-02139-7/+286
| |\ \ \ \ \
| | * | | | | Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-26139-7/+286
| * | | | | | Merge branch '48246-osw-load-diffs-improvement' into 'master'Sean McGivern2018-08-023-5/+15
| |\ \ \ \ \ \
| | * | | | | | Only serializes diff files found by paths queryOswaldo Ferreira2018-08-013-5/+15
| * | | | | | | Merge branch '49851-link-to-runners' into 'master'Phil Hughes2018-08-023-2/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Automatically expand runner's settings block when linking to the runner's set...Filipa Lacerda2018-08-013-2/+8
| * | | | | | | | Merge branch 'gitaly-import-bare' into 'master'Sean McGivern2018-08-0224-80/+77
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Refactor gitlab:import:repos task to remove direct disk accessAlejandro Rodríguez2018-07-3124-80/+77
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'zj-repository-languages' into 'master'Nick Thomas2018-08-0129-4/+478
| |\ \ \ \ \ \ \
| | * | | | | | | Add repository languages for projectsZeger-Jan van de Weg2018-08-0129-4/+478
| * | | | | | | | Merge branch 'backstage/avatar-helper-vanilla-js' into 'master'Clement Ho2018-08-019-45/+200
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add vanilla JS avatar_helper and update existing avatar helpersPaul Slaughter2018-08-019-45/+200
| |/ / / / / / / /
| * | | | | | | | Merge branch '5488_license_management_backport_css' into 'master'Clement Ho2018-08-011-10/+6
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | backport CSS from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6638Lukas Eipert2018-08-011-10/+6
| * | | | | | | | Merge branch '49837-fix-changelog' into 'master'Robert Speicher2018-08-011-12/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixes changelog entries to reflect that 11.1.3 wasn't releasedFilipa Lacerda2018-08-011-12/+3
| | |/ / / / / / /
| * | | | | | | | Merge branch 'winh-raise-karma-timeout' into 'master'Tim Zallmann2018-08-011-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Raise timeout for Karma tests to 2 secondsWinnie Hellmann2018-08-011-1/+1