summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Encrypt runners communication token in the databaseGrzegorz Bizon2018-11-205-7/+23
| * | | | | | | | | | Exclude runners tokens from GitLab project exportsGrzegorz Bizon2018-11-202-1/+5
| * | | | | | | | | | Improve specs for hiding runners tokens in tracesGrzegorz Bizon2018-11-202-26/+6
| * | | | | | | | | | Remove Rubocop override that is no longer necessaryGrzegorz Bizon2018-11-201-2/+0
| * | | | | | | | | | Reset insecure token when setting an encrypted oneGrzegorz Bizon2018-11-202-1/+7
| * | | | | | | | | | Find a runner using encrypted project / group tokensGrzegorz Bizon2018-11-201-2/+2
| * | | | | | | | | | Use falback to set token if encrypted field is missingGrzegorz Bizon2018-11-201-2/+8
| * | | | | | | | | | Do not raise if encrypted tokens field does not existGrzegorz Bizon2018-11-201-1/+12
| * | | | | | | | | | Encrypt group / project runners registration tokensGrzegorz Bizon2018-11-165-3/+29
| * | | | | | | | | | Add specs for token authenticable strategy factory methodGrzegorz Bizon2018-11-162-3/+35
| * | | | | | | | | | Refactor and simplify token authenticatable concernGrzegorz Bizon2018-11-151-6/+7
| * | | | | | | | | | Extract token authenticatable strategy fabricationGrzegorz Bizon2018-11-152-7/+12
| * | | | | | | | | | Encrypt new instance runners registration tokensGrzegorz Bizon2018-11-158-15/+46
| * | | | | | | | | | Add unit tests for encrypted token authenticatableGrzegorz Bizon2018-11-142-2/+53
| * | | | | | | | | | Add specs scaffold for encrypted token authenticatableGrzegorz Bizon2018-11-142-1/+21
| * | | | | | | | | | Remove text prepended to a class by a mistakeGrzegorz Bizon2018-11-141-2/+0
| * | | | | | | | | | Refactor token authenticatable encrypted strategyGrzegorz Bizon2018-11-142-13/+20
| * | | | | | | | | | Remove token_field_name method from base classGrzegorz Bizon2018-11-142-7/+3
| * | | | | | | | | | Do not use cleartext approach for encrypted tokensGrzegorz Bizon2018-11-131-8/+8
| * | | | | | | | | | Add `encrypted` strategy to persist encrypted tokensGrzegorz Bizon2018-11-131-0/+51
* | | | | | | | | | | Merge branch 'dm-update-batch-loader' into 'master'Stan Hu2018-12-044-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Update batch-loader dependencyDouwe Maan2018-12-044-6/+7
* | | | | | | | | | | Merge branch 'diff-fix-expanding' into 'master'Filipa Lacerda2018-12-045-2/+51
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Updated variable name to forceExpandedPhil Hughes2018-12-044-7/+7
| * | | | | | | | | | Fixed multiple diff line discussions not expandingPhil Hughes2018-12-045-2/+51
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'merge-train' into 'master'Rémy Coutable2018-12-043-177/+203
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated documentation of CE to EE mergesYorick Peterse2018-12-041-177/+106
| * | | | | | | | | | Automatically merge CE master into EE masterYorick Peterse2018-12-042-0/+97
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'amh-src-docs' into 'master'Achilleas Pipinellis2018-12-042-3/+393
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update installation from source guideAlex Hanselka2018-12-042-3/+393
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-fj-create-webide-terminal-service' into 'master'Douwe Maan2018-12-043-10/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CE port of Add new service to create the web ide terminalFrancisco Javier López2018-12-043-10/+34
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-7210-add-sort-direction-button-sort-dropdown' into 'master'Sean McGivern2018-12-042-1/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [CE backport]Add sort direction button with sort dropdown for epicsFelipe Artur2018-12-032-1/+28
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-12-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'patch-28'Rémy Coutable2018-12-046561-79017/+391515
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Added a Hebrew proofreaderYaron Shahrabani2018-09-211-0/+2
* | | | | | | | | | | Merge branch 'fix-multiple-comments-shade-overlap' into 'master'Fatih Acet2018-12-042-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix multiple commits shade overlapping vertical discussion lineAnnabel Dunstone Gray2018-12-042-2/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '54825-fix-ci-asset-typo' into 'master'Rémy Coutable2018-12-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixes a typo that prevented assets from being properly compiledDJ Mountney2018-12-041-1/+1
* | | | | | | | | | | Merge branch 'ce-jej/group-saml-metadata-endpoint' into 'master'Kamil Trzciński2018-12-042-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | TokenAuthenticatable provides comparison methodJames Edwards-Jones2018-12-031-0/+5
| * | | | | | | | | | | Backport stub_default_url_options from EEJames Edwards-Jones2018-12-031-0/+5
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'check-unique-values-of-pipeline-enum' into 'master'Kamil Trzciński2018-12-0423-0/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix coding offenceShinya Maeda2018-12-0414-28/+28
| * | | | | | | | | | | Merge branch 'master-ce' into check-unique-values-of-pipeline-enumShinya Maeda2018-12-0494-355/+982
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | fix wordingShinya Maeda2018-12-0323-23/+23
| * | | | | | | | | | | Fix the coding styleShinya Maeda2018-12-0317-33/+34
| * | | | | | | | | | | Another fixShinya Maeda2018-12-033-7/+7