summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Method to track recoverable exceptions in sentryBob Van Landuyt2018-04-171-10/+2
| | | | | | | | This adds a method to track errors that can be recovered from in sentry. It is useful when debugging performance issues, or exceptions that are hard to reproduce.
* Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon2018-04-161-0/+1
|\ | | | | | | | | | | | | Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695
| * jquery and webpack changedhaseeb2018-03-031-1/+0
| |
| * fix webpack.config.jshaseeb2018-02-281-5/+0
| |
| * embedded snippets supporthaseeb2018-02-282-0/+7
| |
* | Backport GitLab domain helper methodsOswaldo Ferreira2018-04-131-1/+1
| |
* | Replacing gollum libs for custom gitlab onesFrancisco Javier López2018-04-131-133/+0
| |
* | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-131-0/+5
|\ \ | | | | | | | | | | | | Deprecate legacy disk paths See merge request gitlab-org/gitlab-ce!18332
| * | Deprecate legacy disk pathsZeger-Jan van de Weg2018-04-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is impossible on environments where components run in their own container. There for constructing the path should not be done except for exceptional cases. One of the considerations, instead of logging, was to use Sentry. For now I've chosen not to use this as the impact of this change is hard to determine. Getting this in now will allow us to checkout the impact on dev.gitlab.org and staging.
* | | use commander for safer cli argument parsingLukas Eipert2018-04-111-5/+13
| | |
* | | move TEST_FILES variable to `process.env`Lukas Eipert2018-04-101-1/+1
| | |
* | | remove unnecessary webpack plugins assignment in karma configLukas Eipert2018-04-101-2/+0
| | |
* | | read which testfiles to run from CLILukas Eipert2018-04-101-1/+6
| | |
* | | Merge branch 'master' into winh-single-karma-testLukas Eipert2018-04-1060-528/+1069
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # spec/javascripts/test_bundle.js
| * | Projects and groups badges settings UIFrancisco Javier López2018-04-083-1/+3
| | |
| * | Get rid of Redis when dealing with deploy tokensKamil Trzciński2018-04-061-2/+4
| | | | | | | | | | | | We use controller actions to pass a newly created token and errors
| * | Create barebones for DeploytokenMayra Cabrera2018-04-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes: - Model, factories, create service and controller actions - As usual, includes specs for everything - Builds UI (copy from PAT) - Add revoke action Closes #31591
| * | Add Kubernetes CPU/Mem usage totalsJoshua Lambert2018-04-061-5/+23
| | |
| * | Update labels for latency, cpu and memory metricsJose Ivan Vargas2018-04-061-3/+3
| | |
| * | Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-062-3/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225
| | * | Add new repository archive routeJames Ramsay2018-04-062-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add `<project>/-/archive/<ref>/<filename>.<format>` route using the `-` separator to prevent namespace collisions. If the filename is `<project>-<ref>` or the ref is a sha, the sha will be omitted, otherwise the default filename will be used. - deprecate previous archive route `repository/<ref>/archive`
| * | | [Rails5] Update `type_cast_*_database` methodsblackst0ne2018-04-061-14/+17
| | | |
| * | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-052-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160
| | * | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-052-0/+8
| | | | |
| * | | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ↵Kamil Trzciński2018-04-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use chronic duration attribute for project build timeout See merge request gitlab-org/gitlab-ce!17386
| | * | | | Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-041-1/+1
| | | | | |
| * | | | | Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-052-13/+16
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | Allow to store uploads by default on Object Storage See merge request gitlab-org/gitlab-ce!18156
| | * | | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-042-13/+16
| | |/ / | | | | | | | | | | | | Introduce `direct_upload` option for `uploads` which is gonna set a default storage to Object Storage and use Unicorn to save data
| * | | Add support for Sidekiq JSON loggingStan Hu2018-04-043-1/+18
| |/ / | | | | | | | | | Closes #20060
| * | Use katex min cssClement Ho2018-03-281-1/+1
| | |
| * | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-282-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "/ci/lint should support include keyword in config file" Closes #43603 See merge request gitlab-org/gitlab-ce!17729
| | * | Move project ci lint under '-' scope43603-ci-lint-supportMayra Cabrera2018-03-261-4/+4
| | | |
| | * | Make ci/lint page context aware:Mayra Cabrera2018-03-262-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create ci/lints controller inside project/ - Move js pages to be inside projects/ - Copy view ci/lint view to be inside project folder - Remove ci/lint view and js files Closes #43603
| * | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'Kamil Trzciński2018-03-283-15/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LFS direct upload port to CE Closes #44548 See merge request gitlab-org/gitlab-ce!17752
| | * | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ceAlessio Caiazza2018-03-273-15/+4
| | | | |
| * | | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master'Douwe Maan2018-03-271-1/+22
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "Add support for omniauth-jwt provider" Closes #43512 See merge request gitlab-org/gitlab-ce!17774
| | * | | Adds JWT omnianuth integrationTiago Botelho2018-03-201-1/+22
| | | | |
| * | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-274-0/+109
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358
| | * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-2213-248/+217
| | |\ \ \
| | * | | | apply feedbackMicaël Bergeron2018-03-221-7/+0
| | | | | |
| | * | | | Backport ee-40781-os-to-ceMicaël Bergeron2018-03-222-15/+12
| | | | | |
| | * | | | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-092-0/+6
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0816-144/+129
| | |\ \ \ \
| | * | | | | fix the prepare_untracked_uploads_spec from using the EE schemaMicaël Bergeron2018-03-011-0/+1
| | | | | | |
| | * | | | | port the object storage to CEMicaël Bergeron2018-03-012-0/+7
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backportKamil Trzciński2018-02-2814-68/+115
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| | * | | | | | Merge branch '4915-background-upload-option-is-not-effective' into 'master'Kamil Trzciński2018-02-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Background upload option is not effective" Closes #4915 See merge request gitlab-org/gitlab-ee!4507
| | * | | | | | Merge branch '4879-support-private-https-urls-for-object-storage' into 'master'Sean McGivern2018-02-281-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Support private HTTPS urls for object storage"" Closes #4879 See merge request gitlab-org/gitlab-ee!4475
| | * | | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵Kamil Trzciński2018-02-2810-3/+133
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| | * \ \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2822-74/+223
| | |\ \ \ \ \ \ \
View Lorry Controller Status