home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,135 Commits 48 Branches 340 Tags
dcfce8b1988af62806a8bcdfd38bc2dcc0b7cf4e
Commit Graph
17135 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher dcfce8b198 Use alias_attribute to define User#two_factor_enabled 2015-06-22 21:14:07 -04:00
Robert Speicher aedb546964 Correct AddDefaultOtpRequiredForLoginValue migration 
Also MySQL complains when you change a field to be not null if any
existing records already have a null value, so this updates those rows.
 2015-06-22 11:36:11 -04:00
Robert Speicher d3ff8c1a95 Make default value for otp_required_for_login false instead of null 2015-06-20 19:40:48 -04:00
Robert Speicher 8304bed105 Add CHANGELOG entry for 2FA status and filtering in admin area 2015-06-19 16:35:53 -04:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Douwe Maan e13b523c92 Merge branch 'rs-dev-issue-2415' into 'master' 
Show user 2FA status on Admin::Users#show

| Enabled | Disabled |
| ------- | -------- |
| ![Screen_Shot_2015-06-19_at_2.58.42_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b81f6a992366105c14e03852385b28f0/Screen_Shot_2015-06-19_at_2.58.42_PM.png) | ![Screen_Shot_2015-06-19_at_2.58.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bb8fd11b6c27615eef19154ffabe2de/Screen_Shot_2015-06-19_at_2.58.30_PM.png) |

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2415

See merge request !851
 2015-06-19 20:10:19 +00:00
Robert Speicher b6318297fc Use User#two_factor_enabled instead of otp_required_for_login 2015-06-19 15:14:37 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
Robert Speicher 6c8f0fe906 Add convenience methods to User for getting and setting 2FA status 2015-06-19 14:59:42 -04:00
Robert Speicher 7964e7d6a1 Move the User dashboard enum further up in the class 2015-06-19 14:59:07 -04:00
Jacob Vosmaer 6c0db42951 Merge branch 'update-rake-docs-for-omnibus-assets' into 'master' 
Update maintenance documentation to explain no need to recompile asssets for omnibus installations

See merge request !847
 2015-06-19 14:54:02 +00:00
Stan Hu 9c47d69788 Update maintenance documentation to explain no need to recompile asssets for omnibus installations 2015-06-19 07:23:45 -07:00
Dmitriy Zaporozhets 74a6732c0d Merge branch 'revert-placeholder' into 'master' 
Revert "Changed the placeholder text and modified the css class to make it visible"

This reverts commit c39c823421.

/cc @marin

See merge request !845
 2015-06-19 08:03:10 +00:00
Marin Jankovski 82b21a835c Set build preparation script as executable. 2015-06-19 09:17:47 +02:00
Darby e2e8e384bb Revert "Changed the placeholder text and modified the css class to make it visible" 
This reverts commit c39c823421.
 2015-06-18 13:50:33 -07:00
Hannes Rosenögger c0d9cbfd6d Merge branch 'add-test-for-project-search-results' into 'master' 
Add init test for ProjectSearchResults

Regression test for: https://github.com/gitlabhq/gitlabhq/pull/9368

See merge request !788
 2015-06-18 18:17:30 +00:00
Stan Hu 62079d7654 Add init test for ProjectSearchResults 
See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
 2015-06-18 10:35:48 -07:00
Dmitriy Zaporozhets db915f7aba Merge branch 'build_script' into 'master' 
Add a build preparation script, modify gitlab.ci.yml to use the script.

Updated the .gitlab-ci.yml to use a script which contains build preparation for runners which might run docker images with CI runner.
Regular builds should be not affected.

See merge request !834
 2015-06-18 12:42:39 +00:00
Douwe Maan 0e615a4863 Merge branch 'fix-labels-permisssion-check' into 'master' 
Fix 403 Access Denied error messages when accessing Labels section in a project

This would occur if the project's issues or merge requests features were disabled. The change in 9bcd36396b caused `can?(current_user, :read_merge_request, project)` to be false if the merge request feature were disabled, so `authorize_labels!` needs to be changed accordingly.

Closes #1813

See merge request !836
 2015-06-18 11:43:32 +00:00
Stan Hu 07efb17e10 Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled 
Closes #1813
 2015-06-18 03:15:05 -07:00
Douwe Maan ffe130d857 Merge branch 'fix/oauth_user_ldap_person' into 'master' 
Fix behavior of ldap_person method in Gitlab::OAuth::User

Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.

Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases.

See merge request !837
 2015-06-18 09:36:44 +00:00
