Коммиты · jej/token-authenticable-changes-for-saml · nt_test134 / nt_project_qgddddf2ot8w

31.10.2018 3 коммита
- WIP: tests for TokenAuthenticatable unique:false
  
  · 965b561d
  
  James Edwards-Jones создал Окт 31, 2018
  
  965b561d
- TokenAuthenticatable provides comparison method
  
  · 8d5a757f
  
  James Edwards-Jones создал Окт 31, 2018
```
Avoids attempting save on comparison, as that could potentially reveal
that a resource exists.

Uses secure comparison incase this is reused somewhere sensitive.
```
  8d5a757f
- TokenAuthenticatable allows non-unique tokens
  
  · 69b9a879
  
  James Edwards-Jones создал Окт 31, 2018
```
Avoids needing an index to repeatedly check that
the token doesn't already exist when saving.
```
  69b9a879
29.10.2018 4 коммита
- Merge branch 'security-if-51113-hash_tokens' into 'master'
  
  · f68037ea
  
  Jan Provaznik создал Окт 29, 2018
```
[master] Persist only SHA digest of PersonalAccessToken#token

See merge request gitlab/gitlabhq!2498
```
  f68037ea
- [master] Persist only SHA digest of PersonalAccessToken#token
  
  · b9652d8e
  
  Imre Farkas создал Окт 29, 2018
  
  b9652d8e
- Merge branch 'security-51527-xss-in-mr-source-branch' into 'master'
  
  · b5ca4ea1
  
  Jan Provaznik создал Окт 29, 2018
```
[master] Fix XSS in MR source branch name

See merge request gitlab/gitlabhq!2544
```
  b5ca4ea1
- Merge branch 'sh-fix-hipchat-ssrf' into 'master'
  
  · 107351e0
  
  Jan Provaznik создал Окт 29, 2018
```
[master] Prevent SSRF attacks in HipChat integration

See merge request gitlab/gitlabhq!2530
```
  107351e0
27.10.2018 2 коммита
- Update CHANGELOG.md for 11.2.7
  
  · a632452d
  
  GitLab Release Tools Bot создал Окт 27, 2018
```
[ci skip]
```
  a632452d
- Update CHANGELOG.md for 11.3.8
  
  · b454a47c
  
  GitLab Release Tools Bot создал Окт 27, 2018
```
[ci skip]
```
  b454a47c
26.10.2018 3 коммита
- Update CHANGELOG.md for 11.4.3
  
  · 9b46624a
  
  GitLab Release Tools Bot создал Окт 26, 2018
```
[ci skip]
```
  9b46624a
- Update CHANGELOG.md for 11.2.6
  
  · 160ed1d7
  
  GitLab Release Tools Bot создал Окт 26, 2018
```
[ci skip]
```
  160ed1d7
- Update CHANGELOG.md for 11.3.7
  
  · 74843bb2
  
  GitLab Release Tools Bot создал Окт 26, 2018
```
[ci skip]
```
  74843bb2
25.10.2018 21 коммит
- Merge remote-tracking branch 'origin/master' into dev-master
  
  · fee6989f
  
  DJ Mountney создал Окт 25, 2018
  
  fee6989f
- Merge branch 'mj/review-apps-guard' into 'master'
  
  · 4de90041
  
  Robert Speicher создал Окт 25, 2018
```
Review apps cleanup schedule runs on master

See merge request gitlab-org/gitlab-ce!22601
```
  4de90041
- Review apps cleanup schedule runs on master
  
  · 309d3ebb
  
  Marin Jankovski создал Окт 25, 2018
  
  309d3ebb
- Merge branch '53055-combine-date-util-functions' into 'master'
  
  · 86d8fd86
  
  Filipa Lacerda создал Окт 25, 2018
```
Combine all datetime library functions into `datetime_utility.js`

This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`.

Closes #53055

See merge request gitlab-org/gitlab-ce!22570
```
  86d8fd86
- Merge branch 'mr-diff-data' into 'master'
  
  · 719f46e2
  
  Filipa Lacerda создал Окт 25, 2018
```
Impove diff discussion data

See merge request gitlab-org/gitlab-ce!22491
```
  719f46e2
- Merge branch 'refactor_gitlab_kube_client' into 'master'
  
  · 9e6098a6
  
  Kamil Trzciński создал Окт 25, 2018
```
Refactor Gitlab::KubeClient

Closes #52131

See merge request gitlab-org/gitlab-ce!22073
```
  9e6098a6
- Fixed action & mutation specs
  
  · 81944ec9
  
  Phil Hughes создал Окт 25, 2018
  
  81944ec9
- Merge branch '52202-consider-moving-isjobstuck-verification-to-backend' into 'master'
  
  · a5412de5
  
  Kamil Trzciński создал Окт 25, 2018
```
Move job stuck status to backend

