summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ce-5987-group-file-templates' into 'master'Robert Speicher2018-10-191-5/+5
|\ | | | | | | | | CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
| * Stop using ivars in BlobHelper template methodsNick Thomas2018-10-191-5/+5
| |
* | Rename "scheduled" label/badge of delayed jobs to "delayed"Shinya Maeda2018-10-191-1/+1
| |
* | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-191-0/+14
|\ \ | |/ |/| | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-172-2/+10
| |
* | Merge branch 'revert-f90fc922' into 'master'Mike Greiling2018-10-151-23/+0
|\ \ | | | | | | | | | | | | Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'" See merge request gitlab-org/gitlab-ce!22315
| * | Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into ↵Luke Bennett2018-10-121-23/+0
| | | | | | | | | | | | | | | 'master'" This reverts merge request !21551
* | | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-152-19/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * | | Remove Koding integration and documentationStan Hu2018-10-122-19/+0
| |/ / | | | | | | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-151-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
| * | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* | Backport CE changes for Ops Dashboard in EEPeter Leitzen2018-10-121-11/+25
|/
* Add new sort option "most_stars" to "Group > Children" pagesRene Hennig2018-10-111-4/+10
|
* Remove Git circuit breakerZeger-Jan van de Weg2018-10-102-70/+0
| | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-081-1/+1
|\ | | | | | | | | | | | | Removes expensive dead code on main MR page request Closes #51172 See merge request gitlab-org/gitlab-ce!22153
| * Remove dead code on main MR pageOswaldo Ferreira2018-10-051-1/+1
| |
* | Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-061-1/+1
| |
* | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-051-13/+14
|\ \ | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * | Backport project template API to CENick Thomas2018-10-051-13/+14
| | |
* | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-052-3/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| * \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-052-2/+7
| |\ \ \
| * \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-055-15/+18
| |\ \ \ \
| * \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-034-4/+29
| |\ \ \ \ \
| * | | | | | Do not omit leading zeros in duration_in_numbers helperWinnie Hellmann2018-10-021-5/+1
| | | | | | |
| * | | | | | Fix scheduled icon for stagesShinya Maeda2018-10-021-1/+6
| | | | | | |
| * | | | | | Allow remaining time of scheduled jobs to overflow one dayWinnie Hellmann2018-10-021-3/+15
| | | | | | |
| * | | | | | Update pipelines and stages status as wellShinya Maeda2018-10-021-0/+1
| | | | | | |
* | | | | | | Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'Mike Greiling2018-10-051-0/+23
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | CE port Resolve "Promote starting a GitLab.com trial" See merge request gitlab-org/gitlab-ce!21551
| * | | | | | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-09-24100-166/+495
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ce-6983-promote-starting-a-gitlab-com-trial
| * | | | | | | LintLuke Bennett2018-09-241-3/+3
| | | | | | | |
| * | | | | | | LintLuke Bennett2018-09-241-6/+6
| | | | | | | |
| * | | | | | | Review changesLuke Bennett2018-09-241-0/+23
| | | | | | | |
* | | | | | | | Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-051-1/+5
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-051-1/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'dz-labels-subscribe-filter' into 'master'Dmitriy Zaporozhets2018-10-042-9/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subscribe filter to labels page See merge request gitlab-org/gitlab-ce!21965
| * | | | | | Refactor labels_filter_path and labels navdz-labels-subscribe-filterDmitriy Zaporozhets2018-10-042-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor labels_filter_path method to be consistent with other similar methods like search_filter_path, milestones_filter_path etc. Also move repeating code in labels index page nav into shared partial Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch ↵Rémy Coutable2018-10-041-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '#51457-Show-percentage-of-language-detection-on-the-language-bar' into 'master' Show percentage of language detection on the language bar Closes #51457 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22056
| * | | | | | | proper escape language nameJohann Hubert Sonntagbauer2018-10-031-1/+1
| | | | | | | |
| * | | | | | | fix lintingJohann Hubert Sonntagbauer2018-10-031-1/+1
| | | | | | | |
| * | | | | | | add percentage information to repository language barJohann Hubert Sonntagbauer2018-10-031-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '51009-remove-rbac-clusters-feature-flag' into 'master'Kamil Trzciński2018-10-041-4/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove :rbac_clusters feature flag Closes #51009 See merge request gitlab-org/gitlab-ce!22096
| * | | | | | Remove `rbac_clusters` feature flagThong Kuah2018-10-041-4/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Auto DevOps can run in a RBAC enabled cluster from https://gitlab.com/gitlab-org/gitlab-ce/issues/51942, we can now remove the FF. As the flag only governed if UI elements would appear or not when creating/adding existing clusters; the effect of removing the FF would be that the checkbox to choose to enable RBAC clusters will now always appear. Remove FF stubs from specs Improve spec context names
* | | | | | Resolve "Add new "Overview" tab on user profile page"Martin Wortschack2018-10-041-1/+1
|/ / / / /
* | | | | Merge branch '50161-hide-close-mr-button-when-merged' into 'master'Rémy Coutable2018-10-023-4/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides Close MR button on merged MR Closes #50161 See merge request gitlab-org/gitlab-ce!21840
| * | | | | Hides Close MR button on merged MR50161-hide-close-mr-button-when-mergedJacopo2018-10-023-4/+16
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Merge request is merged, shows only the Report abuse menu item in the dropdown menu instead of showing the close_reopen_report toggle with an unusable Close button. The Report abuse is still hidden when the author of the Merge request is the current_user. Hides the Reopen button on a closed and locked issue when the issue.author is not the current_user
* | | | | Merge branch 'bvl-show-pre-release-sha' into 'master'Sean McGivern2018-10-021-0/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Show the commit-sha for pre-release versions Closes #52050 See merge request gitlab-org/gitlab-ce!22026
| * | | | Show the commit-sha for pre-release versionsBob Van Landuyt2018-10-021-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pre-release tags are set at the beginning of a release, so it would be impossible to figure out which version was running if we're running nightlies. In that case it's better to still link to the SHA. These versions don't get deployed to .com.
* | | | | Merge branch 'osw-configurable-single-diff-file-limit' into 'master'Douwe Maan2018-10-021-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Make single diff patch limit configurable Closes #48027 See merge request gitlab-org/gitlab-ce!21886
| * | | | Make single diff patch limit configurableosw-configurable-single-diff-file-limitOswaldo Ferreira2018-10-011-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Creates a new column to hold the single patch limit value on application_settings - Allows updating this value through the application_settings API - Calculates single diff patch collapsing limit based on diff_max_patch_bytes column - Updates diff limit documentation - Adds documentation (with warning) as of how one can update this limit
View Lorry Controller Status