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
16,483 Commits 48 Branches 340 Tags
f5f0ed55bd7bf7d034282c5b3e7f02ca725a4ffa
Commit Graph
16483 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f5f0ed55bd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-18 17:58:22 +03: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
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
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
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
Douwe Maan 61ceb45088 Fix. 2015-05-15 15:32:49 +02:00
Douwe Maan ba07c9f7f5 Improve fix. 2015-05-15 14:56:04 +02:00
Douwe Maan b77e1ae6f7 Don't require DB conncetion in AttrEncrypted. 2015-05-15 14:34:22 +02:00
Douwe Maan 6960e83b1e Fix. 2015-05-15 13:54:41 +02:00
Jeroen van Baarsen 25b0968846 Merge pull request #9277 from jvanbaarsen/pr/9061 
Ensure that the first added admin performs repository imports
 2015-05-15 13:45:56 +02:00
Job van der Voort 940c4c101c Merge branch '7-11-guides' into 'master' 
Update installation/update guides for 7.11.

See merge request !665
 2015-05-15 11:19:45 +00:00
Douwe Maan fab9cbf98d Update installation/update guides for 7.11. 2015-05-15 13:12:54 +02:00
Fotis GimianandJeroen van Baarsen d74673fd43 Ensure that the first added admin performs repository imports 2015-05-15 13:01:10 +02:00
Douwe Maan 0b7c4fe048 Don't include users without project access in participants. 2015-05-15 12:46:52 +02:00
Douwe Maan fb86ec519c Move stuff around a bit in NotifictionService. 2015-05-15 12:45:18 +02:00
Dmitriy Zaporozhets be969bb4de Merge branch 'fix-653' into 'master' 
Fix push event.

Fixes issue with !653.

See merge request !663
 2015-05-15 10:12:33 +00:00
Douwe Maan ac3d472ff4 Fix push event. 2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets 07fd736d2e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets 9c6f4a2351 Merge branch 'dashboard-references' into 'master' 
Fix reference links in dashboard activity and ATOM feeds.

References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.

This MR passes the project in question to the reference parsers in an option.

cc @rspeicher

See merge request !653
 2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets de1aca131e Merge branch 'spinner-spin' into 'master' 
Spin icon next to "Checking for CI status..."

Stationary spinners make me sad.

See merge request !655
 2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets 3b4c0ea06f Merge branch 'use-count-badges' into 'master' 
Use count badges with number_with_delimiter helper for issue, commit count

See merge request !658
 2015-05-15 09:56:56 +00:00
Jeroen van Baarsen 735fbb43ed Merge pull request #9296 from jorgevbo/master 
Fix bug with default timezone en RSS gitlab events
 2015-05-15 11:36:40 +02:00
Dmitriy Zaporozhets a13e6f13c7 Fix gemfile.lock 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-15 08:57:20 +03:00
Stan Hu b43cec039c Set gitlab.rb in Docker single image in order to make PostgreSQL start up properly 
See gitlab-org/omnibus-gitlab#552
 2015-05-15 05:25:50 +00:00
Dmitriy Zaporozhets e54ff51aca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-14 23:26:44 +03:00
Dmitriy Zaporozhets 740dc41250 Merge branch 'project_api_order' into 'master' 
Add order option for projects API

https://dev.gitlab.org/gitlab/gitlab-ci/issues/222

See merge request !656
 2015-05-14 20:25:39 +00:00
Dmitriy Zaporozhets aa4f085184 Merge branch 'rs-refactor-2fa' into 'master' 
Refactor SessionsController to use a controller concern

See merge request !659
 2015-05-14 20:23:30 +00:00
Jorge Vasquez dfb58234a1 Fix bug with default timezone en RSS gitlab events 2015-05-14 15:30:55 -04:00
Robert Speicher c802d8eee1 Refactor SessionsController to use a controller concern 2015-05-14 14:24:05 -04:00
Douwe Maan 37bc4bb199 Merge branch 'fix-blob-path' into 'master' 
Fix broken view when viewing history of a file that includes a path that used to be another file

Requires gitlab_git to v7.1.12 to be tagged and released.

Closes #1598

See merge request !651
 2015-05-14 17:47:23 +00:00
Jeroen van Baarsen e1982c3288 Merge pull request #9295 from afc163/master 
Add style for <kbd> element in markdown
 2015-05-14 19:41:43 +02:00
afc163 2738978111 Add style for <kbd> element in markdown 
Fixes #5825
 2015-05-14 23:57:01 +08:00
Dmitriy Zaporozhets ded82ed4c9 Small refactoring of state_filters_text_for helper 2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets 40f381e652 append empty space only if count exists 2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets 3d4d89f060 Use count badges with number_with_delimiter helper for issue, commit count 2015-05-14 18:30:23 +03:00