- 19 May, 2015 1 commit
-
-
https://github.com/jirutka/gitlabhqMarin Jankovski authored
Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into jirutka-shell-secret-path
-
- 16 Feb, 2015 1 commit
-
-
Jakub Jirutka authored
-
- 14 May, 2015 1 commit
-
-
Jakub Jirutka authored
-
- 18 May, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 17 May, 2015 1 commit
-
-
Nikita Verkhovin authored
-
- 16 May, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
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
-
- 15 May, 2015 1 commit
-
-
Douwe Maan authored
-
- 27 Apr, 2015 1 commit
-
-
Vinnie Okada authored
Tell new users when their password reset token expires and provide a link to get a new one.
-
- 31 Mar, 2015 1 commit
-
-
Fotis Gimian authored
-
- 15 May, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
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
-
- 14 May, 2015 1 commit
-
-
Douwe Maan authored
-
- 15 May, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Spin icon next to "Checking for CI status..." Stationary spinners make me sad. See merge request !655
-
- 14 May, 2015 8 commits
-
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
-
Douwe Maan authored
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
-
Stan Hu authored
Closes #1598
-
afc163 authored
Fixes #5825
-
Dmitriy Zaporozhets authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
-
- 24 Apr, 2015 1 commit
-
-
Douwe Maan authored
-
- 13 May, 2015 2 commits
-
-
Jacob Vosmaer authored
This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM.
-
Jeroen van Baarsen authored
Call merge request web hook for each commits
-
- 26 Feb, 2015 1 commit
-
-
Arthur Gautier authored
Call merge request web hook every times a new commit hits the source branch Signed-off-by:
Arthur Gautier <baloo@gandi.net>
-
- 12 May, 2015 1 commit
-
-
Hannes Rosenögger authored
Fix bug where avatar filenames were not actually deleted from the database during removal This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 See merge request !620
-
- 06 May, 2015 1 commit
-
-
Stan Hu authored
This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570
-
- 12 May, 2015 5 commits
-
-
Dmitriy Zaporozhets authored
Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Show user roles by comments. I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.  On hover, the note actions replace the role:  --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Two-factor authentication Implement's Two-factor authentication using tokens. - [X] Authentication logic - [X] Enable/disable 2FA feature - [x] Make 2-step login process if 2FA enabled - [x] Backup codes - [x] Backup code removed after being used - [x] Check backup codes for mysql db (mention mysql limitation if applied) - [x] Add tests - [x] Test if https://github.com/tinfoil/devise-two-factor#disabling-automatic-login-after-password-resets applies, and address if so - [x] Wait for fixed version of `attr_encrypted` or fork and use forked version - https://github.com/attr-encrypted/attr_encrypted/issues/155 Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa See merge request !474
-
- 09 May, 2015 1 commit
-
-
Robert Speicher authored
-
- 12 May, 2015 1 commit
-
-
Douwe Maan authored
Bump gitlab_git to 7.1.11 to fix bug with viewing a tag on a project with submodules This is a reminder MR to bump gitlab_git before the release. Tests will fail until this happens. Closes https://github.com/gitlabhq/gitlabhq/issues/8411 See merge request !607
-
- 04 May, 2015 1 commit
-
-
Stan Hu authored
Bump gitlab_git to 7.1.11 to fix bug where viewing a tag on a project with submodules would return a 500 error Closes https://github.com/gitlabhq/gitlabhq/issues/8411
-
- 12 May, 2015 1 commit
-
-
Douwe Maan authored
Fix commit time being displayed in the wrong timezone in some cases This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml. Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page. fixes gitlab-org/gitlab-ce#1278 /cc @DouweM See merge request !624
-
- 07 May, 2015 1 commit
-
-
Hannes Rosenögger authored
-
- 11 May, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Add Create Merge Request buttons to commits page and push event. Commits page:  Branches page:  Push event: (Only for new branches, and only shown to the pushing user)  Push event with multiple commits and a Compare link:  See merge request !632
-
- 09 May, 2015 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 10 May, 2015 1 commit
-
-
Marin Jankovski authored
Don't show duplicate deploy keys This fixes the issue described in [#1516](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516) where you would see the same deploy key multiple times if it was used by multiple projects. See merge request !629
-