summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '50879-unused-css-container-fluid' into 'master'Dmitriy Zaporozhets2018-09-041-5/+0
|\ | | | | | | | | | | | | Unused CSS part exists in mobile CSS framework Closes #50879 See merge request gitlab-org/gitlab-ce!21439
| * Remove unused CSS part in mobile frameworkTakuya Noguchi2018-08-301-5/+0
| |
* | Merge branch 'sh-set-secure-cookies' into 'master'Rémy Coutable2018-09-043-5/+19
|\ \ | | | | | | | | | | | | | | | | | | Set issuable_sort and diff_view cookies to secure when possible Closes #49120 See merge request gitlab-org/gitlab-ce!21442
| * | Set issuable_sort and diff_view cookies to secure when possibleStan Hu2018-09-033-5/+19
| | | | | | | | | | | | Closes #49120
* | | Uploads to wiki stored inside the wiki git repositoryFrancisco Javier López2018-09-046-38/+85
| | |
* | | Merge branch '_acet-disable-ide-button' into 'master'Tim Zallmann2018-09-041-10/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disable Web IDE button if user is not allowed to push the source branch. Closes #45026 See merge request gitlab-org/gitlab-ce!21288
| * | | Disable Web IDE button if user is not allowed to push the source branch.Fatih Acet2018-09-031-10/+32
| |/ /
* | | Merge branch '50101-add-artifact-information-to-job-api' into 'master'Kamil Trzciński2018-09-041-0/+22
|\ \ \ | | | | | | | | | | | | | | | | Add artifact information in job API See merge request gitlab-org/gitlab-ce!21328
| * | | Add artifact information for job controllerSteve Azzopardi2018-09-031-0/+22
| | | | | | | | | | | | | | | | gitlab-org/gitlab-ce#50101
* | | | Move badge settings to general settingsWinnie Hellmann2018-09-0314-95/+107
| | | |
* | | | Merge branch 'fix-download-dropdown-link' into 'master'Nick Thomas2018-09-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide PAT creation advice for HTTP clone if PAT exists Closes #44111 See merge request gitlab-org/gitlab-ce!18208
| * | | | Hide PAT creation advice for HTTP clone if PAT existGeorge Thomas2018-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | If the user has a active Personal Access Token, hide the help text that appears when selecting the link for HTTP clone
* | | | | Added atom feed for tagsFrancisco Javier López2018-09-034-0/+35
| | | | |
* | | | | Merge branch 'issue_48084' into 'master'Sean McGivern2018-09-036-4/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a serializer to render diff lines Closes #48084 See merge request gitlab-org/gitlab-ce!21260
| * | | | | Use a serializer to render diff linesFelipe Artur2018-08-316-4/+29
| |/ / / /
* | | | | Merge branch 'rs-haml-lint-useless-assignment' into 'master'Sean McGivern2018-09-0324-35/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable `Lint/UselessAssignment` for haml-lint See merge request gitlab-org/gitlab-ce!21457
| * | | | | Correct remaining `Lint/UselessAssignment` haml-lint violationsRobert Speicher2018-08-3121-30/+0
| | | | | |
| * | | | | Fix incorrect `page_title`, `nav`, and `header_title` usage in viewsRobert Speicher2018-08-313-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19766, several usages of these helper methods were mistakenly changed to instead assign to a (completely unused) local variable. When `page_title` was misused, for example, this resulted in the page no longer having a custom title set.
* | | | | Merge branch 'sh-fix-dedupe-group-importer' into 'master'Rémy Coutable2018-09-031-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix importers not assigning a new default group Closes #50110 See merge request gitlab-org/gitlab-ce!21456
| * | | | Fix importers not assigning a new default groupStan Hu2018-08-311-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bitbucket Server as well as other importers pass in a group name to be created (assuming the user has permission) and attempt to dedupe that with an existing group. However, the group *name* is not guaranteed to be unique, but the *path* is. Closes #50110
* | | | Adds Vuex store for the job log page🌴🌴 Filipa Lacerda - OOO back on September 17th 🌴🌴2018-09-036-1/+355
| |/ / |/| |
* | | Merge branch 'sh-fix-confidential-note-option' into 'master'Robert Speicher2018-08-311-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix "Confidential comments" button not saving in project hooks Closes #50440 See merge request gitlab-org/gitlab-ce!21289
| * | Fix "Confidential comments" button not saving in project hookssh-fix-confidential-note-optionStan Hu2018-08-171-0/+1
| | | | | | | | | | | | Closes #50440
* | | Merge branch 'remove-background-migration-worker-feature-flag' into 'master'Douwe Maan2018-08-311-13/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove feature flag from BackgroundMigrationWorker See merge request gitlab-org/gitlab-ce!21404
| * | | Remove feature flag from BackgroundMigrationWorkerYorick Peterse2018-08-281-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | The feature has been running on GitLab.com for a while now, without any problems. This commit removes the eature flag, and enables the feature for all users.
* | | | Merge branch '37356-relative-submodule-link' into 'master'Douwe Maan2018-08-311-17/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix git submodule link for subgroup projects with relative path Closes #37356 See merge request gitlab-org/gitlab-ce!21154
| * | | | Allow resolving git submodule url for subgroup projects using relative path37356-relative-submodule-linkMark Chao2018-08-201-17/+20
| | | | |
* | | | | Merge branch 'ide-row-hover-scroll' into 'master'Filipa Lacerda2018-08-311-5/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed IDE file row jumping into view on hover Closes #50751 See merge request gitlab-org/gitlab-ce!21403
| * | | | | Fixed IDE file row jumping into view on hoverPhil Hughes2018-08-311-5/+7
| | |_|_|/ | |/| | | | | | | | | | | | | Closes #50751
* | | | | Resolve "Persistent banner creates problem for web ide"Paul Slaughter2018-08-317-67/+53
| | | | |
* | | | | Merge branch 'update-padding-markdown' into 'master'Phil Hughes2018-08-313-5/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Increase padding in markdown code blocks See merge request gitlab-org/gitlab-ce!21433
| * | | | | Increase padding in markdown code blocksAnnabel Dunstone Gray2018-08-303-5/+2
| | | | | |
* | | | | | Fix IDE avatar flex sizing stylePaul Slaughter2018-08-301-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'ide-multiple-file-uploads' into 'master'Filipa Lacerda2018-08-301-6/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled multiple uploads in the Web IDE Closes #50405 See merge request gitlab-org/gitlab-ce!21412
| * | | | | Enabled multiple uploads in the Web IDEPhil Hughes2018-08-291-6/+2
| |/ / / / | | | | | | | | | | | | | | | Closes #50405
* | | | | Merge branch '47943-project-milestone-page-deprecation-message' into 'master'Filipa Lacerda2018-08-302-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show deprecation message on project milestone page for category tabs Closes #47943 See merge request gitlab-org/gitlab-ce!21236
| * | | | | Add milestone tabs deprecation viewKushal Pandya2018-08-281-0/+1
| | | | | |
| * | | | | Project Milestone Tabs Deprecation PartialKushal Pandya2018-08-281-0/+7
| | | | | |
* | | | | | Allow whitelisting for "external collaborator by default" settingRoger Rüttimann2018-08-3010-1/+140
| | | | | |
* | | | | | Fixed project logo when it is LFS trackedFrancisco Javier López2018-08-305-68/+73
| | | | | |
* | | | | | Merge branch ↵Sean McGivern2018-08-301-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41292-users-stuck-on-a-redirect-loop-after-transferring-project' into 'master' Resolve "Users stuck on a redirect loop after transferring project" Closes #41292 See merge request gitlab-org/gitlab-ce!21408
| * | | | | | fix path bug and update specsJames Lopez2018-08-301-1/+1
| | | | | | |
| * | | | | | Fix transfer project redirect loopJames Lopez2018-08-291-2/+3
| | | | | | |
* | | | | | | Merge branch '50414-rubocop-rule-to-enforce-class-methods-over-module' into ↵Sean McGivern2018-08-3020-20/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Make a Rubocop cop to prefer class_methods over ClassMethods for ActiveSupport::Concern" Closes #50414 See merge request gitlab-org/gitlab-ce!21379
| * | | | | | | Updates code using class_methods over module ClassMethodsJacopo2018-08-2920-20/+20
| | |_|/ / / / | |/| | | | |
* | | | | | | Updates hint text for merging branches locally.Pradyumna2018-08-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Hint essentially states that a user should first update their target branch with upstream changes and then perform the merge.
* | | | | | | Fix Emojis cutting in the right wayAlexander Popov2018-08-292-2/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Fix #47913 (again), revert !21180, fix regression of !8652, improve !20137
* | | | | | Warn to console, not flash, when performance bar failsSean McGivern2018-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This isn't interesting most of the time and is may go over other flash banners.
* | | | | | Ignore API requests in performance barSean McGivern2018-08-291-6/+15
|/ / / / / | | | | | | | | | | | | | | | These don't have performance data saved as they use Grape.
* | | | | [master] Missing CSRF in System Hooks resend actionFrancisco Javier López2018-08-282-3/+2
| | | | |