Commit Graph

18287 Commits

Author SHA1 Message Date
karen Carias 8e53bae700 New doc about how to add an image in GitLab Basics 2015-08-02 09:52:30 -07:00
Stan Hu ecbe119af1 Fix "Network" and "Graphs" pages for branches with encoded slashes
Closes #1359
2015-08-02 00:07:23 -07:00
Stan Hu 208e07fe6f Fix errors deleting and creating branches with encoded slashes
Closes #1804
2015-08-01 23:33:33 -07:00
Robert Speicher fa5efea7f3 Fix the `inline_theme` option for the Rouge formatter 2015-08-01 19:10:14 -04:00
Douwe Maan 688ee3e4cb Merge branch 'rs-code-links' into 'master'
Make `code` elements in links display as such

When a link consisted only of an inline code block -- ```[`like this`](https://google.com/)``` -- it was hard to tell that it was even a link.

Before:

> ![Screen_Shot_2015-07-31_at_5.45.06_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/eda0a0630024d461c8de151d06e9f4db/Screen_Shot_2015-07-31_at_5.45.06_PM.png)

After:

> ![Screen_Shot_2015-07-31_at_5.43.15_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9542c49cfb4d43c015d464ef0ba0440f/Screen_Shot_2015-07-31_at_5.43.15_PM.png)


See merge request !1082
2015-08-01 12:06:26 +00:00
Robert Speicher 1aa1f39248 Make `code` elements in links display as such
Also adds some minor padding to inline `code` elements.
2015-07-31 17:44:16 -04:00
Robert Speicher 3f84c8a680 Merge branch 'api-useremails' into 'master'
Add ability to manage user email addresses via the API.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181

See merge request !1066
2015-07-31 20:40:51 +00:00
Douwe Maan 8802846565 Fix indentation 2015-07-31 16:39:51 -04:00
Job van der Voort d2fffff0ec Merge branch 'add-mr' into 'master'
New doc about creating a Merge Request in GitLab Basics

Added new doc about creating a new branch.

See merge request !1917
2015-07-31 15:50:41 +00:00
karen Carias e72e721f04 small changes 2015-07-31 08:21:53 -07:00
Kamil Trzcinski 87df06171e Bump redis-store to 1.1.6 and remove redid-store-fix-expiry 2015-07-31 15:53:58 +02:00
Douwe Maan bdb4288ab8 Merge branch 'mention-name-in-flash-msg' into 'master'
Mention group and project names in flash messages upon create, update and delete.

Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency.

**Before**

![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png)

**After**

![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png)

See merge request !1070
2015-07-31 13:29:38 +00:00
Douwe Maan 3307008499 Merge branch 'admin-group-member' into 'master'
Add specific ability for managing group members

To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)

See merge request !1059
2015-07-31 13:25:53 +00:00
Douwe Maan 7a048cf4bf Merge branch 'fix-multiline-comment-highlighting' into 'master'
Fix multi-line syntax highlighting

### What does this MR do?

This MR fixes multi-line syntax highlighting in the code views. HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

### Why was this MR needed?

The current styling was broken for a while.

### Screenshots

Before:

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

After:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/48f61c91b6fdd9c99cd7f3d214853141/image.png)

### What are the relevant issue numbers?

Closes #1577
Closes #1495

See merge request !1079
2015-07-31 12:45:42 +00:00
Douwe Maan 51e5f379dd Merge branch 'master' into api-useremails 2015-07-31 14:34:53 +02:00
Douwe Maan 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Douwe Maan d9e26ca6d2 Reset correct event cache 2015-07-31 14:29:18 +02:00
Douwe Maan f71d67dda1 Merge branch 'master' into add-license 2015-07-31 14:20:28 +02:00
Douwe Maan 0736f348a6 Use before_actions 2015-07-31 14:15:49 +02:00
Douwe Maan be25f261ba Merge branch 'master' into project-buttons 2015-07-31 14:12:08 +02:00
Douwe Maan 7ba7652019 Tweak project page buttons. 2015-07-31 13:56:15 +02:00
Stan Hu 0abe98f049 Fix multi-line syntax highlighting
HTML span elements only apply to a single line, and in the case of multi-line
comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

Closes #1577
2015-07-30 22:37:53 -07:00
Robert Speicher a51a3fb8ed Merge branch 'rs-mr-1050-followup' into 'master'
Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078
2015-07-31 01:47:41 +00:00
Robert Speicher 327013ace9 Merge branch 'rs-markdown-feature-pipelines' into 'master'
Prepare Markdown feature spec for testing multiple pipelines

This MR lays the groundwork for including or excluding certain HTML::Pipeline
filters depending on what we're parsing. For example, excluding reference
filters in the Issues and Merge Requests titles.

