summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Postgres alignment padding – logic fixed:nik-doc-postgres-alignmentNikolay OOO Sep 14 / Moscow timezone Sep 15-222018-09-201-28/+45
| | | | | | | | | | | | | | | | | | | alignment padding is applied based on the next column's data type, so, for example, we cannot state that for "boolean" (1 byte of data), the alignment is not needed. This commit fixes the logic in the doc. Update ordering_table_columns.md Typos fixed more polishing of text Minor improvements of text style Get rid of two "following" words in one line, having different meanings More text style polishing according @eread's comments
* Merge branch 'docs/autodevops-admin' into 'master'Marcia Ramos2018-09-154-24/+58
|\ | | | | | | | | | | | | Document how to enable/disable Auto DevOps at the instance level Closes #49820 See merge request gitlab-org/gitlab-ce!21139
| * Document how to enable Auto DevOps at the instance levelAchilleas Pipinellis2018-09-144-24/+58
| |
* | Merge branch 'patch-29' into 'master'Stan Hu2018-09-151-0/+3
|\ \ | | | | | | | | | | | | Update command-line-commands.md to include an sample taskflow See merge request gitlab-org/gitlab-ce!21756
| * | Update command-line-commands.md to include an sample taskflowAmelia Bauerly2018-09-141-0/+3
|/ /
* | Merge branch 'docs/gb/improve-docs-about-ci-config-extends' into 'master'Achilleas Pipinellis2018-09-141-13/+15
|\ \ | | | | | | | | | | | | Improve docs about CI/CD config `extends` See merge request gitlab-org/gitlab-ce!21669
| * | Port 'include' in CI yaml docs from EEAchilleas Pipinellis2018-09-141-0/+181
| | |
| * | Copyedit extends CI yaml docsAchilleas Pipinellis2018-09-141-12/+13
| | |
| * | Make it more clear that `extends` behaves like inheritanceGrzegorz Bizon2018-09-111-1/+2
| | |
* | | Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-147-32/+318
|\ \ \ | | | | | | | | | | | | | | | | CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
| * | | Explicitly state that we're trying to prepend twiceLin Jen-Shin2018-09-111-3/+2
| | | |
| * | | Add a test for triggering MultiplePrependedBlocksLin Jen-Shin2018-09-111-0/+19
| | | |
| * | | Explain why we need locals again in let(:ce)Lin Jen-Shin2018-09-111-0/+1
| | | |
| * | | Following the feedbacksLin Jen-Shin2018-09-112-12/+37
| | | |
| * | | Explain why we need PrependableLin Jen-Shin2018-09-111-0/+8
| | | |
| * | | Fix how we use EE::ProtectedRefAccessLin Jen-Shin2018-09-112-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | This is a mess... Using prepend will give a different ancestors chain we're not expecting. To fix this we'll need to know what exactly methods we want to use in each classes using this module.
| * | | Preserve prepend semantics for RubyLin Jen-Shin2018-09-112-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | However we still want to make ClassMethods work! And we'll need to fix codes using the wrong include/prepend along the way. There were a lot of misuses.
| * | | Absorb the old testsLin Jen-Shin2018-09-111-0/+50
| | | |
| * | | Fix Override. Properly define prependedLin Jen-Shin2018-09-112-7/+11
| | | | | | | | | | | | | | | | We should never be sloppy!
| * | | Properly implement prepending for ConcernLin Jen-Shin2018-09-114-20/+197
| | | |
* | | | Merge branch 'danger-commit-count' into 'master'Robert Speicher2018-09-141-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax Danger requirements about changed lines Closes gitlab-org/release/framework#13 See merge request gitlab-org/gitlab-ce!21739
| * | | | Relax Danger requirements about changed linesYorick Peterse2018-09-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This relaxes the commit rules regarding the number of changed lines. Previously we required a detailed description if 20 or more lines were changed. Starting with this commit we change the rules so Danger only notifies you about writing a detailed description if: 1. A commit changes more than 3 files 2. The same commit changes more than 30 lines This should make it easier to do a find replace to fix a typo, without having to repeat what the subject line already says, while still reminding developers to write a detailed description for new features and other larger changes. Fixes https://gitlab.com/gitlab-org/release/framework/issues/13
* | | | | Merge branch 'update-gitlab-shell-8-3-3' into 'master'Stan Hu2018-09-142-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Shell to v8.3.3 See merge request gitlab-org/gitlab-ce!21750
| * | | | | Update GitLab Shell to v8.3.3Nick Thomas2018-09-142-1/+6
| | | | | |
* | | | | | Merge branch 'fix-rubocop-master-failures' into 'master'Robert Speicher2018-09-144-4/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up CI runner administration code See merge request gitlab-org/gitlab-ce!21741
| * | | | | | Cleaned up CI runner administration codeYorick Peterse2018-09-144-4/+30
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.
* | | | | | Merge branch 'remove-sidekiq' into 'master'Robert Speicher2018-09-145-12/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove peek-sidekiq Closes #51407 See merge request gitlab-org/gitlab-ce!21693
| * | | | | | Remove peek-sidekiqJan Provaznik2018-09-125-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for removing this gem is that it's not being maintained anymore. It uses `alias_method_chain` which is deprecated in rails 5 (and removed in 5.1), the issue is pending upstream (including a fix) - https://github.com/suranyami/peek-sidekiq/issues/3 for a while. Peek-sidekiq is used in performance bar for displaying sidekiq statistics.
* | | | | | | Merge branch 'sh-fix-multipart-upload-signed-urls' into 'master'Nick Thomas2018-09-143-3/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix object storage uploads not working with AWS v2 Closes gitlab-workhorse#181 See merge request gitlab-org/gitlab-ce!21731
| * | | | | | Fix object storage uploads not working with AWS v2Stan Hu2018-09-143-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we were passing query strings as symbols, the fog-aws storage driver was omitting the uploadId and partNumber query strings from the signature in multipart uploads. This fix makes AWS and Ceph work with v2 signatures. See: https://github.com/fog/fog-aws/blob/v3.0.0/lib/fog/aws/storage.rb#L733 Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/181
* | | | | | | Merge branch 'leipert-fix-karma-parsing' into 'master'Mike Greiling2018-09-142-4/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix karma junit result formatter See merge request gitlab-org/gitlab-ce!21744
| * | | | | | | Fix karma junit reports on CILukas Eipert2018-09-142-4/+3
| | | | | | | |
* | | | | | | | Merge branch 'leipert-typo-danger' into 'master'Yorick Peterse2018-09-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Danger message See merge request gitlab-org/gitlab-ce!21746
| * | | | | | | | Fix typo in Danger messageLukas Eipert2018-09-141-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '323-auto-devops-qa-spec-failing-prematurely' into 'master'Grzegorz Bizon2018-09-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent premature failure on AutoDevOps Pipeline Closes gitlab-qa#323 See merge request gitlab-org/gitlab-ce!21709
| * | | | | | | Prevent ADO failing prematurelyMayra Cabrera2018-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures code_quality job in Auto DevOps pipeline is disabled, as it takes too long and times out the test. Closes https://gitlab.com/gitlab-org/gitlab-qa/issues/323
* | | | | | | | Merge branch 'docs-gitlab-chart-contains-runner' into 'master'Achilleas Pipinellis2018-09-141-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bullet that the GitLab chart contains the runner See merge request gitlab-org/gitlab-ce!21733
| * | | | | | | | Add a bullet that the GitLab chart contains the runnerJoshua Lambert2018-09-131-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs-update-usersapi' into 'master'Achilleas Pipinellis2018-09-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a note about the case when reset_password is false See merge request gitlab-org/gitlab-ce!21738
| * | | | | | | | Adds a note about the case when reset_password is falseAlexander Tanayno2018-09-141-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '51412-username-alignment-issue-on-mr-page' into 'master'Annabel Dunstone Gray2018-09-143-2/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Username alignment issue on MR page" Closes #51412 See merge request gitlab-org/gitlab-ce!21697
| * | | | | | | | Resolve "Username alignment issue on MR page"Martin Wortschack2018-09-143-2/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-09-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | docs/ Grammatical Fix workflow.md See merge request gitlab-org/gitlab-ce!21655
| * | | | | | | docs/ Grammatical Fix workflow.mdCasey Burnett2018-09-141-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-id-vs-iid' into 'master'Marcia Ramos2018-09-142-21/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specificity and clarity for iid field in API documentation. Closes gitlab-ee#7019 See merge request gitlab-org/gitlab-ce!21490
| * | | | | | | Add prerequisite knowledge blurb and minor style fixes.Evan Read2018-09-111-3/+6
| | | | | | | |
| * | | | | | | Inline rather than reference links.Evan Read2018-09-071-6/+2
| | | | | | | |
| * | | | | | | More clarification. Replace inline hyperlinks with reference style.Evan Read2018-09-061-4/+8
| | | | | | | |
| * | | | | | | Fix content to align with style guide.Evan Read2018-09-051-5/+8
| | | | | | | |
| * | | | | | | More specificity and clarity for iid field in API documentation.Evan Read2018-09-042-17/+10
| | | | | | | |
View Lorry Controller Status