home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,771 Commits 48 Branches 340 Tags
79c4e3899fa7697afdefb13d64c4add08ca84aac
Commit Graph
16771 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher 79c4e3899f Rename ReferenceFilterSpecHelper to FilterSpecHelper 
And make it more generalized for all filter specs.
 2015-06-02 13:27:53 -04:00
Robert Speicher 442a0663da Add feature specs for Project and Group description rendering 2015-06-02 13:04:10 -04:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Robert Speicher 1a52f19c45 Remove now-unused escaped_autolink helper and rails_autolink gem 2015-06-02 13:04:10 -04:00
Robert Speicher 2a5c963b7c Render Group and Project descriptions with our Markdown pipeline 2015-06-02 13:04:10 -04:00
Dmitriy Zaporozhets d85a7437a5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-02 17:26:19 +02:00
Dmitriy Zaporozhets be56144a3d Merge branch 'ci_yml_file' into 'master' 
GitLab CI service sends gitlab-ci.yml file

See merge request !689
 2015-06-02 15:03:07 +00:00
Marin Jankovski c4cb563e98 Merge pull request #8730 from drunkard/master 
Specify shell while run me as git user
 2015-06-02 16:19:31 +02:00
Valery Sizov b931c11e1b GitLab CI service sends gitlab-ci.yml file 2015-06-02 16:46:01 +03:00
Dmitriy Zaporozhets 1c328fa4d7 Improve hover color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 13:20:09 +02:00
Dmitriy Zaporozhets 5a1aa49b55 Merge branch 'web-editor-rugged' into 'master' 
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
 2015-06-02 10:41:36 +00:00
Dmitriy Zaporozhets d684b11054 Remove unnecessary satellite files and add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 12:07:00 +02:00
Dmitriy Zaporozhets 435f680b89 Make web editor work correctly after switch from satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 12:06:40 +02:00
Dmitriy Zaporozhets 8997812626 Remove files in web editor using rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 11:41:21 +02:00
Douwe Maan a675bea2c1 Merge branch 'rs-issue-1721' into 'master' 
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
 2015-06-02 08:56:53 +00:00
Dmitriy Zaporozhets 8ad5f08483 Remove now unnecessary satelittes logic for creating and editing file with web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 10:56:22 +02:00
Douwe Maan d99637bf69 Merge branch 'feature/sso_integration' into 'master' 
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
 2015-06-02 08:50:54 +00:00
Dmitriy Zaporozhets 3d416f1682 Create activity event and execute hooks on web editor commit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 10:45:13 +02:00
Dmitriy Zaporozhets 2c403dfd92 Remove file api tests which depend on old satellite logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 10:24:50 +02:00
Dmitriy Zaporozhets 541133197b Use rugged in web editor for base64 encoding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 23:43:35 +02:00
Dmitriy Zaporozhets d9d9c7d7bc Allow base64 for edit blobs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 23:43:08 +02:00
Dmitriy Zaporozhets 27a158506e Fix adding new file to empty repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 21:17:13 +02:00
Dmitriy Zaporozhets 734a4ba87d Create and edit files in web editor via rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 20:49:11 +02:00
Dmitriy Zaporozhets 76ae871908 Merge branch 'refactor-header' into 'master' 
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
 2015-06-01 16:33:14 +00:00
Dmitriy Zaporozhets 01f6ae2351 improve navbar collapse for mobile views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:55:20 +02:00
Dmitriy Zaporozhets a74dfa6e74 Fix header overflow for big title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:10:04 +02:00
Dmitriy Zaporozhets e7e07fab5d Refactor header views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:09:30 +02:00
Dmitriy Zaporozhets 46e3d13eac More fixes to header css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 16:36:26 +02:00
Dmitriy Zaporozhets d4dde374aa Refactor header css/html 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 15:45:36 +02:00
Dmitriy Zaporozhets a42f4d8585 Merge branch 'linguist-comment' into 'master' 
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
 2015-06-01 11:14:51 +00:00
Dmitriy Zaporozhets ea498c4421 Add comments about gitlab forks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 12:59:02 +02:00
Dmitriy Zaporozhets 7927c320e8 Exmplain gitlab-linguist fork existence 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 12:37:08 +02:00
Dmitriy Zaporozhets ed7f42fd5c Better margin for header in accept MR widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 12:25:05 +02:00
Dmitriy Zaporozhets 38bac5d7ae Show avatars in merge widget and fix mr download button overflow 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 12:17:55 +02:00
Dmitriy Zaporozhets 9c6f6a193a Merge branch 'disable-mr-source-branch-change' into 'master' 
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
 2015-06-01 10:04:20 +00:00
Dmitriy Zaporozhets b862998b8e Merge branch 'feature/sign_out_page' into 'master' 
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
 2015-06-01 09:58:52 +00:00
Dmitriy Zaporozhets 584ac316ac Improve UI for accept MR widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 11:56:09 +02:00
Robert Schilling d38b76a6b8 Merge branch 'master' into 'master' 
small typo

See merge request !747
 2015-05-31 17:41:59 +00:00
Terrence Benade 9ea231b5a5 small typo 2015-05-31 11:20:39 +00:00
Robert Schilling 7c1f984c3c Merge branch 'fix/saml_changelog' into 'master' 
Fix misplaced changelog entry for SAML support

See merge request !746
 2015-05-29 20:10:17 +00:00
Alex Lossent 9d733d14b8 Fix misplaced changelog entry for SAML support 2015-05-29 21:55:51 +02:00
Stan Hu 85145d1d77 Disable changing of the source branch in merge request update API 2015-05-29 09:40:35 -07:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Alex Lossent 5491f6fbde 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.
 2015-05-29 18:15:03 +02:00
Dmitriy Zaporozhets 467d7f6720 Improve UI of project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 18:12:31 +02:00
Dmitriy Zaporozhets a3b60982e5 Merge branch 'leave-project' into 'master' 
Add ability to leave project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !744
 2015-05-29 15:10:46 +00:00
Dmitriy Zaporozhets a1c45338f3 Merge branch 'support-edit-target-branch-in-mr' into 'master' 
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
 2015-05-29 15:01:54 +00:00
Dmitriy Zaporozhets ab2e67550b Merge branch 'user-oauth-applications' into 'master' 
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
 2015-05-29 14:51:33 +00:00
Dmitriy Zaporozhets 7815f9ddac Make leave buttons more explicit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 16:34:26 +02:00
Dmitriy Zaporozhets 4f0f182244 Add changelog item about leave project feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 16:26:08 +02:00