home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,539 Commits 48 Branches 340 Tags
8bed55d247367cb7c6ed0e68a40745ff3bcaaec9
Commit Graph
16539 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 8bed55d247 Merge branch 'fix_timezonedoc' into 'master' 
Time zone text fix

Added small fix to /etc/gitlab/gitlab.rb

See merge request !1830
 2015-05-25 20:19:51 +00:00
Karen Carias 01c4683473 small fix 2015-05-25 19:56:11 +00:00
Sytse Sijbrandij 1d25f665e8 Merge branch 'keyboard_shortcuts' into 'master' 
Keyboard shortcuts

Added doc about how to view keyboard shortcuts

cc/ @sytse

See merge request !1829
 2015-05-22 23:38:19 +00:00
Karen Carias 0c14044203 fixed link 2015-05-22 23:12:12 +00:00
Karen Carias 43a11f4b53 Added link to keyboard shortcuts 2015-05-22 23:11:36 +00:00
Patricio Cano f042b085f6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-22 18:10:35 -05:00
Karen Carias dffc313bb5 test1 image 2015-05-22 23:08:50 +00:00
Karen Carias 920b547d63 keyboard shortcuts in GitLab 2015-05-22 23:08:12 +00:00
Patricio Cano c17a15db08 Added 7.11.2 to CHANGELOG 2015-05-22 18:03:31 -05:00
karen Carias fdc9ae7ca2 picture for shortcuts 2015-05-22 15:57:29 -07:00
Sytse Sijbrandij b1e860a63a EE can be accessed without a subscription 2015-05-22 19:03:23 +00:00
Douwe Maan c4e48d27a7 Merge branch 'fix-merge-request-assignee-list' into 'master' 
Use the user list from the target project in a merge request

### What does this MR do?

This MR derives the assignable users from the target project.

### Why was this MR needed?

In a merge request, the assignable users uses the list from the forked project, not the target project where the merge request will be going. For example, if I fork a project from the gitlab-org namespace into my personal namespace, make some changes, and then create a merge request, the only users I see are me. I think it makes more sense to show all the users in gitlab-org. This is a regression caused by 1c2711f.

### What are the relevant issue numbers?

Closes #1535

See merge request !682
 2015-05-22 15:58:18 +00:00
Job van der Voort c24906016f update CHANGELOG with release 7.11.1 2015-05-22 14:43:37 +00:00
Stan Hu 7a7ce70169 Use the user list from the target project in a merge request 
Closes #1535
 2015-05-22 09:52:09 -04:00
Job van der Voort 33dbb30fb4 notify the core team and devs 2015-05-22 15:19:06 +02:00
Dmitriy Zaporozhets f5db97aad6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-22 14:22:52 +03:00
Job van der Voort 906f958f89 Merge branch 'timezones' into 'master' 
Changing your time zone

Added doc and link in workflow to how to change your time zone in Gitlab.

I used the following documents as reference. Please double check that the instructions I wrote are correct.
http://www.borngeek.com/2015/02/27/setting-the-time-zone-in-gitlab/
https://gitlab.com/gitlab-org/gitlab-ce/issues/443

I found that several users have this same issue, that they don't know how to change their time zone:
https://github.com/gitlabhq/gitlabhq/issues/5555
https://gitlab.com/gitlab-org/omnibus-gitlab/issues/347
https://gitlab.com/gitlab-org/gitlab-ce/issues/56
http://jonathonreinhart.blogspot.com/2014/10/gitlab-time-zone-issues.html
http://stackoverflow.com/questions/5073917/why-doesnt-config-time-zone-seem-to-do-anything

See merge request !1827
 2015-05-22 07:30:43 +00:00
Karen Carias 1132b3e8dc Link to change your time zone in Gitlab CE 2015-05-21 20:05:39 +00:00
Karen Carias 871c90c3d1 Added instructions to change time zone in GitLab CE 2015-05-21 20:03:25 +00:00
Douwe Maan 2b1b026a1e Merge branch 'fix-atom-feeds' into 'master' 
Fix Atom feeds.

Fixes #1643 and #1644.

See merge request !688
 2015-05-21 09:49:34 +00:00
Douwe Maan 9a60441ce4 Fix Atom feeds. 2015-05-21 11:39:33 +02:00
Douwe Maan 7298d05cc0 Merge branch 'rs-issue-1568' into 'master' 
Work around a Chrome 43 bug preventing note editing

Fixes #1568 - and I mean "fixes"

I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.

See merge request !684
 2015-05-21 09:31:59 +00:00
Douwe Maan cbcc5f8544 Workaround that doesn't add unwanted newline. 2015-05-21 11:22:21 +02:00
Job van der Voort 3a3f4b41e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-21 10:38:22 +02:00
Job van der Voort 90b1019ab4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-21 10:37:58 +02:00
Hannes Rosenögger 10620c5986 Merge branch 'fix-v7.10.4-changelog' into 'master' 
Update CHANGELOG with v7.10.4 changes

