Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use katex min css | Clement Ho | 2018-03-28 | 1 | -1/+1 |
* | Merge branch '43603-ci-lint-support' into 'master' | Kamil Trzciński | 2018-03-28 | 2 | -1/+5 |
|\ | |||||
| * | Move project ci lint under '-' scope43603-ci-lint-support | Mayra Cabrera | 2018-03-26 | 1 | -4/+4 |
| * | Make ci/lint page context aware: | Mayra Cabrera | 2018-03-26 | 2 | -1/+5 |
* | | Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master' | Kamil Trzciński | 2018-03-28 | 3 | -15/+4 |
|\ \ | |||||
| * | | Port LFS direct_upload from EEac/lfs-direct-upload-ee-to-ce | Alessio Caiazza | 2018-03-27 | 3 | -15/+4 |
* | | | Merge branch '43512-add-support-for-omniauth-jwt-provider' into 'master' | Douwe Maan | 2018-03-27 | 1 | -1/+22 |
|\ \ \ | |/ / |/| | | |||||
| * | | Adds JWT omnianuth integration | Tiago Botelho | 2018-03-20 | 1 | -1/+22 |
* | | | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 4 | -0/+109 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 13 | -248/+217 |
| |\ \ | |||||
| * | | | apply feedback | Micaël Bergeron | 2018-03-22 | 1 | -7/+0 |
| * | | | Backport ee-40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 2 | -15/+12 |
| * | | | Add proxy_download to perform proxied sending of all files | Micaël Bergeron | 2018-03-09 | 2 | -0/+6 |
| * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 16 | -144/+129 |
| |\ \ \ | |||||
| * | | | | fix the prepare_untracked_uploads_spec from using the EE schema | Micaël Bergeron | 2018-03-01 | 1 | -0/+1 |
| * | | | | port the object storage to CE | Micaël Bergeron | 2018-03-01 | 2 | -0/+7 |
| * | | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 14 | -68/+115 |
| |\ \ \ \ | |||||
| * | | | | | Merge branch '4915-background-upload-option-is-not-effective' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -9/+9 |
| * | | | | | Merge branch '4879-support-private-https-urls-for-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 1 | -0/+20 |
| * | | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 10 | -3/+133 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 22 | -74/+223 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 2 | -19/+2 |
| * | | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 2 | -9/+52 |
| * | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 17 | -45/+110 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+1 |
| * | | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -0/+1 |
| * | | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 27 | -63/+201 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 23 | -129/+171 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 23 | -54/+233 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master' | Douwe Maan | 2018-02-28 | 3 | -3/+48 |
| * | | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 28 | -97/+224 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 38 | -106/+662 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master' | Grzegorz Bizon | 2018-02-28 | 2 | -0/+14 |
* | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'43098-controller-projects-issuescontroller-show-executes-more-than-100-sql-queries | Robert Speicher | 2018-03-23 | 7 | -6/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | [Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-update | blackst0ne | 2018-03-22 | 7 | -6/+74 |
* | | | | | | | | | | | | | | | Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into 'ma... | Filipa Lacerda | 2018-03-23 | 2 | -48/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | prettify all node scripts | Mike Greiling | 2018-03-23 | 2 | -48/+55 |
* | | | | | | | | | | | | | | | | Merge branch 'pages_force_https' into 'master' | Nick Thomas | 2018-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Add HTTPS-only pages | Rob Watson | 2018-03-22 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'mark-legacy-git-access' into 'master' | Sean McGivern | 2018-03-23 | 2 | -10/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Route path lookups through legacy_disk_pathmark-legacy-git-access | Jacob Vosmaer | 2018-03-21 | 2 | -10/+5 |
* | | | | | | | | | | | | | | | | | Merge branch 'prettier-ignore' into 'master' | Mike Greiling | 2018-03-22 | 1 | -73/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Added prettierignore fileprettier-ignore | Phil Hughes | 2018-03-21 | 1 | -73/+51 |
* | | | | | | | | | | | | | | | | | | Merge branch 'move-concatenate-module-plugin' into 'master' | Jacob Schatz | 2018-03-22 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | enable scope hoisting only in produciton (it interferes with HMR) | Mike Greiling | 2018-03-22 | 1 | -3/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Force Rails to not complain about reloading | Lin Jen-Shin | 2018-03-22 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master' | Douwe Maan | 2018-03-22 | 1 | -45/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | OmniauthInitializer created to improve devise.rb | James Edwards-Jones | 2018-03-20 | 1 | -45/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master' | Robert Speicher | 2018-03-21 | 1 | -37/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | [Rails5] Update ar5_batching initializerblackst0ne-rails5-update-ar5-batching-initializer | blackst0ne | 2018-03-21 | 1 | -37/+35 |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |