Commits · 48a0e9f6aece36e83e3ffde5be42f964b5362221 · nexedi / gitlab-ce

10 Apr, 2017 1 commit
- Fix specs · 48a0e9f6
  Douwe Maan authored Apr 09, 2017
  
  48a0e9f6
08 Apr, 2017 15 commits
- Some code tweaks · 1817f877
  Douwe Maan authored Apr 08, 2017
  
  1817f877
- Fix views after rebase · a8339fe1
  Douwe Maan authored Apr 06, 2017
  
  a8339fe1
- Fix find_by_diff_refs · f112f81d
  Douwe Maan authored Apr 06, 2017
  
  f112f81d
- Fix specs and make tweaks · 50eae640
  Douwe Maan authored Apr 06, 2017
  
  50eae640
- Change discussion headline to 'a now outdated portion of the diff' · f47b7374
  Douwe Maan authored Mar 31, 2017
  
  f47b7374
- Add link to diff header too · d65d245e
  Douwe Maan authored Mar 31, 2017
  
  d65d245e
- Cache MR diffs by diff refs · 2c0de7aa
  Douwe Maan authored Mar 31, 2017
  
  2c0de7aa
- Link to outdated diff in older MR version from outdated diff discussion · b202b42c
  Douwe Maan authored Mar 31, 2017
  
  b202b42c
- Merge branch 'new-resolvable-discussion' into 'master' · 3d1cade1
  Douwe Maan authored Apr 08, 2017
```
Add option to start a new resolvable discussion in an MR

Closes #24378

See merge request !7527
```
  3d1cade1
- Merge branch 'rs-rubocop-rspec' into 'master' · 40407764
  Douwe Maan authored Apr 08, 2017
```
Update rubocop-rspec 1.12.0 -> 1.15.0

See merge request !10561
```
  40407764
- Merge branch 'master' into new-resolvable-discussion · f058b52b
  Douwe Maan authored Apr 07, 2017
  
  f058b52b
- Fix specs · 130a1e86
  Douwe Maan authored Apr 07, 2017
  
  130a1e86
- Merge branch 'dm-remove-copy-link-on-blame-page' into 'master' · 7d3f37b0
  Douwe Maan authored Apr 08, 2017
```
Don't show Copy contents button on Blame page

See merge request !10560
```
  7d3f37b0
- Enable RSpec/DescribeSymbol; update .rubocop_todo.yml · 6576a6ce
  Robert Speicher authored Apr 07, 2017
  
  6576a6ce
- Update rubocop-rspec 1.12.0 -> 1.15.0 · 86a2fb2f
  Robert Speicher authored Apr 07, 2017
  
  86a2fb2f
07 Apr, 2017 24 commits
- Merge branch 'clarify-mr-with-someone' into 'master' · a4eeb96d
  Stan Hu authored Apr 07, 2017
```
Clarify what an MR needs to be 'with' a maintainer

See merge request !10544
```
  a4eeb96d
- Merge branch 'safari-svg-bug' into 'master' · e5a11687
  Jacob Schatz authored Apr 07, 2017
```
Give explicit height to SVG icons for Safari

See merge request !10550
```
  e5a11687
- Merge branch 'dm-wait-for-pipeline' into 'master' · e2129c91
  Stan Hu authored Apr 07, 2017
```
Wait for AJAX requests to complete so they don't blow up if they are only handle…

Closes #30633

See merge request !10559
```
  e2129c91
- Rename displaying_blame to blame · 4caa9b63
  Douwe Maan authored Apr 07, 2017
  
  4caa9b63
- Merge branch 'adam-finish-5993-closed-issuable' into 'master' · 68a839c2
  Douwe Maan authored Apr 07, 2017
```
Add indication for closed or merged issuables in GFM

Closes #1369

See merge request !9462
```
  68a839c2
- Merge branch 'activity-feed-user-name' into 'master' · 7759049b
  Annabel Dunstone Gray authored Apr 07, 2017
```
Put back usernames in activity and profile feed

See merge request !10539
```
  7759049b
- Actually include WaitForAjax! · ae65817b
  Douwe Maan authored Apr 07, 2017
  
  ae65817b
- Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into 'master' · 33a050d3
  Robert Speicher authored Apr 07, 2017
```
Add rake task that prints TOML storage configuration

Closes gitaly#173

See merge request !10448
```
  33a050d3
- Merge branch '30588-fix-javascript-sourcemaps-w-chrome-breakpoints' into 'master' · 60ec9c8d
  Jacob Schatz authored Apr 07, 2017
```
Upgrade webpack and webpack-dev-server to latest

Closes #30588 and #28438

See merge request !10552
```
  60ec9c8d
- Don't show Copy contents button on Blame page · a5792a86
  Douwe Maan authored Apr 07, 2017
  
  a5792a86
- alfredo review changes · c8cea68f
  Luke "Jared" Bennett authored Apr 07, 2017
  
  c8cea68f
- Give explicit height to SVG icons for Safari · 57392fcc
  Annabel Dunstone Gray authored Apr 07, 2017
  
  57392fcc
- Merge branch 'title-change-icon' into 'master' · 63cbf905
  Annabel Dunstone Gray authored Apr 07, 2017
```
Update MR title change icon

See merge request !10540
```
  63cbf905
- Update MR title change icon · c025a0eb
  Annabel Dunstone Gray authored Apr 07, 2017
  
  c025a0eb
- Put back usernames in activity and profile feed · 667fa9af
  Annabel Dunstone Gray authored Apr 07, 2017
  
  667fa9af
- Wait for AJAX requests to complete so they don't blow up if they are only... · 41f79250
  Douwe Maan authored Apr 07, 2017
```
Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run
```
  41f79250
- Revert yarn.lock changes · 1ebfcf90
  Luke "Jared" Bennett authored Apr 07, 2017
  
  1ebfcf90
- Merge branch 'test-failure-fix' into 'master' · 6ca6ca89
  Stan Hu authored Apr 07, 2017
```
Revert yarn.lock file changes

Closes #30627

See merge request !10558
```
  6ca6ca89
- add CHANGELOG.md entry for !10522 · 174dca9d
  Mike Greiling authored Apr 07, 2017
  
  174dca9d
- upgrade webpack-dev-server to fix issues with SockJS causing odd reload behavior in firefox · a76ab4ae
  Mike Greiling authored Apr 07, 2017
```
https://github.com/webpack/webpack-dev-server/issues/762
```
  a76ab4ae
- Merge branch 'master' into new-resolvable-discussion · 8b98ca50
  Luke "Jared" Bennett authored Apr 07, 2017
  
  8b98ca50
- upgrade webpack to v2.3.3 to resolve sourcemap issues · 6410016e
  Mike Greiling authored Apr 07, 2017
  
  6410016e
- Rever yarn.lock changes · 501d4032
  Luke "Jared" Bennett authored Apr 07, 2017
  
  501d4032
- Revert yarn.lock file changes · 8e8900e5
  Phil Hughes authored Apr 07, 2017
  
  8e8900e5