See merge request !662
 2015-05-21 08:12:28 +00:00
Douwe Maan 206455a74b Merge pull request #9316 from jvanbaarsen/gitlab-git-update 
Updated the gitlab_git gem
 2015-05-21 09:55:31 +02:00
Jeroen van Baarsen 2b725777fe Merge pull request #9317 from jvanbaarsen/move-changelog-stuff 
Moved changelog stuff to the correct release
 2015-05-21 09:48:11 +02:00
Jeroen van Baarsen 7d658f2dbd Moved changelog stuff to the correct release 
**Why was this needed?**
The changes are pulled in 7.12.0 but where mistakenly put under 7.11.0

[skip-ci]
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-21 09:46:42 +02:00
Jeroen van Baarsen caf4a6cfd7 Merge pull request #9278 from jvanbaarsen/pr/8755 
Disabled expansion of top/bottom blobs for new file diffs
 2015-05-21 09:45:30 +02:00
Jeroen van Baarsen 5b44a54239 Updated the gitlab_git gem 
**What does this do?**
It updated the version of gitlab_git to the latest version

**Why is this needed?*
There was a bug in rugged (dependency of gitlab_git) that causes a segfault
error when seeding the database. That error has been fixed and the fix is in the
latest version of gitlab_git

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-21 09:30:23 +02:00
Alex ConnorandJeroen van Baarsen 3c892f3554 Disabled expansion of top/bottom blobs for new file diffs 2015-05-21 09:25:07 +02:00
Dmitriy Zaporozhets 579c5e3171 Merge branch 'rs-issue-1651' into 'master' 
Customize the sanitization whitelist only once

Fixes #1651

See merge request !687
 2015-05-21 07:01:45 +00:00
Robert Speicher 212fe14c65 Customize the sanitization whitelist only once 
Fixes #1651
 2015-05-20 21:16:11 -04:00
Dmitriy Zaporozhets 71b1a2c728 Merge branch 'rs-issue-1645' into 'master' 
Use task_list fork to fix list items in notes

Closes #1645

See https://github.com/github/task_list/pull/60

See merge request !680
 2015-05-20 17:00:38 +00:00
Robert Speicher 8e40d594a2 Work around a Chrome 43 bug preventing note editing 2015-05-20 12:53:35 -04:00
Douwe Maan 9fe8c74d04 Merge branch 'lexer_error_workaround' into 'master' 
workaround for buggy lexers

It seems that some lexers can be buggy when used together with git blame.
This results in a 500 error when a user tries to open the blame page in some cases.
The workaround is pretty simple. Not only fall back to plaintext when the file content can't be guessed, but also when the lexer fails.

This closes #1521 and #1646

/cc @DouweM @JobV It would be awesome to have this in a patch release for 7.11 or even in the release. But that's probably to late.

See merge request !683
 2015-05-20 16:16:48 +00:00
Robert Speicher 8ee382087d Subclass TaskList::Filter to fix a bug 
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60
 2015-05-20 12:08:33 -04:00
Hannes Rosenögger dfce7b62f7 workaround for buggy lexers 
if something goes wrong, fall back to the plaintext lexer
 2015-05-20 16:16:27 +02:00
Dmitriy Zaporozhets 76a758234a Merge branch 'explain-wip-mr' into 'master' 
Add explanation about WIP status to MR form.

![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png)

![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png)

See merge request !666
 2015-05-20 12:08:51 +00:00
Douwe Maan a393d6b163 Remove italics and margin from merge request form help. 2015-05-20 14:00:45 +02:00
Dmitriy Zaporozhets 15a6211e81 Small css improvements 2015-05-19 21:15:41 +03:00
Marin Jankovski 7758a566c9 Merge branch 'jirutka-shell-secret-path' 2015-05-19 14:39:52 +02:00
Marin Jankovski 37e94e3c5b Move the changelog item to 7.12 2015-05-19 14:38:45 +02:00
Marin Jankovski 509a32f466 Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into jirutka-shell-secret-path 2015-05-19 14:37:35 +02:00
Robert Speicher 9c6427768d Merge pull request #9289 from jirutka/asciidoc-2 
Refactor, simplify and unify helpers for rendering markup
 2015-05-18 20:13:46 -04:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka daa0925016 Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
Robert Speicher b61a44fe1a Merge pull request #9288 from jirutka/asciidoc 
Improve AsciiDoc rendering

See https://github.com/gitlabhq/gitlabhq/pull/9288
 2015-05-18 16:14:33 -04:00
Jakub Jirutka 92133a89a4 Add changelog items for #9288 2015-05-18 21:31:57 +02:00