summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add ProjectFeature check for feature flagrs-feature-enabled-and-licensedRobert Speicher2018-09-211-0/+3
| | | | | | | | This will allow an explicitly-disabled feature flag to override a feature being available for a project. As an extreme example, we could quickly disable issues across all projects at runtime by running `Feature.disable(:issues)`.
* Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-13328-32/+1152
|\ | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
| * Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-11328-32/+1152
| | | | | | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* | Merge branch '7573-show-click-to-expand-on-not-rendered-diffs' into 'master'Phil Hughes2018-09-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Display click to expand on collapsed diffs Closes #51466 See merge request gitlab-org/gitlab-ce!21716
| * | Display click to expand on collapsed diffsAndré Luís2018-09-131-1/+1
| | |
* | | Resolve "Choosing “Initialize repo with a README” breaks project created ↵Martin Wortschack2018-09-133-11/+13
|/ / | | | | | | from template"
* | Merge branch ↵Grzegorz Bizon2018-09-134-15/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
| * | Inline initialize_yaml_processorMatija Čupić2018-09-121-5/+1
| | |
| * | Address MR suggestionsMatija Čupić2018-09-073-7/+7
| | | | | | | | | | | | CE mirror of c4578b951e331fe8c75cd4f948ce74cec6587bad
| * | Improve external architectureMatija Čupić2018-09-073-7/+11
| | | | | | | | | | | | CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
| * | Make Repository#blob_data_at publicMatija Čupić2018-09-071-12/+8
| | | | | | | | | | | | CE mirror of 17de13ada1a98da060802c55889489a512183cd1
| * | Change ExternalFile to retrieve local file from repository instead of GitLab ↵Matija Čupić2018-09-072-1/+5
| | | | | | | | | | | | | | | | | | project CE mirror of 03c6094997023d9c8875ced421a6c9ef39a4af44
| * | Import external files in Gitlab CI configMatija Čupić2018-09-071-1/+1
| | | | | | | | | | | | CE mirror of a10b777f8cb1902bba3964a4cbad2b1dd6bce785
* | | Merge branch 'sh-strip-sentry-dsn' into 'master'Robert Speicher2018-09-121-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Strip whitespace from Sentry URL Closes #49621 See merge request gitlab-org/gitlab-ce!21703
| * | | Strip whitespace from Sentry URLStan Hu2018-09-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding extra whitespace in the DSN could prevent the server from starting due to InvalidURIErrors in sentry-raven. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49621
* | | | Resolve "500 Internal Server Error: Deleting branch of deleted project"🙈 jacopo beschi 🙉2018-09-121-0/+5
|/ / /
* | | Merge branch 'clean-gitlab-git' into 'master'Douwe Maan2018-09-122-5/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Rugged and shell code from Gitlab::Git Closes gitaly#1124 See merge request gitlab-org/gitlab-ce!21488
| * | | Remove Rugged and shell code from Gitlab::GitAlejandro Rodríguez2018-09-122-5/+0
| | | |
* | | | Fix mention in edit mrAlin Ciciu2018-09-121-0/+1
| | | |
* | | | Merge branch 'issue_50528' into 'master'Stan Hu2018-09-121-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log project services sidekiq failures Closes #50528 See merge request gitlab-org/gitlab-ce!21336
| * | | | Log project services errors when executing asyncFelipe Artur2018-09-101-1/+5
| | | | |
* | | | | Merge branch 'use-gitlab-ui-pagination-for-groups' into 'master'Clement Ho2018-09-123-12/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use GitLab UI pagination component for groups See merge request gitlab-org/gitlab-ce!21287
| * | | | | Use GitLab ui pagination component for groupsAdriel Santiago2018-09-113-12/+51
| | |/ / / | |/| | |
* | | | | Add trigger information for job APISteve Azzopardi2018-09-124-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create new entity called TriggerVariablesEnitity for trigger variables, to aid reuseablity in the future. Update JSON schema to include trigger information in the response. Refactor rspec tests a bit to reduce duplication and for the `context` to make sense. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989
* | | | | Merge branch 'dz-add-project-id-to-jupyter' into 'master'Dmitriy Zaporozhets2018-09-121-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add GitLab project id to jupyter config installed via cluster apps See merge request gitlab-org/gitlab-ce!21341
| * | | | Add cluster project id to jupyter configDmitriy Zaporozhets2018-08-221-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Use gitlab-ui loading iconClement Ho2018-09-1161-244/+80
| | | | |
* | | | | Merge branch 'remove-unused-import' into 'master'Mike Greiling2018-09-111-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused GlModal import in delete wiki modal See merge request gitlab-org/gitlab-ce!21677
| * | | | | Remove unused GlModal import in delete wiki modalClement Ho2018-09-111-4/+0
| | | | | |
* | | | | | Merge branch '51375-fix-activity-pages' into 'master'Robert Speicher2018-09-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the group and project activity pages Closes #51375 See merge request gitlab-org/gitlab-ce!21674
| * | | | | Fix the group and project activity pagesNick Thomas2018-09-111-1/+1
| | | | | |
* | | | | | Add empty state illustration information in job APISteve Azzopardi2018-09-115-5/+13
| | | | | |
* | | | | | Merge branch '50632-combine-color-duplicates' into 'master'Clement Ho2018-09-1129-254/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[SCSS Variables Cleanup] Combine all duplicated hex colors in variables.scss", Part 1 See merge request gitlab-org/gitlab-ce!21375
| * | | | | | Remove jquery.scss; Combine multiple duplicate grays into global gray ↵Annabel Dunstone Gray2018-09-1129-254/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | variables; Remove unused styles in common.scss
* | | | | | | Merge branch 'frozen-string-enable-vestigial' into 'master'Stan Hu2018-09-114-0/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Enable frozen string in vestigial files See merge request gitlab-org/gitlab-ce!21665
| * | | | | | Enable frozen string in vestigial filesgfyoung2018-09-114-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | | | | Merge branch 'sh-support-adding-confirmed-emails' into 'master'Robert Speicher2018-09-112-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to skip user email confirmation with API Closes #50876 See merge request gitlab-org/gitlab-ce!21630
| * | | | | | | Add ability to skip user email confirmation with APIStan Hu2018-09-102-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives admins the ability to send a `skip_confirmation` flag in the `POST /users/:id/email` API endpoint to skip the verification step and assume the given e-mail address is verified. Closes #50876
* | | | | | | | Merge branch '50835-add-filtering-sorting-for-labels-on-labels-page' into ↵Dmitriy Zaporozhets2018-09-118-2/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add sorting for labels on labels page See merge request gitlab-org/gitlab-ce!21642
| * | | | | | | | Add sort dropdown to project labels page and group labels pageDmitriy Zaporozhets2018-09-108-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'fix-namespace-upload' into 'master'Kamil Trzciński2018-09-111-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix workhorse temp path for namespace uploads Closes gitlab-ee#7009 See merge request gitlab-org/gitlab-ce!21650
| * | | | | | | | Fix workhorse temp path for namespace uploadsJarka Košanová2018-09-111-0/+4
| | | | | | | | |
* | | | | | | | | Resolve "Filter bar height changes when items are added"Andrea Leone2018-09-111-2/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'Grzegorz Bizon2018-09-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project export broken when avatar is set" Closes #51318 See merge request gitlab-org/gitlab-ce!21649
| * | | | | | | fix avatar uploader errorJames Lopez2018-09-101-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Rails 5: fix issue move serviceJasper Maes2018-09-111-1/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | In rails 5, the attributes method for an enum returns the name instead of the database integer.
* | | | | | add tooltip directive from gitlab-uiSimon Knox2018-09-102-6/+4
| | | | | |
* | | | | | Synchronize the default branch when updating a remote mirrorDouglas Barbosa Alexandre2018-09-103-2/+10
| |/ / / / |/| | | |
* | | | | Merge branch '48902-fix-diff-vertical-alignment' into 'master'Annabel Dunstone Gray2018-09-101-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix vertical alignment of text in diffs Closes #48902 See merge request gitlab-org/gitlab-ce!21573
| * | | | Fix vertical alignment of text in diffsPaul Slaughter2018-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | - Adds changelog
View Lorry Controller Status