提交 · 156c43c0dcdaad0eb3a351dfb8b62e600b7d9a08 · 李少辉-开发者 / gitlab-foss

02 6月, 2015 18 次提交

D

Add changelog entry. · 156c43c0
由 Douwe Maan 提交于 6月 02, 2015

156c43c0
D

Fix typo. · 1f908dc4
由 Douwe Maan 提交于 6月 02, 2015

1f908dc4
D

Ignore references in blockquotes. · 94919c7e
由 Douwe Maan 提交于 6月 02, 2015

94919c7e
D

Actually ignore references in code blocks etc. · fe78984f
由 Douwe Maan 提交于 6月 02, 2015

fe78984f

Merge branch 'web-editor-rugged' into 'master' · 5a1aa49b

由 Dmitriy Zaporozhets 提交于 6月 02, 2015

Create and edit files in web editor via rugged

- [x] create file via rugged
- [x] update file via rugged
- [x] remove file via rugged
- [ ] fix tests
- [x] remove satellites code
- [x] create activity event for new/edit file via rugged
- [x] base64 support

Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300

See merge request !751

5a1aa49b

D
Remove unnecessary satellite files and add CHANGELOG item · d684b110
由 Dmitriy Zaporozhets 提交于 6月 02, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d684b110
D
Make web editor work correctly after switch from satellites · 435f680b
由 Dmitriy Zaporozhets 提交于 6月 02, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
435f680b
D
Remove files in web editor using rugged · 89978126
由 Dmitriy Zaporozhets 提交于 6月 02, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
89978126

Merge branch 'rs-issue-1721' into 'master' · a675bea2

由 Douwe Maan 提交于 6月 02, 2015

Fix link_to_gfm with only a reference having the incorrect link

Before:

```ruby
link_to_gfm("#4", "/foo")     # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```

After:

```ruby
link_to_gfm("#4", "/foo")     # => "<a href="/foo">#4</a>"
link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
```

Closes #192
Closes #1721
Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115)

See merge request !739

a675bea2

D
Remove now unnecessary satelittes logic for creating and editing file with web editor · 8ad5f084
由 Dmitriy Zaporozhets 提交于 6月 02, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
8ad5f084

Merge branch 'feature/sso_integration' into 'master' · d99637bf

由 Douwe Maan 提交于 6月 02, 2015

Add an option to automatically sign-in with an Omniauth provider

Split of !669 as requested

This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.

See merge request !723

d99637bf

D
Create activity event and execute hooks on web editor commit · 3d416f16
由 Dmitriy Zaporozhets 提交于 6月 02, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3d416f16
D
Remove file api tests which depend on old satellite logic · 2c403dfd
由 Dmitriy Zaporozhets 提交于 6月 02, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
2c403dfd
D
Use rugged in web editor for base64 encoding · 54113319
由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
54113319
D
Allow base64 for edit blobs · d9d9c7d7
由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d9d9c7d7
D
Fix adding new file to empty repo · 27a15850
由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
27a15850
D
Create and edit files in web editor via rugged · 734a4ba8
由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
734a4ba8

Merge branch 'refactor-header' into 'master' · 76ae8719

由 Dmitriy Zaporozhets 提交于 6月 01, 2015

Refactor header css/html

* Fixes UI issue with header on zoom
* Replace duplicate numbers with variable
* Better names for css classes
* refactor header views

Fixes #1640

See merge request !750

76ae8719

01 6月, 2015 14 次提交
- D
  improve navbar collapse for mobile views · 01f6ae23
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  01f6ae23
- D
  Fix header overflow for big title · a74dfa6e
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a74dfa6e
- D
  Refactor header views · e7e07fab
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e7e07fab
- D
  More fixes to header css · 46e3d13e
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  46e3d13e
- D
  Refactor header css/html · d4dde374
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4dde374
- D
  Merge branch 'linguist-comment' into 'master' · a42f4d85
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Explain gitlab forks in Gemfile
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2358

See merge request !749
```
  a42f4d85
- D
  Add comments about gitlab forks · ea498c44
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ea498c44
- D
  Exmplain gitlab-linguist fork existence · 7927c320
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7927c320
- D
  Better margin for header in accept MR widget · ed7f42fd
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ed7f42fd
- D
  Show avatars in merge widget and fix mr download button overflow · 38bac5d7
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  38bac5d7
- D
  Merge branch 'disable-mr-source-branch-change' into 'master' · 9c6f6a19
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Disable changing of the source branch in merge request update API

As noted in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/738#note_1307284

See merge request !745
```
  9c6f6a19
- D
  Merge branch 'feature/sign_out_page' into 'master' · b862998b
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Allow to configure a URL to show after sign out

Split of !669 as requested

This is especially useful with SAML ( !722 ) since the omniauth-saml gem does not support single log-out. This provides a way to log out the user from the SAML IdP after signing out from GitLab.

See merge request !725
```
  b862998b
- D
  Improve UI for accept MR widget · 584ac316
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  584ac316
- R
  Merge branch 'master' into 'master' · d38b76a6
  由 Robert Schilling 提交于 5月 31, 2015
```
small typo

See merge request !747
```
  d38b76a6
31 5月, 2015 1 次提交
- T
  
  small typo · 9ea231b5
  由 Terrence Benade 提交于 5月 31, 2015
  
  9ea231b5
30 5月, 2015 6 次提交
- R
  Merge branch 'fix/saml_changelog' into 'master' · 7c1f984c
  由 Robert Schilling 提交于 5月 29, 2015
```
Fix misplaced changelog entry for SAML support

See merge request !746
```
  7c1f984c
- A
  
  Fix misplaced changelog entry for SAML support · 9d733d14
  由 Alex Lossent 提交于 5月 29, 2015
  
  9d733d14
- S
  
  Disable changing of the source branch in merge request update API · 85145d1d
  由 Stan Hu 提交于 5月 29, 2015
  
  85145d1d
- A
  
  Allow to configure a URL to show after sign out · 60225a06
  由 Alex Lossent 提交于 5月 29, 2015
  
  60225a06
- A
  Add an option to automatically sign-in with an Omniauth provider without... · 5491f6fb
  由 Alex Lossent 提交于 5月 27, 2015
```
Add an option to automatically sign-in with an Omniauth provider without showing the GitLab sign-in page

This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for
all user authentication.
```
  5491f6fb
- D
  Improve UI of project sidebar · 467d7f67
  由 Dmitriy Zaporozhets 提交于 5月 29, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  467d7f67
29 5月, 2015 1 次提交

Merge branch 'leave-project' into 'master' · a3b60982

由 Dmitriy Zaporozhets 提交于 5月 29, 2015

Add ability to leave project
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !744

a3b60982