- 13 May, 2015 7 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
- 12 May, 2015 24 commits
-
-
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
-
Dmitriy Zaporozhets authored
Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
-
Dmitriy Zaporozhets authored
-
Douwe Maan authored
Update docs in line with mysql-postgresql-converter changes. See merge request !640
-
Sytse Sijbrandij authored
Update migration style guide See merge request !1823
-
Douwe Maan authored
-
Valery Sizov 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. ![Screen_Shot_2015-05-12_at_12.15.45](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0da0eea2087d6d3b14a2c0c594575c8a/Screen_Shot_2015-05-12_at_12.15.45.png) On hover, the note actions replace the role: ![Screen_Shot_2015-05-12_at_12.17.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/54a83c2f5047ea3ce0387f6692b14fe5/Screen_Shot_2015-05-12_at_12.17.32.png) --- Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321. cc @sytses See merge request !639
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Add SystemNoteService class The Note model was basically two models crammed together - one handling user-created notes (i.e., comments on things) and one handling system-created notes (i.e., references). This splits out the system-specific stuff to a new SystemNoteService class. See merge request !595
-
Dmitriy Zaporozhets authored
Conflicts: lib/tasks/brakeman.rake
-
Dmitriy Zaporozhets authored
Restructure project sidebar and add more icons. I moved the repository stuff down (including the clone bar), and the project/contribution stuff up. I also added more icons, to the sidebar and tabs on other pages. --- ![Screen_Shot_2015-05-12_at_10.29.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ada4a77a07913571e5ac4f00fdd182b9/Screen_Shot_2015-05-12_at_10.29.36.png) See merge request !633
-
Douwe Maan authored
-
Valery Sizov authored
Make migrations reversible /cc @jacobvosmaer @marin See merge request !622
-
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
-
Douwe Maan authored
-
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
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
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
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 11 May, 2015 9 commits
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Add Create Merge Request buttons to commits page and push event. Commits page: ![Screen_Shot_2015-05-09_at_22.27.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f77c2e47f768b2fc132de6e3a2a0323e/Screen_Shot_2015-05-09_at_22.27.09.png) Branches page: ![Screen_Shot_2015-05-09_at_22.55.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0a6374f5c5d830ef19de9694e603c8f/Screen_Shot_2015-05-09_at_22.55.24.png) Push event: (Only for new branches, and only shown to the pushing user) ![Screen_Shot_2015-05-09_at_22.27.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/989c9cb66ee03d09b96809452749d2b8/Screen_Shot_2015-05-09_at_22.27.21.png) Push event with multiple commits and a Compare link: ![Screen_Shot_2015-05-09_at_22.28.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a70c718e559f69177f9341c0af92707c/Screen_Shot_2015-05-09_at_22.28.01.png) See merge request !632
-
Robert Speicher authored
-
Jacob Vosmaer authored
-
Dmitriy Zaporozhets authored
Don't symbolize params. See merge request !636
-
Sytse Sijbrandij authored
-
Sytse Sijbrandij authored
Migration Style Guide Fixes #2305 See merge request !1821
-
Jeroen van Baarsen authored
Make omniauth-kerberos dependency optional (add group 'kerberos')
-