home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 14:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,787 Commits 48 Branches 340 Tags
41d4aaa4be6ef39a97e07dedbeda839b5667f221
Commit Graph
16787 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 41d4aaa4be Merge branch 'rs-more-js-testing' into 'master' 
More Javascript testing

Continuation of !715

See merge request !736
 2015-06-03 08:13:50 +00:00
Dmitriy Zaporozhets 8631b6a258 Merge branch 'rs-issue-1022' into 'master' 
Push event: Nest link in strong tag, not vice-versa

Closes #1022

See merge request !755
 2015-06-03 08:12:43 +00:00
Robert Speicher 29626b0885 Remove unused showAndHide, simpleFormat, and linkify functions 
Also removes redundant `unbind` call
 2015-06-02 20:32:07 -04:00
Robert Speicher 39d5a4878f Add JS specs for Array extensions 2015-06-02 20:32:07 -04:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery 
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
 2015-06-02 20:32:07 -04:00
Robert Speicher 2313d42b37 Bump jquery-rails version 2015-06-02 20:32:07 -04:00
Robert Speicher f76a3f3db7 Add ZenMode javascript specs 2015-06-02 20:32:07 -04:00
Robert Speicher e860dedd1c Push event: Nest link in strong tag, not vice-versa 
Closes #1022
 2015-06-02 15:05:44 -04:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Douwe Maan 34d176ad57 Merge branch 'rs-more-nofollow' into 'master' 
Render Group and Project descriptions with our Markdown pipeline

Continuation of !727, this ensures external links in these fields also get `rel="nofollow"` added.

Bonus: Emoji now works in them! ✨

See merge request !735
 2015-06-02 18:19:01 +00:00
Robert Speicher 9e7a9c63a5 Further limit the limited whitelist for project/group descriptions 2015-06-02 13:41:12 -04:00
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
Douwe Maan a916936f3f Fix spec. 2015-06-02 15:00:51 +02:00
Douwe Maan 156c43c0dc Add changelog entry. 2015-06-02 13:23:22 +02:00
Douwe Maan 1f908dc481 Fix typo. 2015-06-02 13:21:34 +02:00
Dmitriy Zaporozhets 1c328fa4d7 Improve hover color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-02 13:20:09 +02:00
Douwe Maan 94919c7ef6 Ignore references in blockquotes. 2015-06-02 13:17:21 +02:00
Douwe Maan fe78984f20 Actually ignore references in code blocks etc. 2015-06-02 13:17:11 +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