See merge request !1053
2015-07-31 01:35:02 +00:00
Robert Speicher a876db48d9 Merge branch 'api-new-attributes' into 'master'
Add project star and fork count, group avatar URL and user/group web URL attributes to API

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521.

See merge request !1058
2015-07-30 21:38:48 +00:00
Robert Speicher 7ca7770e98 Fix CHANGELOG entry 2015-07-30 17:27:25 -04:00
Robert Speicher 4e22dcb6a3 Add spec to RelativeLinkFilter for Unicode filenames 2015-07-30 17:25:07 -04:00
Robert Speicher 6d6f807b75 Merge branch 'fix-image-file-is-not-displayed' into 'master'
Update RelativeLinkFilter to support non-ASCII filenames

See merge request !1050
2015-07-30 21:24:13 +00:00
karen Carias 89fc87122f added image 2015-07-30 13:54:37 -07:00
karen Carias 2911b71e82 added new doc about creating MR 2015-07-30 13:50:15 -07:00
Stan Hu bd72b5bd32 Fix version for CHANGELOG entry 2015-07-30 13:40:30 -07:00
karen Carias e70901abe7 typo 2015-07-30 13:26:10 -07:00
karen Carias 168f10feba added new doc about adding users and members 2015-07-30 13:20:10 -07:00
Stan Hu fcf8a6482f Merge branch 'backup-directory-permissions' into 'master'
Backup directory permissions

This sidesteps problems with running 'chmod' on some CIFS mounts.

Closes #1704 
https://gitlab.com/gitlab-org/gitlab-ce/issues/1704

See merge request !1065
2015-07-30 14:11:41 +00:00
Jacob Vosmaer c13e2290bc Merge branch 'fix-rake-check-hooks' into 'master'
Check that hooks directory exists before attempting to call realpath

This MR checks that the hooks directories actually exist before attempting to resolve their `realpath`.

Users who attempted to restore from source to an omnibus installation would get ugly errors when running `gitlab-rake gitlab:check`:

```
Errno::ENOENT: No such file or directory @ realpath_rec - /var/opt/gitlab/git-data/repositories/Wanda/www.git/hooks
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `realpath'
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `block in check_repos_hooks_directory_is_link'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block (2 levels) in find_each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block in find_each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:126:in `find_in_batches'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:51:in `find_each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/querying.rb:9:in `find_each'
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:482:in `check_repos_hooks_directory_is_link'
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:343:in `block (3 levels) in <top (required)>'
Tasks: TOP => gitlab:check => gitlab:gitlab_shell:check
```

Closes #2121

#2082

See merge request !1068
2015-07-30 14:07:59 +00:00
Stan Hu ee17102848 Check that hooks directory exists before attempting to call realpath
Closes #2121
2015-07-30 06:53:23 -07:00
Douwe Maan 66cc712fa5 Fix method name. 2015-07-30 15:31:34 +02:00
Douwe Maan fa9004c78c Send notification to all participants when MR is merged. 2015-07-30 15:29:43 +02:00
Douwe Maan 0b5acdd88f Show buttons to add license, changelog and contribution guide if they're missing. 2015-07-30 15:12:57 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Achilleas Pipinellis feb2865fba Raise alert when group is deleted.
This change was made to match the project deletion.
2015-07-30 14:11:26 +03:00
Douwe Maan 2a60b8006b Fix Project 2015-07-30 12:35:09 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00
Douwe Maan 1c7a8b8c27 Fix docs 2015-07-30 11:41:59 +02:00
Douwe Maan 1e4b326463 Merge branch 'fix-single-quote-in-network-graph' into 'master'
Fix network graph when branch name has single quotes

## Steps to reproduce

1. Create a branch with a single quote in the branch name: "`test`"
2. Look at Project's Network view

Closes https://github.com/gitlabhq/gitlabhq/issues/9500

See merge request !1063
2015-07-30 09:39:28 +00:00
Job van der Voort ae36842d45 Merge branch 'ssh-key-form' into 'master'
Switched the order of the SSH key form

Now it looks like this:

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


See merge request !1069
2015-07-30 09:26:56 +00:00
Mike C 70410fb6bc fixed typo in backup_restore.md 2015-07-30 08:23:11 +00:00
Jacob Vosmaer baa157926d Stricter mkdir's in 'rake gitlab:backup:create' 2015-07-30 10:17:34 +02:00
Marin Jankovski eb86e3ed46 Merge branch 'fix-rake-import-check' into 'master'
Check that project was actually created rather than just validated in import:repos task

Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to `hooks` symlink being wrong.

See merge request !1039
2015-07-30 08:13:18 +00:00
Stan Hu 6b5551d994 Merge branch 'typo-corrections' into 'master'
Minor styling fixes

- Link to rendered html instead of markdown source.
- Removed typos

See merge request !1044
2015-07-30 06:39:12 +00:00