summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'patch-issue-#56683' into 'master'57086-metrics-empty-state-shows-on-cluster-metrics-chartsDouwe Maan2019-06-133-7/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Process up to 100 commit messages for references when pushing to a new default branch See merge request gitlab-org/gitlab-ce!29511
| * | | | | | | Modify the branch hooks spec to expect processing of commit messagesFabio Papa2019-06-133-7/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit messages are not processed for references to issues when creating the default branch on push. This was expected behavior (probably to avoid performance problems when first pushing a repository with thousands of commits). However, this is not an issue because we always limit the number of commits to process to 100 regardless of whether we are creating the default branch or not.
* | | | | | | Merge branch 'add-missing-env-vars-to-sast-docker' into 'master'Bob Van Landuyt2019-06-132-3/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Bring propagated SAST ENV vars into parity with docs See merge request gitlab-org/gitlab-ce!29564
| * | | | | | Update merge request to CE IDadd-missing-env-vars-to-sast-dockerAvielle Wolfe2019-06-121-1/+1
| | | | | | |
| * | | | | | Move SAST docker changes to CEAvielle Wolfe2019-06-122-3/+18
| | | | | | |
* | | | | | | Merge branch '12106-sp-ce' into 'master'Phil Hughes2019-06-132-0/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves sp.js to CE repo Closes gitlab-ee#12106 See merge request gitlab-org/gitlab-ce!29545
| * | | | | | | Moves sp.js to CE repo12106-sp-ceFilipa Lacerda2019-06-122-0/+27
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Removes ce to ee differences for snowplow file
* | | | | | | Merge branch ↵Kamil Trzciński2019-06-138-33/+100
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibility' into 'master' Review roulette excludes mr_author Closes #61157 See merge request gitlab-org/gitlab-ce!28886
| * | | | | | Excludes MR author from Review roulette61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibilityJacopo2019-06-128-33/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Excludes MR author from gitlab_ui and single_codebase Review roulette results.
* | | | | | | Merge branch '11989-track-clicks-on-sign_in-with-snowplow' into 'master'Phil Hughes2019-06-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add trackEvent when accessing the Register tab See merge request gitlab-org/gitlab-ce!29336
| * | | | | | | Add trackEvent when accessing the Register tabAsh McKenzie2019-06-131-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | This is a no-op for CE.
* | | | | | | Merge branch 'ntepluhina-master-patch-46554' into 'master'Phil Hughes2019-06-131-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added naming convention for .graphql files See merge request gitlab-org/gitlab-ce!29558
| * | | | | | | Added naming convention for .graphql filesNatalia Tepluhina2019-06-131-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'docs/quote-redirect' into 'master'Achilleas Pipinellis2019-06-131-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quotes to redirect value Closes #63165 See merge request gitlab-org/gitlab-ce!29584
| * | | | | | Add quotes to redirect valueEvan Read2019-06-131-1/+1
|/ / / / / /
* | | | | | Merge branch 'docs/dependency-proxy-permissions' into 'master'Evan Read2019-06-131-15/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dependency proxy to permissions.md Closes gitlab-ee#12075 See merge request gitlab-org/gitlab-ce!29497
| * | | | | | Add dependency proxy to permissions.mddocs/dependency-proxy-permissionsDmitriy Zaporozhets2019-06-111-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'docs-its-relative-7' into 'master'Evan Read2019-06-1318-57/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Convert absolute links to relative in /ci docs See merge request gitlab-org/gitlab-ce!29029
| * | | | | | | Convert absolute links to relative in /ci docsMarcel Amirault2019-06-1118-57/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix more links after review Update redirect_from link Apply suggestion to doc/ci/introduction/index.md Apply suggestion to doc/ci/README.md Apply suggestion to doc/ci/README.md Make front matter redirect_from links absolute Change front matter to fix discus comments
* | | | | | | | Merge branch 'docs/make-it-clear-about-after-script-context' into 'master'Evan Read2019-06-132-4/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave clear notices in docs about after_script execution context Closes gitlab-runner#4146 See merge request gitlab-org/gitlab-ce!29510
| * | | | | | | | Leave clear notices about after_script execution contextdocs/make-it-clear-about-after-script-contextTomasz Maczukin2019-06-122-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We frequently see new issues mentioning that something defined in `before_script` or `script` doesn't work with `after_script`. Our documentation mentions that first two are concatenated and executed together, why the third one is executed in a separated shell context. But it looks like it's not clear enough. Since this misunderstanding of how scripts are being executed is repeated frequently, let's make it more clear in docs.
* | | | | | | | | Merge branch 'docs/remove_duplicate_scoped_labels_description' into 'master'Evan Read2019-06-131-4/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate content on scoped labels See merge request gitlab-org/gitlab-ce!29579
| * | | | | | | | | Removed duplicate content on scoped labelsRussell Dickenson2019-06-131-4/+0
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-debug-review-apps-infrastructure-issues' into 'master'Mark Lapierre2019-06-121-2/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to troubleshoot a pending external-dns deployment See merge request gitlab-org/gitlab-ce!29290
| * | | | | | | | | Document how to troubleshoot a pending external-dns deploymentRémy Coutable2019-06-121-2/+74
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the Review Apps node pools description Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'docs/suggest-views-methods-to-be-added-alphabetically' into ↵Mark Lapierre2019-06-121-20/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update quick start guide doc to suggest views and methods to be defined in alphabetical order Closes #62505 See merge request gitlab-org/gitlab-ce!29499
| * | | | | | | | | Update guide with alphabetical order styleWalmyr2019-06-121-20/+22
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62505
* | | | | | | | | Merge branch 'qa-nightly-107-fix-comment-on-issue-ce' into 'master'Mark Lapierre2019-06-123-5/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Comment will select all activites filter by default" See merge request gitlab-org/gitlab-ce!29496
| * | | | | | | | Comment will select all activites filter by defaultqa-nightly-107-fix-comment-on-issue-ceSanad Liaquat2019-06-113-5/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/add-selected-youtube-videos' into 'master'Marcia Ramos2019-06-122-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to select YouTube videos demonstrating GitLab features to docs See merge request gitlab-org/gitlab-ce!29562
| * | | | | | | | | Add links to select YouTube videos demonstrating GitLab features to docsMike Lewis2019-06-122-0/+4
|/ / / / / / / / /
* | | | | | | | | Merge branch 'remove-grafana-dashboard-link-feature-flag' into 'master'Mike Greiling2019-06-125-58/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the grafana_dashboard_link feature flag See merge request gitlab-org/gitlab-ce!29344
| * | | | | | | | | Remove the grafana_dashboard_link feature flagReuben Pereira2019-06-125-58/+21
|/ / / / / / / / /
* | | | | | | | | Merge branch '62134-fix-non-wraping-project-description' into 'master'Clement Ho2019-06-122-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding break-word css to home-panel-description class to correctly word wrap long words Closes #62134 See merge request gitlab-org/gitlab-ce!28695
| * | | | | | | | | Adding break-word css to home-panel-description class to correctly word wrap ↵Erik van der Gaag2019-06-122-1/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | long words
* | | | | | | | | Merge branch 'ce-11629-notify-users-when-their-ci-minutes-quota-has-run-out' ↵Mayra Cabrera2019-06-123-1/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport of gitlab-ee!13735 See merge request gitlab-org/gitlab-ce!29289
| * | | | | | | | | Backport of gitlab-ee!13735Rubén Dávila2019-06-123-1/+22
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Annabel Dunstone Gray2019-06-121-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view' into 'master' Resolve "Visual regression in 12.0: line numbers not lining up in file view" Closes #63010 See merge request gitlab-org/gitlab-ce!29403
| * | | | | | | | | Align line numbers for non-default font size63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-viewSimon Knox2019-06-101-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-fix-resolve-button-not-available' into 'master'Fatih Acet2019-06-123-3/+79
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Resolve conflicts" button not appearing for some users Closes #47954 See merge request gitlab-org/gitlab-ce!29535
| * | | | | | | | | | Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-113-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the frontend assumed that the user had to be able to merge to that project in order to resolve conflicts. However, this is overly restrictive, as the user only has to be able to push to the source branch. In fact, appending the text /conflicts to the merge request would bring up the conflict resolution page. This confusion happens when a project contains a protected branch that only allows maintainers to push. Users with Developer access no longer have permission to merge, but they still can create branches in that project. To fix this issue, we now loosen the permission check for the "Resolve conflicts" button and only check for access to push to the source branch. This is consistent with what the backend does in MergeRequests::Conflicts::ListService#can_be_resolved_by?. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
* | | | | | | | | | | Merge branch 'ealcantara-popover-styling' into 'master'Annabel Dunstone Gray2019-06-127-43/+93
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style popovers according to the design specs See merge request gitlab-org/gitlab-ce!28375
| * | | | | | | | | | | Nest category-icon inside .user-popoverealcantara-popover-stylingEnrique Alcantara2019-06-071-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Cleanup deprecation message popoverEnrique Alcantara2019-06-073-25/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Extract user-popover stylesEnrique Alcantara2019-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate use-case specific user-popover styles from general popover styles.
| * | | | | | | | | | | Address feature highlight popover inconsistenciesEnrique Alcantara2019-06-073-6/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Style popovers according to the design specsEnrique Alcantara2019-06-074-15/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Apply new styles for header, padding, border, and fonts - Remove bootstrap 3 backward compat code
* | | | | | | | | | | | Merge branch 'sh-update-openid-omniauth-gem' into 'master'Douglas Barbosa Alexandre2019-06-124-17/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump omniauth_openid_connect to 0.3.1 See merge request gitlab-org/gitlab-ce!29387
| * | | | | | | | | | | | Bump omniauth_openid_connect to 0.3.1sh-update-openid-omniauth-gemStan Hu2019-06-084-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/issues/62208, users were seeing 404 errors when they configured their OpenID provider without a name parameter since OmniAuth would use the name `openidconnect` instead `openid_connect`. https://github.com/m0n9oose/omniauth_openid_connect/pull/23 makes the default parameter `openid_connect` so this additional initializer in GitLab is not necessary. Plus, this change enables users to use multiple OpenID Connect providers if they desire.
* | | | | | | | | | | | | Merge branch 'jc-migration-for-source-project-id' into 'master'Andreas Brandl2019-06-123-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix null source_project_id in pool_repositories Closes gitaly#1653 See merge request gitlab-org/gitlab-ce!29157