summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prioritize group settings, improve panel titles, disable submit without changesLuke Bennett2018-10-1534-112/+494
|
* Merge branch ↵Phil Hughes2018-10-156-15/+72
|\ | | | | | | | | | | | | | | | | '52564-personal-projects-pagination-in-profile-overview-tab-is-broken' into 'master' Resolve "Personal projects pagination in Profile Overview tab is broken" Closes #52564 See merge request gitlab-org/gitlab-ce!22321
| * Resolve "Personal projects pagination in Profile Overview tab is broken"Martin Wortschack2018-10-156-15/+72
|/
* Update CHANGELOG.md for 11.3.5GitLab Release Tools Bot2018-10-153-10/+8
| | | [ci skip]
* Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'Grzegorz Bizon2018-10-152-1/+26
|\ | | | | | | | | | | | | Send deployment_status when job starts environment Closes #52614 See merge request gitlab-org/gitlab-ce!22354
| * Send deployment_status when job starts environmentSteve Azzopardi2018-10-152-1/+26
| | | | | | | | | | | | | | | | | | The check was if the job `has_environment` which results into showing the environment information when the job stops the environment. This result into having a blank `deployment_status`. Use `starts_environment?` to be the same as the haml we have in 11.3 https://gitlab.com/gitlab-org/gitlab-ce/blob/30f019dca78bb64bcb8b355a267be006884e6d8f/app/views/projects/jobs/show.html.haml#L28
* | Merge branch 'gitaly-0.125.1' into 'master'James Lopez2018-10-151-1/+1
|\ \ | | | | | | | | | | | | Use Gitaly 0.125.1 See merge request gitlab-org/gitlab-ce!22364
| * | Use Gitaly 0.125.1Jacob Vosmaer2018-10-151-1/+1
| | |
* | | Merge branch 'docs-fix-table-api-settings' into 'master'Achilleas Pipinellis2018-10-151-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Docs: fix table on API settings Closes gitlab-com/gitlab-docs#234 See merge request gitlab-org/gitlab-ce!22083
| * | Docs: fix table on API settingsMarcia Ramos2018-10-151-0/+4
|/ /
* | Merge branch 'docs-update-maintenance-path-ck' into 'master'Achilleas Pipinellis2018-10-151-1/+2
|\ \ | | | | | | | | | | | | Update docs maintenance upgrade path examples See merge request gitlab-org/gitlab-ce!22360
| * | Update docs maintenance upgrade path examplesChenjerai Katanda2018-10-151-1/+2
|/ /
* | Merge branch 'winh-development-guide-docs' into 'master'Achilleas Pipinellis2018-10-151-1/+1
|\ \ | | | | | | | | | | | | Adjust link to docs development guide See merge request gitlab-org/gitlab-ce!22288
| * | Adjust link to docs development guideWinnie Hellmann2018-10-151-1/+1
|/ /
* | Merge branch 'docs-improve-contributing-guide' into 'master'Achilleas Pipinellis2018-10-158-337/+188
|\ \ | | | | | | | | | | | | Improve the contributing documentation See merge request gitlab-org/gitlab-ce!22291
| * | Improve the contributing documentationRémy Coutable2018-10-118-337/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes duplicated content from CONTRIBUTING.md and consolidate everything under doc/development/contributing/. This also fixes missing links. Lastly, this moves the style guides from the "Implement design & UI elements" page to a new "Style guides" page. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'sh-add-deploy-token-qa' into 'master'Rémy Coutable2018-10-158-9/+152
|\ \ \ | | | | | | | | | | | | | | | | Add GitLab QA spec for adding a deploy token See merge request gitlab-org/gitlab-ce!22207
| * | | Add GitLab QA spec for adding a deploy tokenStan Hu2018-10-128-9/+152
| | | |
* | | | Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes2018-10-151-1/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work" See merge request gitlab-org/gitlab-ce!22303
| * | | | Backport EE fixes to CE checking resolvabilityAndré Luís2018-10-111-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE branch: 7921-fix-batch-comments-resolution fixes the checks to know whether discussion will be resolved upon posting a comment or not. It covers scenarios where Batch Comments are enabled and disabled. To minimise risk of conflicts between CE and EE, the checks have been backported. this.shouldResolve() will not exist in CE.
* | | | | Merge branch 'improve-spec-for-gitlab-ci-status-pipeline-factory' into 'master'Grzegorz Bizon2018-10-151-19/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve spec for Gitlab::Ci::Status::Pipeline::Factory Closes #52280 See merge request gitlab-org/gitlab-ce!22247
| * | | | | Improve spec for Gitlab::Ci::Status::Pipeline::FactoryShinya Maeda2018-10-101-19/+49
| | | | | |
* | | | | | Merge branch 'enable-frozen-string-lib-gitlab' into 'master'Rémy Coutable2018-10-1554-3/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable some frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22304
| * | | | | | Enable some frozen string in lib/gitlabgfyoung2018-10-1354-3/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string for the following files: * lib/gitlab/auth/**/*.rb * lib/gitlab/badge/**/*.rb * lib/gitlab/bare_repository_import/**/*.rb * lib/gitlab/bitbucket_import/**/*.rb * lib/gitlab/bitbucket_server_import/**/*.rb * lib/gitlab/cache/**/*.rb * lib/gitlab/checks/**/*.rb Partially addresses #47424.
* | | | | | | Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'Sean McGivern2018-10-155-2/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show canary / no-canary in the performance bar" Closes #52421 See merge request gitlab-org/gitlab-ce!22222
| * | | | | | | Show if the host is a canary host in the perf barSean McGivern2018-10-125-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the request came from a canary host, show this in the performance bar by: 1. Adding a bird emoji. 2. Colouring the hostname yellow.
* | | | | | | | Merge branch '48889-message-for-were-merged-into' into 'master'Phil Hughes2018-10-153-12/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display merge commit SHA when it exists Closes #48889 See merge request gitlab-org/gitlab-ce!22022
| * | | | | | | | Only display merge commit SHA when it existsMark Chao2018-10-153-12/+29
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-151-20/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml for current stable SDK See merge request gitlab-org/gitlab-ce!22336
| * | | | | | | | Update Android.gitlab-ci.yml for current stable SDKOsama Bin Omar2018-10-131-20/+20
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs-link-development-policies' into 'master'Evan Read2018-10-151-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Link to DeclarativePolicy framework from development guide See merge request gitlab-org/gitlab-ce!22348
| * | | | | | | | Link to DeclarativePolicy page from /developmentThong Kuah2018-10-151-0/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-bad-links-1' into 'master'Evan Read2018-10-147-13/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fixing some bad links See merge request gitlab-org/gitlab-ce!22287
| * | | | | | | | Docs: Fixing some bad linksMarcel Amirault2018-10-147-13/+12
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-dupilicate-key-license-management' into 'master'Dmitriy Zaporozhets2018-10-132-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicated key in license management job gitlab-org/gitlab-ce#52609 Closes #52609 See merge request gitlab-org/gitlab-ce!22311
| * | | | | | | add changelog entryAdam Lemanski2018-10-131-0/+5
| | | | | | | |
| * | | | | | | fix duplicated key in license management job gitlab-org/gitlab-ce#52609Adam Lemanski2018-10-121-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'bw-fix-unicorn-rubocop' into 'master'Robert Speicher2018-10-122-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop complaining about unicorn.rb See merge request gitlab-org/gitlab-ce!22332
| * | | | | | | Fix rubocop complaining about unicorn.rbBrett Walker2018-10-122-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'jr-merge-file-tree-docs' into 'master'Marcia Ramos2018-10-122-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request diff navigation docs See merge request gitlab-org/gitlab-ce!22275
| * | | | | | | | Update merge request diff navigation docsJames Ramsay2018-10-122-3/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-go1.10' into 'master'Marcia Ramos2018-10-121-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for Go 1.9 in GitLab 11.4 Closes #51982 See merge request gitlab-org/gitlab-ce!22324
| * | | | | | | Drop support for Go 1.9 in GitLab 11.4Jacob Vosmaer2018-10-121-2/+2
| | | | | | | |
* | | | | | | | Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-124-9/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
| * | | | | | | | Updates the check for started in job headerFilipa Lacerda2018-10-124-9/+14
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function that was checking if the job was started or not was expecting a boolean, however it was receiving a null. During the refactor the condition was changed, causing the function to break with null This commit fixes the check
* | | | | | | | Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' ↵Tim Zallmann2018-10-1213-51/+79
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add stage name in job.json response Closes #52618 See merge request gitlab-org/gitlab-ce!22317
| * | | | | | | | Add stage name in job.json responseSteve Azzopardi2018-10-1213-51/+79
|/ / / / / / / /
* | | | | | | | Merge branch '52512-fix-event-api-docs' into 'master'Robert Speicher2018-10-121-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the event API docs Closes #52512 See merge request gitlab-org/gitlab-ce!22320
| * | | | | | | Fix the event API docsNick Thomas2018-10-121-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '5781-operations-homepage-mvc' into 'master'Sean McGivern2018-10-129-23/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport CE changes for Ops Dashboard in EE See merge request gitlab-org/gitlab-ce!22136
View Lorry Controller Status