Commit Graph
2576 Commits
Author SHA1 Message Date
Stan Hu 7d1c06793e Merge branch 'note-query-information' into 'master'
Note query information

See merge request !1149
2015-08-12 23:36:29 +00:00
Ben Boeckel 95f8f7c729 api: add 'system', 'upvote', and 'downvote' fields to note queries
This reverts commit 4c586dc7c2.
2015-08-12 17:02:33 -04:00
Ben Boeckel 013260e057 markup_helper: detect .mkd and .mkdn as markdown 2015-08-12 15:29:15 -04:00
Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master'
Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136
2015-08-11 12:27:38 +00:00
Dmitriy Zaporozhets b9b9fe70b8 Revert "Fix editing files via API"
This reverts commit 7bde6ae540.
2015-08-11 13:29:35 +02:00
Dmitriy Zaporozhets 9d029a05f1 Revert "Merge branch 'web-editor-rugged' into 'master'"
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 13:04:38 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Douwe Maan 6e7bf50ba6 Merge branch 'fix-diff-highlighting' into 'master'
Fix diff syntax highlighting

### What does this MR do?

This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following:

```
+aaa
+bbb
 ccc
```

However, a regression in 0abe98f0 caused the last line to be put on the second to last line:

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

Instead of this:

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

This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing.

### What are the relevant issue numbers?

Closes #2235

See merge request !1126
2015-08-10 15:55:44 +00:00
Stan Hu 15d5dfdb33 Fix diff syntax highlighting
Refactored HTML parser to avoid duplication of newline parsing.

Closes #2235
2015-08-10 08:07:26 -07:00
Stan Hu 39bda5d05e Merge branch 'disable-autocrlf-for-binary-files' into 'master'
Fix corrupted binary files when using API files endpoint

Closes #2219

See merge request !1123
2015-08-10 14:04:07 +00:00
Robert Speicher fb6f8d9198 Merge branch 'rs-reference-data-attrs' into 'master'
Add `data-[type]-id` attribute to reference links

This is to let us redact them later in another filter.

See merge request !1110
2015-08-10 00:07:56 +00:00
Stan Hu c5648de230 Fix corrupted binary files when using API files endpoint
Add CHANGELOG for gitlab_git 7.2.9 updates

Closes #2219
2015-08-09 15:23:22 -07:00
Robert Speicher 32e63ba7a1 Add data-[type]-id attribute to reference links
This is to let us redact them later in another filter.
2015-08-08 16:43:29 -04:00
Douwe Maan 0c31701932 Merge branch 'bitbucket-show-incompatible' into 'master'
Show incompatible projects in Bitbucket import status

### What does this MR do?

This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table.

### Why was this MR needed?

Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa).

### Screenshot

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

### What are the relevant issue numbers?

#1871

See merge request !1114
2015-08-07 14:46:05 +00:00
Stan Hu d7accda1ae Show incompatible projects in Bitbucket import status
See #1871
2015-08-07 07:07:08 -07:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Douwe Maan 863f61343a Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes

* Closes #1804
* Closes #1359

See merge request !1084
2015-08-06 08:29:18 +00:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets c17f5d06aa Fix merge api and spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:33:53 +02:00
Stan Hu 88a3cfe107 Merge branch 'rs-fix-rouge-inline-theme' into 'master'
Fix the `inline_theme` option for the Rouge formatter



See merge request !1083
2015-08-04 14:08:49 +00:00
Dmitriy Zaporozhets b118f648cb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-03 11:04:04 +02:00
Stan Hu ecbe119af1 Fix "Network" and "Graphs" pages for branches with encoded slashes
Closes #1359
2015-08-02 00:07:23 -07:00
Robert Speicher fa5efea7f3 Fix the inline_theme option for the Rouge formatter 2015-08-01 19:10:14 -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 MaanandRobert Speicher 8802846565 Fix indentation 2015-07-31 16:39:51 -04: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
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 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 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
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 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00
Jacob Vosmaer baa157926d Stricter mkdir's in 'rake gitlab:backup:create' 2015-07-30 10:17:34 +02:00
Stan Hu 3e9b612306 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.
2015-07-29 10:49:13 -07:00
Jacob Vosmaer 05b518aa4d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-29 15:44:04 +02:00
Douwe Maan 4fb6ddfe06 Add ability to manage user email addresses via the API. 2015-07-29 15:40:08 +02:00
Douwe Maan 76b3e44c39 Merge branch 'master' into api-new-attributes 2015-07-29 12:39:44 +02:00
Valery Sizov 8bda433734 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-29 12:19:59 +03:00
Jacob Vosmaer c5aae30773 Set internal backup directory modes on create
This sidesteps problems with running 'chmod' on some CIFS mounts.
2015-07-29 11:18:55 +02:00
Stan Hu e6feb98773 Merge pull request #9341 from rumpelsepp/rouge
Switch back to rouge gem for synthax highlighting
2015-07-28 23:57:03 -07:00
Stefan TatschnerandStefan Tatschner 00ff84d3c0 Add HTMLGitlab formatter
This custom formatter for rouge is needed to generate HTML output
specifically for gitlab. Since its usecase is mostly suitable for
gitlab it had been rejected upstream:
https://github.com/jneen/rouge/pull/268

Thanks a lot to @stanhu, @jneen and @tsigo for review!
2015-07-29 08:32:00 +02:00
Stefan TatschnerandStefan Tatschner f736721c5b Replace Rugments with Rouge
I have mainly created the rugments fork for the purpose of improving
gitlab's highlighting. Nowadays IMO it works way better than the old
highlight.js solution. But the development is stuck on my side because
of a couple of personal reasons:

  * I have finished my studies; last months I was writing my master
    thesis. So there was a huge time problem. I am sorry for that.

  * I had to move to Munich due to getting a (paid) job. Searching a
    flat here is horrible... :)

  * Last but not least, maintaining the same code base in two seperate
    projects is a mess.

I have decided to switch back to rouge due to several reasons:

  * In the beginning I was quite motivated, but since I start
    working on my new job next week, the best solution IMO is
    switching back to upstream rouge.

  * Rouge is continously improving:
    https://github.com/jneen/rouge/blob/master/CHANGELOG.md
    http://rouge.jneen.net/

  * There should be absolutely no regressions with this change. Most
    likely this pull request will almost fix some minor bugs.

  * One less gem in gitlab is a good thing. since Gitlab is quite a
    huge bundle of gems. Reducing complexity should be a major
    milestone.

Thanks a lot to @stanhu and @jneen for the review!
2015-07-29 07:40:58 +02:00
GitLab 16dcf356b5 Fix style points
To make Rubocop and Douwe happy
2015-07-28 18:04:57 +02:00
GitLab 6912f21e5c Send GL_ID to gitlab-git-http-server as JSON 2015-07-28 15:55:53 +02:00