summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-0328-65/+178
| | | | | | | This will be necessary when adding gitaly settings. This version doesn't make any functional changes, but allows us to include this breaking change in 9.0 and add the needed extra settings in the future with backwards compatibility
* Merge branch '28865-filter-by-authorized-projects-in-v4' into 'master' Sean McGivern2017-03-036-25/+65
|\ | | | | | | | | | | | | Add filter param for user's authorized projects in V4 Closes #28865 See merge request !9674
| * Rename query parameter to `membership`28865-filter-by-authorized-projects-in-v4Toon Claes2017-03-036-14/+19
| | | | | | | | The query parameter `membership` should be more self-explaining.
| * Add filter param for authorized projects for current_user for V4Oswaldo Ferreira2017-03-035-22/+57
| |
* | Merge branch 'revert_disallow_system_notes_for_closed_issuables' into 'master' Sean McGivern2017-03-032-40/+0
|\ \ | | | | | | | | | | | | | | | | | | Revert "Disallow system notes for closed issuables" Closes #28207 See merge request !9673
| * | Revert "Disallow system notes for closed issuables"revert_disallow_system_notes_for_closed_issuablesFelipe Artur2017-03-022-40/+0
| | | | | | | | | | | | This reverts commit 0771774480ce1f46b27b629d3721917d6c1f1267.
* | | Merge branch '19497-hide-relevant-info-when-project-issues-are-disabled' ↵Sean McGivern2017-03-035-25/+106
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Hide issue info when project issues are disabled Closes #19497 See merge request !9083
| * | | Hide issue info when project issues are disabledGeorge Andrinopoulos2017-03-025-25/+106
| | | |
* | | | Merge branch '3440-remove-hsts-header-from-rails-app' into 'master' 13251-docs-on-searchMarin Jankovski2017-03-034-4/+31
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Stop setting Strict-Transport-Securty header from within the app See merge request !9341
| * | | Stop setting Strict-Transport-Securty header from within the appPaweł Chojnacki2017-03-034-4/+31
|/ / /
* | | Merge branch 'ee-comp-mr-2' into 'master' Sean McGivern2017-03-031-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Improve EE compatibility MR docs [ci skip] See merge request !9681
| * | | Improve EE compatibility MR docs [ci skip] ee-comp-mr-2Adam Niedzielski2017-03-031-1/+4
| | | | | | | | | | | | | | | | EE MR should be updated before CE MR is merged. Suggest using "git rerere".
* | | | Merge branch 'rs-dev-seed-time' into 'master' Sean McGivern2017-03-032-12/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `Gitlab::Seeder` monkey patch to disable mail delivery Closes #27609 See merge request !9678
| * | | | Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-timeRobert Speicher2017-03-022-12/+11
| | | | |
* | | | | Merge branch 'tooltip-hide-on-scroll' into 'master' Filipa Lacerda2017-03-032-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Hides the tooltip on scroll See merge request !9653
| * | | | | Hides the tooltip on scrolltooltip-hide-on-scrollPhil Hughes2017-03-022-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is especially obvious on mobile. The tooltip opens on tap but there is no way to hide it, so this hides the tooltip after scrolling.
* | | | | | Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master' Kamil Trzciński2017-03-033-25/+53
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612
| * | | | | Fix Rubocop offense in build retry servicefix/gb/fix-build-retry-tags-assignmentGrzegorz Bizon2017-03-021-1/+1
| | | | | |
| * | | | | Move unused consts from retry build service to specsGrzegorz Bizon2017-03-022-23/+22
| | | | | |
| * | | | | Improve build retry service tests for cloning dataGrzegorz Bizon2017-03-012-2/+13
| | | | | |
| * | | | | Fix runner tags assignment when retrying a jobGrzegorz Bizon2017-03-013-23/+41
| | | | | |
* | | | | | Merge branch '27532_api_changes' into 'master' Sean McGivern2017-03-038-17/+317
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use iids as filter parameter Closes #27532 See merge request !9096
| * | | | | | Use iids as filter parameterJarka Kadlecova2017-03-028-17/+317
| | | | | | |
* | | | | | | Merge branch '28935-make-logo-smaller' into 'master' Alfredo Sumaran2017-03-033-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease tanuki logo size Closes #28935 See merge request !9676
| * | | | | | | Decrease tanuki logo sizeAnnabel Dunstone Gray2017-03-023-4/+8
| | | | | | | |
* | | | | | | | Merge branch '28010-mr-merge-button-default-to-danger' into 'master' Alfredo Sumaran2017-03-039-35/+122
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to dangerous MR merge button Closes #28010 See merge request !9245
| * | | | | | | | Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-029-35/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9245
* | | | | | | | | Merge branch 'remove_group_policy_add_rules' into 'master' Douwe Maan2017-03-021-6/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove now unnecessary `additional_rules!` method from GroupPolicy See merge request !9595
| * | | | | | | | | Remove now unnecessary `additional_rules!` method from GroupPolicyDrew Blessing2017-02-281-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention was for this to be used to override group policy in EE. This led to all sort of strange problems in practice - for example, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1025 needed to override `owner` permissions, but `additional_rules!` passed `master` only. The better solution is to use an EE module to override the policy. Removing this now defunct method.
* | | | | | | | | | Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master' Robert Speicher2017-03-028-46/+52
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix creating a file in an empty repo using the API Closes #28626 See merge request !9632
| * | | | | | | | | | Delete hooks from project with empty repositorydm-fix-api-create-file-on-empty-repoDouwe Maan2017-03-021-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Don't require start branch to exist if we're just creating a new branchDouwe Maan2017-03-021-11/+7
| | | | | | | | | | |
| * | | | | | | | | | Fix specDouwe Maan2017-03-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix variable name and change copyDouwe Maan2017-03-012-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Fix creating a file in an empty repo using the APIDouwe Maan2017-03-017-44/+50
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '27978-improve-task-list-ux' into 'master' Clement Ho2017-03-023-4/+78
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add a newline in Markdown Editor if the current line is not empty Closes #27978 See merge request !9455
| * | | | | | | | | | | Only add a newline in Markdown Editor if the current line is not emptyJan Christophersen2017-03-023-4/+78
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'add-svg-loader' into 'master' Fatih Acet2017-03-0237-306/+156
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Tech debt: No need to pass svgs as props into Vue with Webpack Closes #27692 and #27840 See merge request !9522
| * | | | | | | | | | | | Changes after reviewadd-svg-loaderFilipa Lacerda2017-03-024-6/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into add-svg-loaderFilipa Lacerda2017-02-28149-710/+2008
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Left align logo; increase max width of title Add newline to end of frontend.md. Clone nested objects from default data. Checks if key is present before accessing it Update CHANGELOG.md for 8.17.1 Document use of AirBnb js styleguide and eslint. Don't allow a project to be shared with an ancestor of the group it is in Fix access to projects shared with a nested group Ignore builds dir when run rubocop check Remove hidden-xs classes from last columns in environments and pipelines table. Transform pipelines table css to match structure of pipelines table Make environments table overflow Use exceptions for MergeService error handling Clarify when to create EE compatibility MR in code review process New runner API returns 204 Backport new behavior to CI API Backport API to V3 Update documentation Return 204 for delete endpoints API project create: Make name or path required Only create unmergeable todos once Put back the new project button ...
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into add-svg-loaderFilipa Lacerda2017-02-2844-187/+508
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix migration without DOWNTIME clause specified Fix CSS classes fix missing @ symbol Update CHANGELOG.md for 8.16.7 Update CHANGELOG.md for 8.16.7 Update CHANGELOG.md for 8.16.7 Make RuboCop happy Add development fixtures for nested groups Align last column buttons with new environment button Removed jQuery UI draggable ensure webpack dev server proxy connects regardless of request headers Keep consistent in handling indexOf results Replace setInterval with setTimeout to prevent highly frequent requests Add feature specs for three types of user uploads Minor refactoring of Uploaders Fix #27840 - Improve the search bar experience on mobile Fix false positive caused by non-interpolated string use Fix inline comment images by removing wrapper #20890
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'add-svg-loader'Filipa Lacerda2017-02-2785-479/+1105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
| * | | | | | | | | | | | | | | Changes after review - adds alias for icons pathFilipa Lacerda2017-02-278-23/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix eslint errorFilipa Lacerda2017-02-251-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove unused testFilipa Lacerda2017-02-251-30/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into 'add-svg-loader'Filipa Lacerda2017-02-2549-834/+931
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
| * | | | | | | | | | | | | | | | Remove unneed codeFilipa Lacerda2017-02-251-13/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | remove tech debt codeFilipa Lacerda2017-02-258-77/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Load svgs in cycle analyticsFilipa Lacerda2017-02-259-21/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use vhtml only when necessaryFilipa Lacerda2017-02-254-7/+3
| | | | | | | | | | | | | | | | |
View Lorry Controller Status