Closes #52202

See merge request gitlab-org/gitlab-ce!22442
```
  a5412de5
- Move job stuck status to backend
  
  · 50f703f9
  
  Steve Azzopardi создал Окт 25, 2018
  
  50f703f9
- Update the state, not a param
  
  · 0fba7cca
  
  Phil Hughes создал Окт 25, 2018
```
Also fixed a bug where discussions wouldn't be assigned to a line
when switching from discussion tab to changes tab
```
  0fba7cca
- Merge branch 'jlenny-UpdateAndroidTemplate' into 'master'
  
  · 5726e51a
  
  Grzegorz Bizon создал Окт 25, 2018
```
Update Android.gitlab-ci.yml template to current Android SDK version

See merge request gitlab-org/gitlab-ce!22531
```
  5726e51a
- Add changelog entry
  
  · c26d9531
  
  Kushal Pandya создал Окт 24, 2018
  
  c26d9531
- Run through Prettier and remove ESLint disables
  
  · a6788c1a
  
  Kushal Pandya создал Окт 24, 2018
```
Formats the file to match Prettier rules
Removes all blacklisted ESLint rules
```
  a6788c1a
- Update pretty_time methods import path
  
  · 02ccbb0a
  
  Kushal Pandya создал Окт 24, 2018
```
Updates path for pretty time related methods
to import from `datetime_utility.js`
```
  02ccbb0a
- Add pretty_time methods
  
  · f9c28dc2
  
  Kushal Pandya создал Окт 24, 2018
```
Adds methods from `app/assets/javascripts/lib/utils/pretty_time.js`
and deletes the file
```
  f9c28dc2
- Update pikaday method import path
  
  · 886e5d47
  
  Kushal Pandya создал Окт 24, 2018
```
Updates path for pikaday parsing methods
to import from `datetime_utility.js`
```
  886e5d47
- Add pikaday parsing methods
  
  · 135ef046
  
  Kushal Pandya создал Окт 24, 2018
```
Adds methods from `app/assets/javascripts/lib/utils/datefix.js`
and deletes the files
```
  135ef046
- Convert methods to ES6 exports
  
  · b686b3d5
  
  Kushal Pandya создал Окт 24, 2018
  
  b686b3d5
- Update CHANGELOG.md for 11.4.2
  
  · 34d84fd2
  
  GitLab Release Tools Bot создал Окт 25, 2018
```
[ci skip]
```
  34d84fd2
- Merge branch 'sh-block-other-localhost' into 'master'
  
  · cc571e18
  
  Thiago Presa создал Окт 25, 2018
```
Block additional localhost addresses in UrlBlocker

See merge request gitlab/gitlabhq!2487
```
  cc571e18
- Merge branch 'sh-bump-ruby-2.4.5' into 'master'
  
  · f5d71ad8
  
  Robert Speicher создал Окт 24, 2018
```
Upgrade to Ruby 2.4.5

See merge request gitlab-org/gitlab-ce!22484
```
  f5d71ad8
24.10.2018 7 коммитов
- Merge branch 'prettify-all-the-things-7' into 'master'
  
  · b0808af2
  
  Tim Zallmann создал Окт 24, 2018
```
Prettify all the things (part 7)

See merge request gitlab-org/gitlab-ce!22257
```
  b0808af2
- Prettify all the things (part 7)
  
  · dfb08243
  
  Mike Greiling создал Окт 24, 2018
  
  dfb08243
- Merge branch '53070-fix-usage-ping-link' into 'master'
  
  · f8f1466a
  
  Stan Hu создал Окт 24, 2018
```
Fix usage ping link

Closes #53070

See merge request gitlab-org/gitlab-ce!22545
```
  f8f1466a
- Fix usage ping link
  
  · 1ceef5f6
  
  Anand создал Окт 24, 2018
  
  1ceef5f6
- Merge branch 'fix/secpick-ee' into 'master'
  
  · d6ef6c30
  
  Robert Speicher создал Окт 24, 2018
```
Fix secpick to use EE and guess branch name

Closes gitlab-org/release/tasks#483

See merge request gitlab-org/gitlab-ce!22517
```
  d6ef6c30
- Fix secpick to use EE and guess branch name
  
  · 4585df83
  
  James Lopez создал Окт 24, 2018
  
  4585df83
- Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into 'master'
  
  · 605e952e
  
  Annabel Dunstone Gray создал Окт 24, 2018
```
Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973

See merge request gitlab-org/gitlab-ce!22503
```
  605e952e