summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Postgres alignment padding – logic fixed:nik-doc-postgres-alignmentNikolay OOO Sep 14 / Moscow timezone Sep 15-222018-09-201-28/+45
* Merge branch 'docs/autodevops-admin' into 'master'Marcia Ramos2018-09-154-24/+58
|\
| * 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 taskflowAmelia Bauerly2018-09-141-0/+3
|/ /
* | Merge branch 'docs/gb/improve-docs-about-ci-config-extends' into 'master'Achilleas Pipinellis2018-09-141-13/+15
|\ \
| * | 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
|\ \ \
| * | | 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
| * | | Preserve prepend semantics for RubyLin Jen-Shin2018-09-112-36/+41
| * | | Absorb the old testsLin Jen-Shin2018-09-111-0/+50
| * | | Fix Override. Properly define prependedLin Jen-Shin2018-09-112-7/+11
| * | | 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 linesYorick Peterse2018-09-141-2/+7
* | | | | Merge branch 'update-gitlab-shell-8-3-3' into 'master'Stan Hu2018-09-142-1/+6
|\ \ \ \ \
| * | | | | 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 codeYorick Peterse2018-09-144-4/+30
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'remove-sidekiq' into 'master'Robert Speicher2018-09-145-12/+5
|\ \ \ \ \ \
| * | | | | | Remove peek-sidekiqJan Provaznik2018-09-125-12/+5
* | | | | | | Merge branch 'sh-fix-multipart-upload-signed-urls' into 'master'Nick Thomas2018-09-143-3/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix object storage uploads not working with AWS v2Stan Hu2018-09-143-3/+18
* | | | | | | Merge branch 'leipert-fix-karma-parsing' into 'master'Mike Greiling2018-09-142-4/+3
|\ \ \ \ \ \ \
| * | | | | | | 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 messageLukas Eipert2018-09-141-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '323-auto-devops-qa-spec-failing-prematurely' into 'master'Grzegorz Bizon2018-09-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Prevent ADO failing prematurelyMayra Cabrera2018-09-131-0/+1
* | | | | | | | Merge branch 'docs-gitlab-chart-contains-runner' into 'master'Achilleas Pipinellis2018-09-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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"Martin Wortschack2018-09-143-2/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-09-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | docs/ Grammatical Fix workflow.mdCasey Burnett2018-09-141-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'fix-id-vs-iid' into 'master'Marcia Ramos2018-09-142-21/+20
|\ \ \ \ \ \ \
| * | | | | | | 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