Marin Jankovski 0abd565305 Use correct name for the script. 2015-06-18 10:57:28 +02:00
Marin Jankovski 2b49706f1f Move prepare_build script to scripts dir. 2015-06-18 10:46:24 +02:00
Alex Lossent d96d9aae42 Fix behavior of ldap_person method in Gitlab::OAuth::User 
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
 2015-06-17 18:06:27 +02:00
Sytse Sijbrandij e12b643192 Merge branch 'link-to-rc-packages-in-tweet' into 'master' 
Add 'proposed tweet' for RC1

See merge request !835
 2015-06-17 14:47:53 +00:00
Jacob Vosmaer 70a4fb76c9 Add 'proposed tweet' for RC1 2015-06-17 13:29:04 +02:00
Marin Jankovski b6688f830b Add a build preparation script, modify gitlab.ci.yml to use the script. 2015-06-17 12:23:43 +02:00
Dmitriy Zaporozhets 79e24886ec Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-17 11:56:43 +02:00
Dmitriy Zaporozhets be2a7506eb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-06-17 11:56:37 +02:00
Dmitriy Zaporozhets 1eb51e1706 Merge branch 'placeholder_text' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
 2015-06-17 11:43:08 +02:00
Dmitriy Zaporozhets 73918efb27 Merge branch 'swellard-issue-6123' into 'master' 
Fix duplicate 'Email has already been taken' message when creating a user

devise :validatable and validates uniqueness set on the user email field cause 2 validations to fire when creating a new user with an email address already in use, Issue 6123

@stanhu Thanks for your input on merge request 807, I'll close that one in favour of this as I have added tests

See merge request !817
 2015-06-17 09:01:41 +00:00
Dmitriy Zaporozhets de5c9b795d Merge branch 'rs-dev-issue-2373' into 'master' 
Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')

https://dev.gitlab.org/gitlab/gitlabhq/issues/2373

See merge request !821
 2015-06-17 09:00:57 +00:00
Job van der Voort 4f582a14b7 Merge branch 'from_own_instance' into 'master' 
added info about migrating to gitlab.com

Added useful information. Because of tweet https://twitter.com/A_Makedonsky/status/610860840036749314

See merge request !1870
 2015-06-17 08:44:28 +00:00
Dmitriy Zaporozhets b0821a133f Merge branch 'rs-rails-update' into 'master' 
Bump rails to 4.1.11, jquery-rails to 3.1.3

rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/

jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY

See merge request !830
 2015-06-17 07:18:47 +00:00
Karen Carias bdab1c6c46 added info about migrating to gitlab.com 2015-06-17 01:02:01 +00:00
Robert Speicher 68e77a3623 Bump jquery-rails gem version 2015-06-16 20:28:02 -04:00
Robert Speicher dce6441854 Bump rails to 4.1.11, and make the version requirement exact 2015-06-16 20:21:38 -04:00
Darby c39c823421 Changed the placeholder text and modified the css class to make it visible 2015-06-16 14:44:13 -07:00
Robert Speicher 89bcc1baf0 Merge branch 'rs-bootlint-fixes' into 'master' 
Random Bootlint fixes

See merge request !822
 2015-06-16 17:59:32 +00:00
Robert Speicher 0d7a0675ac Bootlint: Fix incorrectly nested form-group element 2015-06-16 13:33:48 -04:00
Robert Speicher 09b4e11d26 Bootlint: Add missing type attribute for buttons 2015-06-16 13:33:48 -04:00
Robert Speicher e3c1818a3e Bootlint: Modals no longer need a '.hide' class 2015-06-16 13:32:33 -04:00
Robert Speicher 7400cfc114 Bootlint: Use offset grid classes instead of empty divs 2015-06-16 13:32:32 -04:00
Robert Speicher ad049a8e52 Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') 2015-06-16 13:08:29 -04:00
Douwe Maan adffe47d3c Merge branch 'support-comment-parallel-diff' into 'master' 
Support commenting on a diff in side-by-side view

### What does this MR do?

This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment.

There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.

### Why was this MR needed?

Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9283

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png)

See merge request !810
 2015-06-16 14:43:15 +00:00
swellard 19e5b043fe Fix duplicate 'Email has already been taken' message when creating a user, updated comments 2015-06-16 14:24:05 +01:00
swellard 98615ef536 Fix duplicate 'Email has already been taken' message when creating a user 2015-06-16 14:24:05 +01:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view 
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
 2015-06-16 06:11:59 -07:00
Dmitriy Zaporozhets bd6239f8cf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-16 14:47:04 +02:00
Dmitriy Zaporozhets 3e585c01e1 Merge branch 'require_kerberos_when_enabled' into 'master' 
If kerberos is enabled require it

Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)

This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .

With this we hopefully do not need to remove group from the Gemfile.

See merge request !819
 2015-06-16 12:46:48 +00:00