Commits · 0a0207ea91fdbe869ac70c23178b876bcbeb3021 · nexedi / gitlab-ce

01 Feb, 2017 4 commits
- Add notified_of_own_activity to permitted attributes · 0a0207ea
  Richard Macklin authored Jan 27, 2017
```
in Profiles::NotificationsController#update
```
  0a0207ea
- Add notified_of_own_activity column to users table · bd03ca4a
  Richard Macklin authored Jan 27, 2017
  
  bd03ca4a
- Add controller spec for Profiles::NotificationsController · 67cec150
  Richard Macklin authored Jan 27, 2017
  
  67cec150
- Merge branch 'zj-format-chat-messages' into 'master' · e2741630
  Kamil Trzciński authored Feb 01, 2017
```
Format chat messages

Closes #24917 and #25746

See merge request !8528
```
  e2741630
31 Jan, 2017 36 commits
- Merge branch 'fix/import-user-validation-error' into 'master' · 659cceb0
  Rémy Coutable authored Jan 31, 2017
```
Fix user validation error in Import/Export

Closes #23833

See merge request !8909
```
  659cceb0
- Merge branch '27484-environment-show-name' into 'master' · 790b6629
  Fatih Acet authored Jan 31, 2017
```
Don't capitalize environment name in show page

Closes #27484

See merge request !8902
```
  790b6629
- Merge branch '19164-mobile-settings' into 'master' · 4246c6c2
  Annabel Dunstone Gray authored Jan 31, 2017
```
19164 Add settings dropdown to mobile screens

Closes #19164

See merge request !8896
```
  4246c6c2
- Merge branch '19164-mobile-settings' into 'master' · 6935feed
  Annabel Dunstone Gray authored Jan 31, 2017
```
19164 Add settings dropdown to mobile screens

Closes #19164

See merge request !8896
```
  6935feed
- Merge branch '19164-mobile-settings' into 'master' · 577bb4eb
  Annabel Dunstone Gray authored Jan 31, 2017
```
19164 Add settings dropdown to mobile screens

Closes #19164

See merge request !8896
```
  577bb4eb
- Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into 'master' · 43c575ac
  Annabel Dunstone Gray authored Jan 31, 2017
```
Improve pipeline status icon linking in widgets

Closes #26982

See merge request !8705
```
  43c575ac
- update spec · c6aed2df
  James Lopez authored Jan 31, 2017
  
  c6aed2df
- Merge branch '8-16-3-patch-changelog' into 'master' · d1ab9ad6
  DJ Mountney authored Jan 31, 2017
```
Add the 8-16-3 changelog entries to master

See merge request !8912
```
  d1ab9ad6
- Merge remote-tracking branch 'dev/master' · c51182e9
  DJ Mountney authored Jan 31, 2017
  
  c51182e9
- use destroy_all · 8ea1dafe
  James Lopez authored Jan 31, 2017
  
  8ea1dafe
- Merge branch 'cop-gem-fetcher' into 'master' · 2c358b4b
  Robert Speicher authored Jan 31, 2017
```
Cop for gem fetched from a git source

Closes #27311

See merge request !8856
```
  2c358b4b
- Remove settings cog from within admin scroll tabs; keep links centered · 87346bfe
  Annabel Dunstone Gray authored Jan 31, 2017
  
  87346bfe
- Merge branch 'correct-gitlab-host-references' into 'master' · d4246054
  Achilleas Pipinellis authored Jan 31, 2017
```
Corrected docs href's

See merge request !8527
```
  d4246054
- add changelog · dc58df41
  James Lopez authored Jan 31, 2017
  
  dc58df41
- remove old project members from project · 918eaba0
  James Lopez authored Jan 31, 2017
  
  918eaba0
- Merge branch '23767-disable-storing-of-sensitive-information' into 'master' · 1ccccccf
  Filipa Lacerda authored Jan 31, 2017
```
Fix disable storing of sensitive information when importing a new repo

Closes #23767

See merge request !8885
```
  1ccccccf
- add spec replicating validation error · a1a5dd4b
  James Lopez authored Jan 31, 2017
  
  a1a5dd4b
- Merge branch '395-fix-notification-when-group-set-to-watch' into 'master' · 9295fb20
  Sean McGivern authored Jan 31, 2017
```
Fix notification when group set to watch

Closes #395

See merge request !8883
```
  9295fb20
- Merge branch 'fix/27479' into 'master' · 3deb879f
  Sean McGivern authored Jan 31, 2017
```
Remove new branch button for confidential issues

Closes #27479

See merge request !8894
```
  3deb879f
- Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master' · 86af3ed5
  Sean McGivern authored Jan 31, 2017
```
Promote project labels to group labels

Closes #24021

See merge request !7242
```
  86af3ed5
- Fix small typo on new branch button spec · afaf6b74
  Douglas Barbosa Alexandre authored Jan 31, 2017
  
  afaf6b74
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · b22838ee
  Marin Jankovski authored Jan 31, 2017
  
  b22838ee
- Merge branch '27474-update-auto-deploy-requires-public-project' into 'master' · 83711c78
  Achilleas Pipinellis authored Jan 31, 2017
```
Resolve "Document that auto deploy only works for public projects"

Closes #27474

See merge request !8897
```
  83711c78
- Merge branch 'improve-process' into 'master' · 158b92d6
  Achilleas Pipinellis authored Jan 31, 2017
```
Remove outdated text and link to up-to-date documentation

See merge request !8789
```
  158b92d6
- Improve styling of the new issue message · 164eb3aa
  Z.J. van de Weg authored Jan 31, 2017
  
  164eb3aa
- Don't capitalize environment name in show page · 4840c682
  Filipa Lacerda authored Jan 31, 2017
```
Upate test to match the new behavior
```
  4840c682
- Merge branch '27488-fix-jwt-version' into 'master' · 36fd2e2e
  Kamil Trzciński authored Jan 31, 2017
```
Update and pin the `jwt` gem to ~> 1.5.6

Closes #27488

See merge request !8900
```
  36fd2e2e
- Abillity to promote project labels to group labels · 5d871dcc
  Ritave authored Nov 02, 2016
```
Fixes #24021
```
  5d871dcc
- Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master' · 5ac59067
  Kamil Trzciński authored Jan 31, 2017
```
Convert pipeline action icons to svg to have them propperly positioned

Closes #25910

See merge request !8766
```
  5ac59067
- Merge branch '26852-fix-slug-for-openshift' into 'master' · 810979f0
  Kamil Trzciński authored Jan 31, 2017
```
Avoid repeated dashes in $CI_ENVIRONMENT_SLUG

Closes #26852

See merge request !8638
```
  810979f0
- Merge branch 'zj-display-error-team-fetch' into 'master' · e4bcdddf
  Kamil Trzciński authored Jan 31, 2017
```
Fix inconsistent return type

Closes #27150

See merge request !8290
```
  e4bcdddf
- Merge branch '24795_refactor_merge_request_build_service' into 'master' · 223f1f3d
  Sean McGivern authored Jan 31, 2017
```
Refactor MergeRequest::BuildService

Closes #24795

See merge request !8462
```
  223f1f3d
- Merge branch 'patch-12' into 'master' · 4427a263
  James Lopez authored Jan 31, 2017
```
Services changed to Integrations

See merge request !8686
```
  4427a263
- Update and pin the `jwt` gem to ~> 1.5.6 · 9e26c0de
  Rémy Coutable authored Jan 31, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9e26c0de
- Merge branch 'remove-warning-to-login' into 'master' · c9203e25
  Rémy Coutable authored Jan 31, 2017
```
Remove flash warning from login page

See merge request !8864
```
  c9203e25
- Merge branch 'ensure-rake-is-called-within-the-correct-bundle-context' into 'master' · fef6f52b
  Rémy Coutable authored Jan 31, 2017
```
Ensure rake is called within the correct bundle context

See merge request !8882
```
  fef6f52b