home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Speicher 11af51613d Fix bin/rails binstub 2015-05-20 19:52:08 -04:00
Robert Speicher 9789b56a31 Update ffaker gem 
Adds a version requirement which it didn't have before, at 2.0.0. This
version has breaking API changes in that the namespace is now `FFaker`
instead of `Faker`.
 2015-05-20 19:22:00 -04:00
Robert Speicher 3601ebda79 Update spring, re-run binstubs 2015-05-20 18:39:33 -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
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Jakub Jirutka dc348baf18 Update asciidoctor gem to the latest version 2015-05-18 20:46:19 +02:00
Dmitriy Zaporozhets f5f0ed55bd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-18 17:58:22 +03:00
Ben Boeckel b8571f141e email: fix typo 2015-05-18 09:33:16 -04:00
Job van der Voort 307a6ba57f Merge branch 'test-db-dump' into 'master' 
How to dump a production DB to staging

See merge request !1825
 2015-05-18 11:51:33 +00:00
Jacob Vosmaer 5483c2b0a9 How to dump a production DB to staging 2015-05-18 13:37:43 +02:00
Dmitriy Zaporozhets f931904297 Merge branch 'rs-issue-1626' into 'master' 
Fix labels for project/snippet visibility selection

Closes #1626

See merge request !671
 2015-05-18 08:41:12 +00:00
Dmitriy Zaporozhets a0fcbda9e2 Merge branch 'rs-default-tooltip-placement' into 'master' 
Fix default tooltip placement

Made a logic error in 1e1785cc that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one.

See merge request !674
 2015-05-18 08:17:34 +00:00
Dmitriy Zaporozhets c9c44e7f3b Merge branch 'improve-reset-tokens' into 'master' 
Explain reset token expiration in emails

Update the new user emails to tell new users when their password reset token expires and provide a link to get a new one.  See #1921.  This MR adds new text to the emails:

```html
This link is valid for X days.  After it expires, you can <a href='new_user_password_url'>request a new one</a>
```

It will be more difficult to add the same link to the error message that's displayed when a user tries to reset his password with an expired token.  Currently, we don't know why the password change fails, we just show the Devise error messages on the form.

See merge request !1803
 2015-05-18 08:14:33 +00:00
Douwe Maan d1c9a0f1cc Merge branch 'search-issues-by-number' into 'master' 
Add search issues/MR by number

It allows user to search issues/MR by number, e.g. `#3`.

Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/4235923-search-issues-by-number).

See merge request !668
 2015-05-18 07:13:49 +00:00
Nikita Verkhovin 241f5971ba Add search issues/MR by number 2015-05-18 13:09:13 +06:00
Robert Speicher bd85e8ea5a Fix default tooltip placement 2015-05-17 18:13:27 -04:00
Douwe Maan b606bfdcaf Fix copy. 2015-05-17 18:11:41 +02:00
Robert Speicher c74b49c2e0 Merge branch 'rs-reversible-migrations' into 'master' 
Make more migrations reversible

See merge request !646
 2015-05-16 20:57:16 +00:00
Vinnie Okada 56e06b03bf Add tests for password reset token changes 2015-05-16 14:11:33 -06:00
Robert Speicher 2be995d71c Increase left margin for visibility descriptions 
Now they line up with their title.
 2015-05-16 16:09:32 -04:00
Robert Speicher c7ae428b4c Fix labels for project/snippet visibility selection 2015-05-16 16:09:04 -04:00
Vinnie Okada af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06:00
Vinnie Okada c68c23210b Redirect if password reset token is expired 
Don't display the password editing form if the user's token is expired;
redirect to the form that allows users to request a new password reset
token.
 2015-05-16 14:03:18 -06:00
Vinnie Okada 0bfab084a8 Explain reset token expiration in emails 
Tell new users when their password reset token expires and provide a
link to get a new one.
 2015-05-16 14:03:07 -06:00
Jakub Jirutka ed3298fc01 Allow to configure gitlab_shell_secret location 2015-05-16 21:46:06 +02:00
Eaden 003e1d39af projects doesn't seem to be a valid action in this controller 2015-05-16 23:04:45 +10:00
Dmitriy Zaporozhets d0b1993bf8 Merge branch 'unauthorized-participants' into 'master' 
Don't send notifications to mentioned users that don't have access to the project in question.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325.

See merge request !664
 2015-05-16 11:30:57 +00:00
Sytse Sijbrandij 390918b06d Merge branch 'fix-docker-single-postgresql-startup' into 'master' 
Set gitlab.rb in Docker single image to make PostgreSQL start up properly

See gitlab-org/omnibus-gitlab#552

See merge request !661
 2015-05-15 20:11:01 +00:00
Patrick FeyandFeyP d6b901a72d Improve BitBucket integration documentation [ci skip] 2015-05-15 18:37:15 +02:00
Dmitriy Zaporozhets 35729671fb Merge branch 'attr_encryped_no_db_connection' into 'master' 
Don't require DB connection in AttrEncrypted.

See merge request !667
 2015-05-15 14:39:38 +00:00
Douwe Maan 5210778d6e Fix specs. 2015-05-15 15:38:05 +02:00