home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +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
Robert Speicher ff27747ec7 Fix timezone-based time_ago_with_tooltip spec failures 2015-06-19 16:49:52 -04:00
Robert Speicher 7f5b255c08 Minor style fixes for LineHighlighter 2015-06-19 16:43:09 -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
Jeff Blaine 06d2c09f95 Show username SSH config example 2015-06-19 14:49:23 -04:00
Jeff Blaine 39ad10f9fe Include non-default ssh key location info 
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/875

Provide help for people who aren't SSH-clued by indicating
how to point to key files that have been named something
other than the default. A lot of people seem to assume that
the filename they choose is irrelevant and then wonder why
their private key is not being found by simple 'ssh' commands.
 2015-06-19 14:49:23 -04:00
Darby 9209f43b32 Edited the CSS of header and sidebar; added a new class of logo-container to the html to make things easier 2015-06-19 09:54:26 -07:00
Job van der Voort 473fb23afc Merge branch 'starting_shell' into 'master' 
Starting shell document to GitLab basics

I added a new branch for all the changes on this MR https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1863

Everything should look nicer now :)

See merge request !1869
 2015-06-19 16:14:49 +00:00
Strand McCutchen 3f7608683c Update Code of Conduct to Contributor Covenant 1.1.0 2015-06-19 09:55:35 -06:00
Douwe Maan b78981bc93 Merge branch 'blog-post-use-at-all' into 'master' 
Define 'everyone'

See merge request !1872
 2015-06-19 15:15:31 +00:00
karen Carias 0221628ffb deleted duplicated file 2015-06-19 08:12:49 -07:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 17:09:50 +02:00
Dmitriy Zaporozhets f5e0e5c0a3 Replace old logo with new one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 16:59:16 +02: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
Jacob Vosmaer 3460759f44 Change RC/final package release timing 2015-06-19 16:44:21 +02: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 aca6d36722 Add tests for admin managing user identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets d059c69db7 Move identities list to own controller action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 270b7ce810 Add ability for admin to edit user identity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 228da2dd28 Admin can see and remove user identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:52 +02:00
Robert Speicher e59aad6e83 Refactor LineHighlighter 2015-06-19 04:31:24 -04:00
Robert Speicher 32366d1811 Rename BlobView to LineHighlighter 2015-06-19 04:31:24 -04:00
Robert Speicher 1f88d9b56f Remove "Multiselect Blob" feature specs 
These are well covered by the new Jasmine tests, and faster!
 2015-06-19 04:31:24 -04:00
Robert Speicher da15428340 Simplify line numbering 2015-06-19 04:31:24 -04:00
Robert Speicher 15582293b9 Use pushState instead of the temporary div hack 2015-06-19 04:31:24 -04:00
Robert Speicher b3f9be0639 Refactor and spec BlobView JS 2015-06-19 04:31:23 -04: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
Antonio Huete Jimenez e9ef274bb2 Use whoami instead of $USER 
- Use whoami instead of relying on the existence of $USER enviroment variable which is not always present
 2015-06-19 09:01:35 +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
Jacob Vosmaer 94cdc9be11 Define 'everyone' 2015-06-18 18:20:28 +02: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
Robert Speicher 54365ecc7a Remove overridden link_to helper 
The purpose for this override is now handled by `ExternalLinkFilter`.
 2015-06-17 17:23:16 -04:00
Robert Speicher 1c4bf0e474 Use skip_js for commit timestamps 
This greatly improves frontend rendering times.
 2015-06-17 16:59:51 -04:00
Robert Speicher bc027c5183 Load the Merge Request > Commits tab lazily 2015-06-17 16:59:51 -04:00
Robert Speicher ce20400628 Extract MergeRequest tab behavior to its own JS class 2015-06-17 16:59:50 -04:00
Robert Speicher 5c78d7fce8 Move Projects::MergeRequestsController spec to its correct location 2015-06-17 16:37:11 -04:00
Robert Speicher 7e31a369f5 Spec and refactor User.find_for_commit 
Now it executes a single query instead of a possible three at the cost
of some scary-looking ARel calls.
 2015-06-17 16:37:11 -04:00