Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-ui | Robert Speicher | 2018-03-05 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513 | ||||
| * | Cleanup after adding MR diff's commit_count | Jan Provaznik | 2018-03-05 | 1 | -1/+1 |
| | | | | | | | | | | | | * processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method | ||||
* | | Merge branch 'kp-label-select-vue' into 'master' | Phil Hughes | 2018-03-05 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411 | ||||
| * | | Add `suggest_colors` from LabelsHelper | Kushal Pandya | 2018-03-05 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch '42572-release-controller' into 'master' | Robert Speicher | 2018-03-05 | 3 | -77/+106 |
|\ \ | | | | | | | | | | | | | Try not to hold env and release the controller after the request. See merge request gitlab-org/gitlab-ce!16847 | ||||
| * | | Move constants and update for feedback42572-release-controller | Lin Jen-Shin | 2018-03-03 | 2 | -5/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into 42572-release-controller | Lin Jen-Shin | 2018-03-03 | 126 | -2343/+3818 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (889 commits) SlackService - respect `notify_only_default_branch` for push events Clarify usage ping wording in admin area Update incoming emails documents Allow to include also descendant group labels Update docs on grouping CI jobs Support additional LabelsFinder parameters for group labels Extend Cluster Applications to install GitLab Runner to Kubernetes cluster Remove registry list webpack entry point Remove trailing newline that was causing an EE conflict Small fixes in Vuex docs Remove u2f webpack bundle Update documentation WRT to request parameters remove common_vue CommonsChunk config Fetch commit signatures from Gitaly in batches migrate stl_viewer to dynamic import migrate sketch_viewer to dynamic import migrate pdf_viewer to dynamic import migrate notebook_viewer to dynamic import migrate balsamiq_viewer to dynamic import Add some strings that were missing in gitlab.pot ... | ||||
| * | | Put controller in its separate file | Lin Jen-Shin | 2018-02-07 | 2 | -79/+84 |
| | | | |||||
| * | | Release the entire env | Lin Jen-Shin | 2018-02-07 | 2 | -9/+14 |
| | | | |||||
| * | | Use a controller to hold request values | Lin Jen-Shin | 2018-02-07 | 1 | -58/+67 |
| | | | | | | | | | | | | | | | | | | | | | So that we don't need to hold env after the request. This makes it much harder to test, especially Rails session is acting weirdly, so we need `dig('flash', 'flashes', 'alert')` to dig the actual flash value. | ||||
| * | | Try not to hold env and release the controller | Lin Jen-Shin | 2018-02-07 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after the request. This way, we could release the project referred from the controller, which potentially referred a repository which potentially allocated a lot of memories. Before this change, we could hold the last request data and cannot release the memory. After this change, the largest request data should be able to be collected from GC. This might not impact the instances having heavy load, as the last request should be changing all the time, and GC won't kick in for each request anyway. However it could still potentially allow us to free more memories for each GC runs, because now we could free one more request anyway. | ||||
* | | | Merge branch 'gitaly-lfs-changes' into 'master' | Douwe Maan | 2018-03-05 | 2 | -13/+68 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChanges Closes gitaly#1048 See merge request gitlab-org/gitlab-ce!16973 | ||||
| * | | | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChangesgitaly-lfs-changes | Alejandro Rodríguez | 2018-03-02 | 2 | -13/+68 |
| | |/ | |/| | |||||
* | | | Merge branch 'feature/add-support-for-all-option-in-count-find-commits' into ↵ | Douwe Maan | 2018-03-05 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for :all option to {count,find}_commits See merge request gitlab-org/gitlab-ce!17464 | ||||
| * | | | Add support for :all option to {count,find}_commitsfeature/add-support-for-all-option-in-count-find-commits | Ahmad Sherif | 2018-03-02 | 2 | -5/+5 |
| |/ / | |||||
* | | | Merge branch '41719-mr-title-fix' into 'master' | Douwe Maan | 2018-03-05 | 2 | -6/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Render htmlentities correctly for links not supported by Rinku Closes #41719 See merge request gitlab-org/gitlab-ce!17180 | ||||
| * | | | Render htmlentities correctly for links not supported by Rinku | Jarka Kadlecová | 2018-02-21 | 2 | -6/+8 |
| | | | | |||||
* | | | | Merge branch ↵ | Rémy Coutable | 2018-03-05 | 1 | -5/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37430-projects-comparecontroller-show-is-calling-gitaly-n-1-times-per-request' into 'master' Resolve "Projects::CompareController#show is calling Gitaly n+1 times per request" Closes #37430 See merge request gitlab-org/gitlab-ce!17439 | ||||
| * | | | | Fix n+1 issue by not reloading fully loaded blobs | Alejandro Rodríguez | 2018-03-05 | 1 | -5/+9 |
| | |/ / | |/| | | |||||
* | | | | #43691: DiffNotes not counted by ContributionsCalendar | Riccardo Padovani | 2018-03-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use limited count queries also for scoped searches | Jan Provaznik | 2018-03-05 | 2 | -23/+22 |
| | | | | |||||
* | | | | Merge branch 'ee-4862-verify-file-checksums' into 'master' | Sean McGivern | 2018-03-05 | 4 | -0/+171 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Foreground verification of uploads and LFS objects See merge request gitlab-org/gitlab-ce!17402 | ||||
| * | | | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksums | Nick Thomas | 2018-03-02 | 4 | -0/+171 |
| |/ / / | |||||
* | | | | Remove unsued pipelines-related prometheus metric | Grzegorz Bizon | 2018-03-05 | 1 | -16/+0 |
|/ / / | |||||
* | | | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master' | Sean McGivern | 2018-03-02 | 3 | -3/+73 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456 | ||||
| * | | | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batch | Ahmad Sherif | 2018-03-01 | 3 | -3/+73 |
| | | | | | | | | | | | | | | | | Closes gitaly#1046 | ||||
* | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster | Mayra Cabrera | 2018-03-01 | 6 | -66/+142 |
| | | | | |||||
* | | | | Remove u2f webpack bundle | Mike Greiling | 2018-03-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master' | Douwe Maan | 2018-03-01 | 34 | -1765/+1794 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359 | ||||
| * | | | | Moved o_auth/saml/ldap modules under gitlab/auth | Horatiu Eugen Vlad | 2018-02-28 | 34 | -1765/+1794 |
| | | | | | |||||
* | | | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master' | Douwe Maan | 2018-03-01 | 7 | -47/+206 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793 | ||||
| * | | | | | Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-ping | Tiago Botelho | 2018-03-01 | 3 | -14/+20 |
| | | | | | | |||||
| * | | | | | Refactors median code to work with both single and multiple projects | Tiago Botelho | 2018-02-28 | 5 | -72/+135 |
| | | | | | | |||||
| * | | | | | Restrict cycle analytics usage data to instances that use postgres only | Tiago Botelho | 2018-02-28 | 2 | -2/+5 |
| | | | | | | |||||
| * | | | | | Restore memoization to base query and add a batch base query method | Tiago Botelho | 2018-02-28 | 4 | -8/+8 |
| | | | | | | |||||
| * | | | | | Add BatchLoader as a way to refactor the base stage code | Tiago Botelho | 2018-02-28 | 6 | -34/+44 |
| | | | | | | |||||
| * | | | | | Refactor CycleAnalytics base stage class and model | Tiago Botelho | 2018-02-28 | 1 | -5/+1 |
| | | | | | | |||||
| * | | | | | Adds get all medians to Cycle Analytics model | Tiago Botelho | 2018-02-28 | 5 | -15/+96 |
| | | | | | | |||||
* | | | | | | Merge branch 'zj-licensee-key' into 'master'43548-update-language-about-usage-ping-in-admin-settings-and-docs | Sean McGivern | 2018-03-01 | 2 | -0/+23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client implementation for Licensee#key See merge request gitlab-org/gitlab-ce!17449 | ||||
| * | | | | | | Client implementation for Licensee#key | Zeger-Jan van de Weg | 2018-03-01 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the migration as tracked in: gitlab-org/gitaly#1026 | ||||
* | | | | | | | Merge branch '42434-allow-commits-endpoint-to-work-over-all-commits' into ↵ | Douwe Maan | 2018-03-01 | 1 | -12/+32 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Allow API method /projects/:id/repository/commits to work over all commits" Closes #42434 See merge request gitlab-org/gitlab-ce!17182 | ||||
| * | | | | | | | Add specs42434-allow-commits-endpoint-to-work-over-all-commits | Tiago Botelho | 2018-03-01 | 1 | -10/+15 |
| | | | | | | | | |||||
| * | | | | | | | API method /projects/:id/repository/commits now works over every commit | Tiago Botelho | 2018-02-23 | 1 | -9/+24 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'feature/gb/pipeline-variable-expressions' into 'master' | Kamil Trzciński | 2018-03-01 | 11 | -0/+325 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline variables expressions See merge request gitlab-org/gitlab-ce!17261 | ||||
| * | | | | | | | | Make max tokens in expressions lexer a class-level attribute | Grzegorz Bizon | 2018-03-01 | 1 | -5/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Add a comment to expressions parser tree methodfeature/gb/pipeline-variable-expressions | Grzegorz Bizon | 2018-03-01 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve pipeline expressions lexer | Grzegorz Bizon | 2018-03-01 | 1 | -15/+27 |
| | | | | | | | | | |||||
| * | | | | | | | | Do not use keyword args to pass expression variables | Grzegorz Bizon | 2018-02-27 | 5 | -6/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Robustify pipeline expressions nodes parser | Grzegorz Bizon | 2018-02-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve null lexeme in pipeline expressions | Grzegorz Bizon | 2018-02-27 | 1 | -3/+3 |
| | | | | | | | | |