home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +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
Douwe Maan f84e78f3d7 Merge branch 'commit_time_timezone' into 'master' 
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
 2015-05-12 07:49:10 +00:00
Dmitriy Zaporozhets 22badc1313 Bump attr_encrypted 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-12 10:41:24 +03:00
Jakub Jirutka 44b82396d1 Add spec for RelativeLinkFilter 2015-05-12 02:12:47 +02:00
Dmitriy Zaporozhets 9694c8164d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-11 22:45:13 +03:00
Dmitriy Zaporozhets f1ba3769bd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-11 22:44:21 +03:00
Dmitriy Zaporozhets e1a8089cc2 Merge branch 'create-merge-request' into 'master' 
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
 2015-05-11 19:43:56 +00:00
Jakub Jirutka b3276661f7 RelativeLinkFilter: refactor according to suggestions by @tsigo 2015-05-11 20:43:18 +02:00
Robert Speicher 24bef5e67a Handle password reset for users with 2FA enabled 2015-05-11 14:31:31 -04:00
Jacob Vosmaer cae978a9e8 We would like to pass 'brakeman -w2' 2015-05-11 18:11:09 +02:00
Dmitriy Zaporozhets 95a470cf50 Merge branch 'params-to-sym' into 'master' 
Don't symbolize params.

See merge request !636
 2015-05-11 15:49:08 +00:00
Dmitriy Zaporozhets 0928c3ae04 Enable version check only for production environment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-11 18:23:40 +03:00
Dmitriy Zaporozhets b3f5c679b6 Replace host with real one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-11 18:21:45 +03:00
Sytse Sijbrandij 881e11df1b Small improvements to style guide. 2015-05-11 14:48:39 +00:00
Sytse Sijbrandij 426fa2af91 Merge branch 'migration-style-guide' into 'master' 
Migration Style Guide

Fixes #2305

See merge request !1821
 2015-05-11 14:43:26 +00:00
Jeroen van Baarsen 3a1eba6f14 Merge pull request #8799 from jirutka/group-kerberos 
Make omniauth-kerberos dependency optional (add group 'kerberos')
 2015-05-11 15:11:40 +02:00
Job van der Voort 6a6047f80c create migration style guide. Fixes #2305 2015-05-11 15:09:36 +02:00
Job van der Voort 65b9ca9c08 defreeze code 2015-05-11 14:34:54 +02:00
Jakub Jirutka f676bbf918 Update installation instructions, make kerberos optional 2015-05-11 13:37:56 +02:00
Jakub Jirutka 2391a43a70 Make omniauth-kerberos dependency optional (add group 'kerberos') 2015-05-11 13:27:51 +02:00
Dmitriy Zaporozhets 396aba5e10 Merge branch 'brakeman-system' into 'master' 
Follow shell command guidelines in Brakeman task

There is no real issue here because the shell command is completely
static, but it is still nicer to just follow the guidelines in
doc/development/shell_commands.md .

See merge request !1819
 2015-05-11 10:00:42 +00:00
Douwe Maan 783b286ac0 Don't symbolize params. 2015-05-11 11:55:02 +02:00
Jacob Vosmaer 0a47d8f3f4 Follow shell command guidelines in Brakeman task 
There is no real issue here because the shell command is completely
static, but it is still nicer to just follow the guidelines in
doc/development/shell_commands.md .
 2015-05-11 11:11:03 +02:00
Robert Speicher 54db527b4c Reorganize SystemNoteService spec a bit 2015-05-11 00:01:16 -04:00
Robert Speicher 3e8efce360 Refactor SystemNoteService.cross_reference_disallowed? 2015-05-11 00:01:16 -04:00
Robert Speicher 8390427583 Spec SystemNoteService.cross_reference_disallowed? 2015-05-11 00:01:16 -04:00
Robert Speicher 19142f4079 Simplify Note model specs 2015-05-11 00:01:16 -04:00
Robert Speicher b94c6d9f5b Check if system is truthy in Note.cross_reference? 2015-05-11 00:01:16 -04:00
Robert Speicher 686f6855c2 Update SystemNoteService method naming conventions 
Now the verb comes first, and there is no restriction on
singular/plural.
 2015-05-11 00:01:15 -04:00
Robert Speicher ff3a62aad1 Remove legacy special case for emphasized reference notes 2015-05-11 00:01:15 -04:00
Robert Speicher cdb69d728c Add migration to convert legacy system notes 2015-05-11 00:01:15 -04:00
Robert Speicher 48e6fb532a Add a SystemNoteService class 
There's a lot of code in the Note model that only deals with creating
system notes, so we're going to split that into its own class.
 2015-05-11 00:01:01 -04:00
Robert Speicher 0e89ff0fb0 Simplify Note#upvote? and Note#downvote? 2015-05-10 23:56:15 -04:00
Robert Speicher 5d08a5a56a Note's voting specs don't need to persist to the database 2015-05-10 23:56:15 -04:00
Jakub Jirutka f7adac87fe Extract handling of relative file links to RelativeLinkFilter 2015-05-11 02:07:26 +02:00
Robert Speicher 19b897e998 Remove extra devise call that got added by accident 2015-05-10 19:13:47 -04:00
Marin Jankovski 6fdc51f81d Merge branch 'bug/fix-duplicate-deploy-keys' into 'master' 
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
 2015-05-10 07:21:39 +00:00
Douwe Maan aa4d199044 Fix commits feed button. 2015-05-10 00:39:20 +02:00
Douwe Maan a3edd473b9 Improve create_mr_button? performance. 2015-05-09 23:51:50 +02:00
Douwe Maan e80c4447a8 Fix spec. 2015-05-09 23:50:51 +02:00
Robert Speicher 11989d62d0 Remove unnecessary User#login accessor override 2015-05-09 17:39:16 -04:00
Robert Speicher 21be1b4152 Add CHANGELOG entry 2015-05-09 17:36:19 -04:00
Robert Speicher 414ddc0021 Clear all 2FA-related fields when user disables the feature 2015-05-09 17:32:49 -04:00
Robert Speicher 5cd526f77f Prevent "You are already signed in." error message upon 2FA login 2015-05-09 17:32:49 -04:00
Robert Speicher 76873ce4a4 Move "invalid 2FA code" error message to the flash 
This makes it consistent with the Invalid email/password error message
from the previous step.
 2015-05-09 17:32:49 -04:00
Robert Speicher 3fb0fedd04 Autofocus the pin field on 2FA enable form 2015-05-09 17:32:49 -04:00
Robert Speicher c40f59d04f Add otp_attempt to filtered parameters 2015-05-09 17:32:49 -04:00
Robert Speicher c845347b23 Generate 10 2FA backup codes instead of the default of 5 2015-05-09 17:32:48 -04:00
Robert Speicher 5f43cae6ca Add :two_factor trait to User factory 2015-05-09 17:32:48 -04:00
Robert Speicher b050bb5bad Fix 2FA backup code removal 2015-05-09 17:32:48 -04:00
Robert Speicher 0c113c8dcb Make otp_backup_codes a text field 2015-05-09 17:32:46 -04:00