| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix some stuffwinh-jsdoc | Winnie Hellmann | 2018-12-05 | 18 | -10/+80 |
| | | |||||
| * | Merge branch 'ce-jej/group-saml-unlink-from-account' into 'master' | Stan Hu | 2018-12-04 | 4 | -5/+18 |
| |\ | | | | | | | | | [CE] Backport GroupSAML unlink changes See merge request gitlab-org/gitlab-ce!23536 | ||||
| | * | Replace @user with current_user on Account page | James Edwards-Jones | 2018-12-04 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | Previously we used @user, but this changed to local_assigns[:user] so we could pass a second variable to the view from an EE module Since we were already using current_user librally there it makes sense to replace the remaining usages. See: https://docs.gitlab.com/ee/development/module_with_instance_variables.html | ||||
| | * | Backport GroupSAML unlink changes | James Edwards-Jones | 2018-12-04 | 4 | -5/+19 |
| | | | | | | | | | | | | | | | | | | | - Improves spacing between account buttons on Profile - AccountsController#show uses locals instead of instance variables - New `display_providers_on_profile?` helper method - Adds `render_if_exists` for GroupSAMl unlink buttons See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8682 | ||||
| * | | Merge branch 'gt-remove-pronunciation-tip-for-knative' into 'master' | Mike Greiling | 2018-12-04 | 1 | -5/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | Remove pronunciation tip for knative Closes #54724 See merge request gitlab-org/gitlab-ce!23549 | ||||
| | * | | Remove pronunciation tip for knative | George Tsiolis | 2018-12-04 | 1 | -5/+4 |
| | | | | |||||
| * | | | Merge branch 'fix/gb/encrypt-runners-tokens' into 'master' | Nick Thomas | 2018-12-04 | 7 | -23/+152 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Encrypt runners tokens Closes #51232 and #52931 See merge request gitlab-org/gitlab-ce!23412 | ||||
| | * | | | Fix typo in encrypted token authenticatable strategy | Grzegorz Bizon | 2018-12-04 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into ↵ | Grzegorz Bizon | 2018-12-04 | 101 | -699/+1078 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/encrypt-runners-tokens * commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81': (101 commits) | ||||
| | * | | | | Fix token_set? method by checking migration status | Grzegorz Bizon | 2018-12-04 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | Use plaintext token when migration is not complete | Grzegorz Bizon | 2018-12-03 | 1 | -4/+6 |
| | | | | | | |||||
| | * | | | | Refactor encrypted token strategy class | Grzegorz Bizon | 2018-12-03 | 1 | -26/+31 |
| | | | | | | |||||
| | * | | | | Fix token encrypted strategy when migrating data | Grzegorz Bizon | 2018-12-03 | 1 | -1/+7 |
| | | | | | | |||||
| | * | | | | Migrate runners token first before fully switching | Grzegorz Bizon | 2018-12-03 | 3 | -3/+3 |
| | | | | | | |||||
| | * | | | | Implement migration strategy for token authenticatable | Grzegorz Bizon | 2018-12-03 | 2 | -4/+25 |
| | | | | | | |||||
| | * | | | | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into ↵ | Grzegorz Bizon | 2018-11-29 | 58 | -197/+322 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/encrypt-runners-tokens * commit '6852680584a1b22788f451457a6042eabf862a73': (57 commits) | ||||
| | * \ \ \ \ | Merge branch 'master' into fix/gb/encrypt-runners-tokens | Grzegorz Bizon | 2018-11-28 | 228 | -1126/+1800 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (243 commits) Conflicts: db/schema.rb lib/gitlab/import_export/import_export.yml | ||||
| | * | | | | | | Expire application settings after encrypting tokens | Grzegorz Bizon | 2018-11-28 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fix resetting old token when fallback strategy is provided | Grzegorz Bizon | 2018-11-27 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Improve token authenticable tests and exceptions | Grzegorz Bizon | 2018-11-27 | 2 | -5/+5 |
| | | | | | | | | |||||
| | * | | | | | | Improve test cases description in token-related specs | Grzegorz Bizon | 2018-11-23 | 1 | -5/+3 |
| | | | | | | | | |||||
| | * | | | | | | Only allow valid options when configuring tokens | Grzegorz Bizon | 2018-11-23 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | Improve token strategy fallback and add more specs | Grzegorz Bizon | 2018-11-23 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokens | Grzegorz Bizon | 2018-11-21 | 569 | -7303/+3915 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dev/master: (302 commits) Conflicts: db/schema.rb lib/gitlab/import_export/import_export.yml | ||||
| | * | | | | | | | Encrypt runners communication token in the database | Grzegorz Bizon | 2018-11-20 | 1 | -5/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Reset insecure token when setting an encrypted one | Grzegorz Bizon | 2018-11-20 | 1 | -1/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Use falback to set token if encrypted field is missing | Grzegorz Bizon | 2018-11-20 | 1 | -2/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Do not raise if encrypted tokens field does not exist | Grzegorz Bizon | 2018-11-20 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly important in specs for migration, where we are still using factories, despite that we have a Rubocop cop that should prevent doing that. | ||||
| | * | | | | | | | Encrypt group / project runners registration tokens | Grzegorz Bizon | 2018-11-16 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Add specs for token authenticable strategy factory method | Grzegorz Bizon | 2018-11-16 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Refactor and simplify token authenticatable concern | Grzegorz Bizon | 2018-11-15 | 1 | -6/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Extract token authenticatable strategy fabrication | Grzegorz Bizon | 2018-11-15 | 2 | -7/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Encrypt new instance runners registration tokens | Grzegorz Bizon | 2018-11-15 | 4 | -2/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Add unit tests for encrypted token authenticatable | Grzegorz Bizon | 2018-11-14 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Add specs scaffold for encrypted token authenticatable | Grzegorz Bizon | 2018-11-14 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove text prepended to a class by a mistake | Grzegorz Bizon | 2018-11-14 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Refactor token authenticatable encrypted strategy | Grzegorz Bizon | 2018-11-14 | 2 | -13/+20 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove token_field_name method from base class | Grzegorz Bizon | 2018-11-14 | 2 | -7/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Do not use cleartext approach for encrypted tokens | Grzegorz Bizon | 2018-11-13 | 1 | -8/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | Add `encrypted` strategy to persist encrypted tokens | Grzegorz Bizon | 2018-11-13 | 1 | -0/+51 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'diff-fix-expanding' into 'master' | Filipa Lacerda | 2018-12-04 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multiple diff line discussions not expanding Closes #53600 See merge request gitlab-org/gitlab-ce!23539 | ||||
| | * | | | | | | | | Updated variable name to forceExpanded | Phil Hughes | 2018-12-04 | 2 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed multiple diff line discussions not expanding | Phil Hughes | 2018-12-04 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600 | ||||
| * | | | | | | | | | CE port of Add new service to create the web ide terminal | Francisco Javier López | 2018-12-04 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'ce-7210-add-sort-direction-button-sort-dropdown' into 'master' | Sean McGivern | 2018-12-04 | 1 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport]Add sort direction button with sort dropdown for epics See merge request gitlab-org/gitlab-ce!23506 | ||||
| | * | | | | | | | | | [CE backport]Add sort direction button with sort dropdown for epics | Felipe Artur | 2018-12-03 | 1 | -1/+27 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | Fix multiple commits shade overlapping vertical discussion line | Annabel Dunstone Gray | 2018-12-04 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'ce-jej/group-saml-metadata-endpoint' into 'master' | Kamil Trzciński | 2018-12-04 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Backport TokenAuthenticatable comparison method and stub_default_url_options See merge request gitlab-org/gitlab-ce!19094 | ||||
| | * | | | | | | | | TokenAuthenticatable provides comparison method | James Edwards-Jones | 2018-12-03 | 1 | -0/+5 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids attempting save on comparison, as that could potentially reveal that a resource exists. Uses secure comparison incase this is reused somewhere sensitive. | ||||
| * | | | | | | | | Merge branch 'legacy_fallback_for_project_clusters_only' into 'master' | Kamil Trzciński | 2018-12-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fallback to admin KUBE_TOKEN for project clusters only See merge request gitlab-org/gitlab-ce!23527 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |