Commits · 17709fa1b6fdaa522159dafcdeb1705b5418b86e · Jérome Perrin / gitlab-ce

03 Oct, 2017 2 commits
- refactor issues_controller_spec `update` action · 17709fa1
  Jarka Kadlecova authored Oct 03, 2017
  
  17709fa1
- Remove edit action for issues · 7f69659a
  Jarka Kadlecova authored Sep 19, 2017
  
  7f69659a
28 Sep, 2017 32 commits
- Merge branch 'feature/custom-attributes' into 'master' · 69f0370a
  Rémy Coutable authored Sep 28, 2017
```
Support custom attributes on users

See merge request gitlab-org/gitlab-ce!13038
```
  69f0370a
- Support custom attributes on users · e9eae3eb
  Markus Koller authored Sep 28, 2017
  
  e9eae3eb
- Merge branch 'master' into 'master' · 93a33556
  Achilleas Pipinellis authored Sep 28, 2017
```
Document the usage of the Docker OverlayFS driver for every build

See merge request gitlab-org/gitlab-ce!14478
```
  93a33556
- Document the usage of the Docker OverlayFS driver for every build · bf5c2ff8
  Dominik authored Sep 28, 2017
  
  bf5c2ff8
- Merge branch '13637-show-account-confirmation-link-in-e-mail-text' into 'master' · 9e3d1f86
  Phil Hughes authored Sep 28, 2017
```
Changed account confirmation line to e-mail text.

Closes #13637

See merge request gitlab-org/gitlab-ce!14243
```
  9e3d1f86
- Merge branch 'jramsay-spelling-occurred' into 'master' · cd5896ed
  Jacob Schatz authored Sep 28, 2017
```
Fix spelling of occurred

See merge request gitlab-org/gitlab-ce!14488
```
  cd5896ed
- Merge branch 'dm-api-unauthorized' into 'master' · 3209c071
  Sean McGivern authored Sep 28, 2017
```
Make sure API responds with 401 when invalid authentication info is provided

Closes #38438

See merge request gitlab-org/gitlab-ce!14525
```
  3209c071
- Merge branch 'evn-add-neg-tests' into 'master' · 06daba75
  Robert Speicher authored Sep 28, 2017
```
Test for what should not be there as well

[ci skip]

See merge request gitlab-org/gitlab-ce!14492
```
  06daba75
- Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' into 'master' · 576425f0
  Douwe Maan authored Sep 28, 2017
```
Resolve "NoMethodError: undefined method `sha' for nil:NilClass"

Closes #38319

See merge request gitlab-org/gitlab-ce!14547
```
  576425f0
- Make sure API responds with 401 when invalid authentication info is provided · b6c5a73c
  Douwe Maan authored Sep 27, 2017
  
  b6c5a73c
- Merge branch 'docs-28814-clarify-artifacts-ref' into 'master' · e0e49f2f
  Grzegorz Bizon authored Sep 28, 2017
```
Clarify artifact download via the API only accepts branch or tag name for ref

See merge request gitlab-org/gitlab-ce!14545
```
  e0e49f2f
- Merge branch 'fix-translation-namespaces' into 'master' · 7689c3ec
  Filipa Lacerda authored Sep 28, 2017
```
Fixed missing namespaces on navigation translations

See merge request gitlab-org/gitlab-ce!14472
```
  7689c3ec
- Merge branch 'mobile-images-lazy-load-check' into 'master' · afb1e004
  Tim Zallmann authored Sep 28, 2017
```
Lazy load images in mobile sidebar & header

Closes #38276

See merge request gitlab-org/gitlab-ce!14526
```
  afb1e004
- Merge branch 'commit-side-by-side-comment' into 'master' · 023a6150
  Filipa Lacerda authored Sep 28, 2017
```
Fixes commit comments in parallel diff view

Closes #38117

See merge request gitlab-org/gitlab-ce!14529
```
  023a6150
- Handle error when fetching ref for MR with deleted source branch · b63e8d64
  Sean McGivern authored Sep 28, 2017
```
If the ref doesn't exist, and the source branch is deleted, we can't get it back
easily. Previously, we ignored this error by shelling out, so replicate that
behaviour.
```
  b63e8d64
- Merge branch 'zj-repo-gitaly' into 'master' · e03bad12
  Sean McGivern authored Sep 28, 2017
```
RepositoryExists is always called with #gitaly_migration

Closes #38333

See merge request gitlab-org/gitlab-ce!14513
```
  e03bad12
- Merge branch 'refactor-services' into 'master' · 355a1d8a
  Grzegorz Bizon authored Sep 28, 2017
```
Refactor services to match EE signature

See merge request gitlab-org/gitlab-ce!14385
```
  355a1d8a
- Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master' · 7e314d61
  Sean McGivern authored Sep 28, 2017
```
Clean merge_jid whenever necessary on the merge process

Closes #38476

See merge request gitlab-org/gitlab-ce!14540
```
  7e314d61
- refactor emails service · 1dcb7111
  James Lopez authored Sep 27, 2017
  
  1dcb7111
- fix update service · e07819cb
  James Lopez authored Sep 27, 2017
  
  e07819cb
- refactor users update service · 67d06dee
  James Lopez authored Sep 27, 2017
  
  67d06dee
- refactor keys controller · cbb90d8f
  James Lopez authored Sep 21, 2017
  
  cbb90d8f
- refactor some controllers to make them EE friendly · 4a6ec7c9
  James Lopez authored Sep 21, 2017
  
  4a6ec7c9
- fix specs · f2e9ef10
  James Lopez authored Sep 20, 2017
  
  f2e9ef10
- fix users update service · faa95ba4
  James Lopez authored Sep 20, 2017
  
  faa95ba4
- update initializers · 7188975c
  James Lopez authored Sep 20, 2017
  
  7188975c
- refactor services to match EE signature · 9621dd0c
  James Lopez authored Sep 20, 2017
  
  9621dd0c
- Merge branch 'rotated_profile_image' into 'master' · 11c8b8bc
  Tim Zallmann authored Sep 28, 2017
```
Check orientation of profile image

See merge request gitlab-org/gitlab-ce!14461
```
  11c8b8bc
- Merge branch 'docs-38152-bump-recommended-mysql-version' into 'master' · 3d27d157
  Achilleas Pipinellis authored Sep 28, 2017
```
Change recommended MySQL version to 5.6

Closes #38152

See merge request gitlab-org/gitlab-ce!14546
```
  3d27d157
- Change recommended MySQL version to 5.6 · ce6fb619
  Mark Fletcher authored Sep 28, 2017
  
  ce6fb619
- Clarify artifact download via the API only accepts branch or tag name for ref · 3c26326e
  Mark Fletcher authored Sep 28, 2017
  
  3c26326e
- Changed account confirmation line to e-mail text. This MR fixes issue #13637 · 714c062b
  bitsapien authored Sep 13, 2017
```
added changelog
```
  714c062b
27 Sep, 2017 6 commits
- Merge branch 'cleanup-css' into 'master' · 76b2a127
  Annabel Dunstone Gray authored Sep 27, 2017
```
Cleanup diff-notes-collapse css

See merge request gitlab-org/gitlab-ce!14515
```
  76b2a127
- Clean merge_jid whenever necessary on the merge process · e38dc10c
  Oswaldo Ferreira authored Sep 27, 2017
```
MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck"
```
  e38dc10c
- Merge branch 'an-repo-gitaly' into 'zj-repo-gitaly' · 412845f8
  Alejandro Rodríguez authored Sep 27, 2017
```
Rolling back change to n+1 detection

See merge request gitlab-org/gitlab-ce!14536
```
  412845f8
- Merge branch 'docs/k8s' into 'master' · 8266c78c
  Marcia Ramos authored Sep 27, 2017
```
Add things that the k8s integration enables

Closes #37529

See merge request gitlab-org/gitlab-ce!14163
```
  8266c78c
- Rolling back change to n+1 detection · 121057c5
  Andrew Newdigate authored Sep 27, 2017
  
  121057c5
- Merge branch 'winh-linting-locale' into 'master' · 36cd266a
  Tim Zallmann authored Sep 27, 2017
```
Fix linting errors in locale/index.js

See merge request gitlab-org/gitlab-ce!14521
```
  36cd266a