Commits · b0e18eaf87e446caa075ba56c0e805b514206e10 · nexedi / gitlab-ce

29 Mar, 2017 12 commits
- Merge branch 'optimistic-locking-ci-status-change' into 'master' · b0e18eaf
  Rémy Coutable authored Mar 29, 2017
```
Make CI build to use optimistic locking only on status change

Closes #29679

See merge request !10152
```
  b0e18eaf
- Merge branch 'new-guides-guidelines' into 'master' · b20ba361
  Achilleas Pipinellis authored Mar 29, 2017
```
New Technical Articles guidelines

Closes gitlab-com/gitlab-docs#89, gitlab-com/gitlab-docs#87, and #29525

See merge request !9984
```
  b20ba361
- Merge branch '29950-vue-pagination-icons' into 'master' · 1e4f64d2
  Filipa Lacerda authored Mar 29, 2017
```
use correct first/last symbols in vue pagination component

Closes #29950

See merge request !10278
```
  1e4f64d2
- Merge branch 'make_user_mentions_case_insensitive' into 'master' · 65cc277d
  Sean McGivern authored Mar 29, 2017
```
Make user mentions case-insensitive

Closes #24493

See merge request !10285
```
  65cc277d
- Fix links and do some refactoring · 0d267024
  Achilleas Pipinellis authored Mar 29, 2017
  
  0d267024
- oops - remove html element · a2f37f8b
  Marcia Ramos authored Mar 29, 2017
  
  a2f37f8b
- capitalization · 4f9d279b
  Marcia Ramos authored Mar 29, 2017
  
  4f9d279b
- Merge branch 'new-guides-guidelines' of gitlab.com:gitlab-org/gitlab-ce into new-guides-guidelines · 3e5ea1cb
  Marcia Ramos authored Mar 28, 2017
  
  3e5ea1cb
- add link to "writing docs" , fix typo · df9fb04f
  Marcia Ramos authored Mar 28, 2017
  
  df9fb04f
- improve wording, move "see also" to "dev docs" · dd489351
  Marcia Ramos authored Mar 28, 2017
  
  dd489351
- better intro to topics · b7690b29
  Marcia Ramos authored Mar 28, 2017
  
  b7690b29
- fix URL · 4582f388
  Marcia Ramos authored Mar 28, 2017
  
  4582f388
28 Mar, 2017 28 commits
- Merge branch '27293-remove-repeated-labels' into 'master' · 839183f2
  Clement Ho authored Mar 28, 2017
```
Remove duplicated tokens in issuable search bar

Closes #27293

See merge request !10167
```
  839183f2
- Remove duplicated tokens in issuable search bar · edb5dcdb
  Alfredo Sumaran authored Mar 28, 2017
  
  edb5dcdb
- use correct first/last symbols in vue pagination component · 3bb0a9c8
  Simon Knox authored Mar 28, 2017
  
  3bb0a9c8
- Make user mentions case-insensitive · e0601537
  blackst0ne authored Mar 29, 2017
  
  e0601537
- Merge branch 'glensc/gitlab-ce-17325-rugged-gem-update' into 'master' · c82ddfe2
  Robert Speicher authored Mar 28, 2017
```
Update rugged to 0.25.1.1

Closes #17325, #14972, and #14765

See merge request !10286
```
  c82ddfe2
- Merge branch 'ipython-notebook-viewer' into 'master' · 47aeacd7
  Jacob Schatz authored Mar 28, 2017
```
iPython notebook viewer

See merge request !10017
```
  47aeacd7
- Merge branch 'improve-mr-reviews-in-contributing' into 'master' · 5f6c32e1
  Jacob Schatz authored Mar 28, 2017
```
Improve the MR guidelines from the CONTRIBUTING guide

See merge request !9967
```
  5f6c32e1
- Merge branch '29414-fix-toggle-discussion-link-jump' into 'master' · 01b5d885
  Jacob Schatz authored Mar 28, 2017
```
Fix link togglers jumping to top

Closes #29414

See merge request !9918
```
  01b5d885
- Merge branch 'tc-api-remove-comments-endpoint' into 'master' · 520f7cd0
  Rémy Coutable authored Mar 28, 2017
