Commits · 541133197be098732cdc14a12aa059e21cac3d71 · Léo-Paul Géneau / gitlab-ce

01 Jun, 2015 18 commits

Use rugged in web editor for base64 encoding · 54113319
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
54113319
Allow base64 for edit blobs · d9d9c7d7
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d9d9c7d7
Fix adding new file to empty repo · 27a15850
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
27a15850
Create and edit files in web editor via rugged · 734a4ba8
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
734a4ba8

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

Dmitriy Zaporozhets authored Jun 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

improve navbar collapse for mobile views · 01f6ae23
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
01f6ae23
Fix header overflow for big title · a74dfa6e
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
a74dfa6e
Refactor header views · e7e07fab
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
e7e07fab
More fixes to header css · 46e3d13e
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
46e3d13e
Refactor header css/html · d4dde374
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d4dde374

Merge branch 'linguist-comment' into 'master' · a42f4d85

Dmitriy Zaporozhets authored Jun 01, 2015

Explain gitlab forks in Gemfile
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

See merge request !749

a42f4d85

Add comments about gitlab forks · ea498c44
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
ea498c44
Exmplain gitlab-linguist fork existence · 7927c320
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7927c320
Better margin for header in accept MR widget · ed7f42fd
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
ed7f42fd
Show avatars in merge widget and fix mr download button overflow · 38bac5d7
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
38bac5d7

Merge branch 'disable-mr-source-branch-change' into 'master' · 9c6f6a19

Dmitriy Zaporozhets authored Jun 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

Merge branch 'feature/sign_out_page' into 'master' · b862998b

Dmitriy Zaporozhets authored Jun 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

Improve UI for accept MR widget · 584ac316
Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
584ac316

31 May, 2015 2 commits
- Merge branch 'master' into 'master' · d38b76a6
  Robert Schilling authored May 31, 2015
```
small typo

See merge request !747
```
  d38b76a6
- small typo · 9ea231b5
  Terrence Benade authored May 31, 2015
  
  9ea231b5
29 May, 2015 20 commits

Merge branch 'fix/saml_changelog' into 'master' · 7c1f984c
Robert Schilling authored May 29, 2015
```
Fix misplaced changelog entry for SAML support

See merge request !746
```
7c1f984c
Fix misplaced changelog entry for SAML support · 9d733d14
Alex Lossent authored May 29, 2015

9d733d14
Disable changing of the source branch in merge request update API · 85145d1d
Stan Hu authored May 29, 2015

85145d1d
Allow to configure a URL to show after sign out · 60225a06
Alex Lossent authored May 29, 2015

60225a06
Improve UI of project sidebar · 467d7f67
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
467d7f67

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

Dmitriy Zaporozhets authored May 29, 2015

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

See merge request !744

a3b60982

Merge branch 'support-edit-target-branch-in-mr' into 'master' · a1c45338

Dmitriy Zaporozhets authored May 29, 2015

Support editing target branch of merge request

### What does this MR do?

This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.

### Why was this MR needed?

Because lots of people requested this feature. :)

### Screenshots

**Edit MR page**

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png)

**New MR page**

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png)

**System note**

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png)

### What are the relevant issue numbers?

* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130!

See merge request !738

a1c45338

Merge branch 'user-oauth-applications' into 'master' · ab2e6755

Dmitriy Zaporozhets authored May 29, 2015

Add option to disallow users from registering any application to use GitLab as an OAuth provider

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264.

![Screen_Shot_2015-05-29_at_13.30.11](https://gitlab.com/gitlab-org/gitlab-ce/uploads/300f8e9ecbeb3d353ebc33a63cdef4e9/Screen_Shot_2015-05-29_at_13.30.11.png)

See merge request !742

ab2e6755

Make leave buttons more explicit · 7815f9dd
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7815f9dd
Add changelog item about leave project feature · 4f0f1822
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
4f0f1822
Add ability to leave project · 2afa5fcb
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
2afa5fcb

Merge branch 'leave-group' into 'master' · 394fe761

Dmitriy Zaporozhets authored May 29, 2015

User should be able to leave group. If not - show him proper message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !743

394fe761

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 907bbb2b
Dmitriy Zaporozhets authored May 29, 2015

907bbb2b
Style header search field on focus · d4a58c68
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d4a58c68
Fix tests for group leave feature · 85de253e
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
85de253e
User should be able to leave group. If not - show him proper message · cef746dc
Dmitriy Zaporozhets authored May 29, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
cef746dc

Merge branch 'mr-wip-text' into 'master' · 4a1df710

Dmitriy Zaporozhets authored May 29, 2015

Shorten merge request WIP text.

![Screen_Shot_2015-05-29_at_11.37.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5853d9057103bdaacded17798378f68e/Screen_Shot_2015-05-29_at_11.37.46.png)
![Screen_Shot_2015-05-29_at_11.37.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/be96ee32ab5a8f23835dc37306259b17/Screen_Shot_2015-05-29_at_11.37.49.png)

See merge request !741

4a1df710

Add option to disallow users from registering any application to use GitLab as an OAuth provider · 96d6fdc2
Douwe Maan authored May 29, 2015

96d6fdc2

Support editing target branch of merge request · 5e4384ec

Stan Hu authored May 28, 2015

Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130

5e4384ec

Merge branch 'feature/saml_support' into 'master' · 70b29c35
Douwe Maan authored May 29, 2015
```
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
```
70b29c35