Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable frozen string for app/models/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models-more | gfyoung | 2018-08-03 | 79 | -0/+161 |
* | Merge branch 'remove-unused-css' into 'master' | Phil Hughes | 2018-08-03 | 1 | -18/+0 |
|\ | |||||
| * | Remove unused styles in tree.scss | Annabel Dunstone Gray | 2018-08-02 | 1 | -18/+0 |
* | | Merge branch 'mk/add-orphan-upload-file-task-tests' into 'master'expose-secondary-emails-api | Stan Hu | 2018-08-03 | 3 | -277/+324 |
|\ \ | |||||
| * | | Add object storage related tests for `gitlab:cleanup:project_uploads` task | Michael Kozono | 2018-08-03 | 3 | -277/+324 |
|/ / | |||||
* | | Merge branch 'rouge-3.2.0' into 'master' | Robert Speicher | 2018-08-03 | 2 | -1/+6 |
|\ \ | |||||
| * | | Update Rouge to 3.2.0 | Drew Blessing | 2018-08-02 | 2 | -1/+6 |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Drew Blessing | 2018-08-02 | 642 | -4917/+58624 |
| |\ \ | | |/ | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Drew Blessing | 2018-07-27 | 1892 | -8218/+17887 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Drew Blessing | 2018-07-11 | 4599 | -76407/+116382 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Drew Blessing | 2018-05-23 | 1763 | -22028/+42805 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Drew Blessing | 2018-04-23 | 2260 | -30291/+81777 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix charlock | Drew Blessing | 2018-04-23 | 1 | -1/+1 |
* | | | | | | | Merge branch 'sh-fix-failing-gpg-signature-ce' into 'master' | Robert Speicher | 2018-08-03 | 2 | -2/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make CreateGpgSignatureWorker backwards compatible with original method signa... | Stan Hu | 2018-08-02 | 2 | -2/+15 |
* | | | | | | | | Merge branch 'sh-fix-failing-deploy-token-clones' into 'master' | Robert Speicher | 2018-08-02 | 2 | -0/+13 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix failing 500 errors when deploy tokens are used to clone | Stan Hu | 2018-08-02 | 2 | -0/+13 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bvl-deploy-token' into 'master' | Robert Speicher | 2018-08-02 | 2 | -1/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix deploy tokens without `expire_at` crashes | Bob Van Landuyt | 2018-08-02 | 2 | -1/+15 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'leipert-get-rid-of-unneeded-commit' into 'master' | Dmitriy Zaporozhets | 2018-08-02 | 3 | -41/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Refactor pipline info box view | Dmitriy Zaporozhets | 2018-08-02 | 2 | -6/+2 |
| * | | | | | | | remove unneeded `before_action` | Lukas Eipert | 2018-08-02 | 1 | -5/+0 |
| * | | | | | | | remove unnecessary if clause and move logic to optional partial | Lukas Eipert | 2018-08-02 | 2 | -34/+35 |
| * | | | | | | | move mandatory vue entry point from optional path | Lukas Eipert | 2018-08-02 | 2 | -1/+3 |
* | | | | | | | | Merge branch 'ide-row-dropdown-scroll' into 'master' | Filipa Lacerda | 2018-08-02 | 2 | -2/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed Web IDE row dropdowns scrolling list incorrectly | Phil Hughes | 2018-08-02 | 2 | -2/+6 |
* | | | | | | | | | Merge branch '49861-top-nav-search-bar-produces-console-error-when-unauthenti... | Clement Ho | 2018-08-02 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Resolve "Top nav search bar produces console error when unauthenticated" | Dennis Tang | 2018-08-02 | 2 | -1/+10 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '48773-gitlab-project-import-should-use-object-storage' into 'ma... | Sean McGivern | 2018-08-02 | 17 | -22/+380 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add Object Storage to GitLab project import | James Lopez | 2018-08-02 | 17 | -22/+380 |
* | | | | | | | | | | Merge branch 'zj-backup-migration-done' into 'master' | Sean McGivern | 2018-08-02 | 4 | -175/+70 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove feature flags from lib/backup | Zeger-Jan van de Weg | 2018-07-31 | 4 | -175/+70 |
* | | | | | | | | | | Merge branch 'sh-freeze-strings-docs' into 'master' | Yorick Peterse | 2018-08-02 | 1 | -23/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Rework performance section to allow for string freezing | Stan Hu | 2018-08-01 | 1 | -23/+31 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '48834-chart-versions-for-applications-installed-by-one-click-in... | Dmitriy Zaporozhets | 2018-08-02 | 11 | -10/+130 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Lock helm charts to the VERSION already specified for each application. | Thong Kuah | 2018-08-02 | 11 | -10/+130 |
* | | | | | | | | | | Merge branch 'fix/indentation-issue' into 'master' | Rémy Coutable | 2018-08-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix indentation for artifacts example in docs | Adam Liter | 2018-08-01 | 1 | -2/+2 |
* | | | | | | | | | | Merge branch '49830-use-helm-272' into 'master' | Dmitriy Zaporozhets | 2018-08-02 | 3 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update Helm Tiller used by gitlab-managed-apps to 2.7.2 | Thong Kuah | 2018-08-02 | 3 | -2/+7 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '44824-remove-ghost-notification-settings-for-group-and-project'... | Sean McGivern | 2018-08-02 | 5 | -1/+73 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve "Remove ghost notification settings for groups and projects" | 🙈 jacopo beschi 🙉 | 2018-08-02 | 5 | -1/+73 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'update-gitlab-shell-to-8.1.0' into 'master' | Nick Thomas | 2018-08-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update GITLAB_SHELL_VERSION to 8.1.0 | James Lopez | 2018-08-02 | 1 | -1/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'patch-28' into 'master' | Marcia Ramos | 2018-08-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update two_factor_authentication.md | John Burak | 2018-07-31 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'frozen-string-enable-app-models' into 'master' | Rémy Coutable | 2018-08-02 | 139 | -7/+286 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models | gfyoung | 2018-07-26 | 139 | -7/+286 |
* | | | | | | | | | | | Merge branch '48246-osw-load-diffs-improvement' into 'master' | Sean McGivern | 2018-08-02 | 3 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Only serializes diff files found by paths query | Oswaldo Ferreira | 2018-08-01 | 3 | -5/+15 |