```
API: Make the /notes endpoint work with noteable iid instead of id

Closes #29871

See merge request !10258
```
  520f7cd0
- Merge branch '5983-poll-changes' into 'master' · 15ca592f
  Jacob Schatz authored Mar 28, 2017
```
Adds restart method and auxiliar callback to polling class

See merge request !10223
```
  15ca592f
- Merge branch 'calendar-tooltips' into 'master' · 387f2c43
  Rémy Coutable authored Mar 28, 2017
```
Add tooltip to user's calendar activities

Closes #28925

See merge request !10123
```
  387f2c43
- Merge branch 'issuable-sidebar-collapsed-labels-icon' into 'master' · d1067acd
  Filipa Lacerda authored Mar 28, 2017
```
Fixed labels icon being hidden in collapsed issuable sidebar

Closes #29751

See merge request !10107
```
  d1067acd
- Fixed labels icon being hidden in collapsed issuable sidebar · 93006905
  Phil Hughes authored Mar 28, 2017
  
  93006905
- Fix link togglers jumping to top · cf3c4398
  Eric Eastwood authored Mar 14, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414
```
  cf3c4398
- Revert "Add license to CE/doc" · f63bae46
  Marcia Ramos authored Mar 28, 2017
```
This reverts commit cde35cb2
```
  f63bae46
- Merge branch... · 1bec2fb3
  Yorick Peterse authored Mar 28, 2017
```
Merge branch '30098-banzai-filter-mergerequestreferencefilter-has-an-n-1-query-problem' into 'master'

Resolve "Banzai::Filter::MergeRequestReferenceFilter has three N+1 query problems"

Closes #30098

See merge request !10252
```
  1bec2fb3
- Merge branch 'fix-actually-use-knapsack-for-branches-other-than-master' into 'master' · b45f6c65
  Kamil Trzciński authored Mar 28, 2017
```
Don't include branch name in Knapsack report file

See merge request !10284
```
  b45f6c65
- Make CI build to use optimistic locking only on status change · bb910c3b
  Kamil Trzcinski authored Mar 22, 2017
  
  bb910c3b
- Merge branch 'user-callout-refactor' into 'master' · 3c5d1e6d
  Filipa Lacerda authored Mar 28, 2017
```
Refactored the user callout class

Closes #29955

See merge request !10213
```
  3c5d1e6d
- Merge remote-tracking branch 'dev/master' · 62b70829
  DJ Mountney authored Mar 28, 2017
  
  62b70829
- Update CHANGELOG.md for 9.0.1 · e0b1141c
  DJ Mountney authored Mar 28, 2017
```
[ci skip]
```
  e0b1141c
- Merge branch '10120-remove-spread-string-for-array-from' into 'master' · 5a063b89
  Filipa Lacerda authored Mar 28, 2017
```
Remove spreadString in favor of polyfilled Array.from

See merge request !10203
```
  5a063b89
- Merge branch 'fix/gb/environments-folders-route' into 'master' · 903b2c24
  Kamil Trzciński authored Mar 28, 2017
```
Fix environment folder route when special chars present

Closes #29922

See merge request !10250
```
  903b2c24
- Merge remote-tracking branch 'dev/master' · 6460489b
  DJ Mountney authored Mar 28, 2017
  
  6460489b
- Merge branch 'issue-boards-assignee-tooltip-aligment' into 'master' · 080261d2
  Annabel Dunstone Gray authored Mar 28, 2017
```
Fixed alignment of tooltip on card assignee

Closes #30123

See merge request !10261
```
  080261d2
- Merge branch 'fixed-issue-boards-sidebar-alignment' into 'master' · b95421d5
  Annabel Dunstone Gray authored Mar 28, 2017
```
Fixed issue boards sidebar alignment

See merge request !10260
```
  b95421d5
- Merge branch 'issue-boards-card-img-triggers-sidebar' into 'master' · 8f93c27d
  Filipa Lacerda authored Mar 28, 2017
```
Stops triggering board sidebar when clicking avatar

See merge request !10265
```
  8f93c27d
- Merge branch '30172-fix-mattermost-enabled-setting-not-properly-stubbed' into 'master' · 26ba13f2
  Sean McGivern authored Mar 28, 2017
```
Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost settings

Closes #30172

See merge request !10288
```
  26ba13f2