home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,132 Commits 48 Branches 340 Tags
cecfbd55deaca45a61d970e2bea4e44eab2b3dc3
Commit Graph
4311 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets cecfbd55de Restlye project sidebar a bit to make it more clear 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 19:38:53 +03:00
Dmitriy Zaporozhets 3b0cf49f33 Fix project description and avatar alignment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 19:25:18 +03:00
Dmitriy Zaporozhets ebcc810b9d Remove project dropdown and fix db sche,a 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 18:29:23 +03:00
Dmitriy Zaporozhets 30c6dbe36d Show CI link on project home page only if CI enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 17:30:50 +03:00
Dmitriy Zaporozhets 040ee6f897 Reorganize elements in project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 16:45:53 +03:00
Dmitriy Zaporozhets 7da7a790fa Move clone panel to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 13:09:50 +03:00
Dmitriy Zaporozhets 4adac0b4be Remove unnecessary info from project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:49:49 +03:00
Dmitriy Zaporozhets 478a4b19da Turn sidebar in sections with contribute and repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:47:01 +03:00
Dmitriy Zaporozhets 3ce0557ab0 Move tabs with activity/readme to section 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:29:52 +03:00
Dmitriy Zaporozhets 31e5cd214e Move project section to own partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:26:27 +03:00
Dmitriy Zaporozhets 04e365ebb7 Move project sidebar to separate partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 11:23:25 +03:00
Dmitriy Zaporozhets e097812f57 Merge pull request #9234 from dsander/group-milestones-by-title 
Group milestones by title in the dashboard and all other issue views
 2015-05-03 14:29:31 +03:00
Dmitriy Zaporozhets 4291e28af7 Merge branch 'change-primary-email' into 'master' 
Allow primary email to be set to an email that you've already added.

Fixes gitlab-com/support-forum#106.

When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.

See merge request !591
 2015-05-03 11:00:51 +00:00
Stan Hu eb4f1eb5f5 Add application setting to restrict user signups to e-mail domains 
This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.

Only restrict e-mail addresses upon creation
 2015-05-02 09:36:52 -07:00
Douwe Maan a2eee3181c Fix title on user page. 2015-05-01 11:33:54 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Dominik Sander e6ee8d0ebe Group milestones by title in the dashboard and all other issue views 
This groups milestones by title for issue views like it has been done for
the milestone dashboard/project overview. Before milestones with the
same title would show up multiple times in the filter dropdown and one could
only filter per project and milestone. Now the milestone filter is based
on the title of the milestone, i.e. all issues marked with the same
milestone title are shown.
 2015-05-01 01:12:58 +02:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 8c4b6d426d Set head panel title of help section. 2015-04-30 21:28:07 +02:00
Douwe Maan 610ed70f77 Humanize help page titles. 2015-04-30 21:26:24 +02:00
Douwe Maan 0a63c1d2ab Have tree page title read "Files" for root. 2015-04-30 21:18:27 +02:00
Douwe Maan 6fcdd1504e Capitalize "Git Access" in page title. 2015-04-30 21:15:56 +02:00
Douwe Maan 9508bdc0c9 Include ref in network page title. 2015-04-30 21:14:26 +02:00
Douwe Maan f723968374 Include commit message in page title. 2015-04-30 21:12:31 +02:00
Douwe Maan 4d7759156b Plural instead of singular. 2015-04-30 21:10:42 +02:00
Douwe Maan 635c86114f Fix snippest sidebar when signed out. 2015-04-30 21:10:34 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan f2cf6d75ec Merge branch 'show-invalid-projects-google-code-import' into 'master' 
Show incompatible projects in Google Code import status

Using Google Code import with a JSON file that contained only one Subversion project led to confusion
over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion.

Closes #1531

## Screenshots

Before:

![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png)

After with no projects available (notice the button is hidden):

![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png)

After with 1 valid and 1 incompatible project:

![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png)

See merge request !586
 2015-04-30 17:08:45 +00:00
Dmitriy Zaporozhets 6d22e96744 Merge branch 'fix-submodule-error-with-forked-project' into 'master' 
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules

## What does this MR do?

This MR fixes an error that occurs when viewing diffs in a forked project with submodules.

### Are there points in the code the reviewer needs to double check?

Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test.

### Why was this MR needed?

A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1413

See merge request !512
 2015-04-30 16:47:35 +00:00
Dmitriy Zaporozhets 93359c7e06 Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside 2015-04-30 19:40:05 +03:00
Dmitriy Zaporozhets 26c62cb036 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-30 19:38:25 +03:00
Dmitriy Zaporozhets 32d7841b2c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/_head_panel.html.haml
 2015-04-30 19:36:45 +03:00
Douwe Maan d386bb7808 Allow primary email to be set to an email that you've already added. 2015-04-30 16:17:03 +02:00
Stan Hu 9c76a6fa96 Show incompatible projects in Google Code import status 
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.

Closes #1531
 2015-04-30 06:56:49 -07:00
Douwe Maan 7e0eb486ed Don't allow a merge request to be merged when its title starts with "WIP". 2015-04-30 15:46:36 +02:00
Dmitriy Zaporozhets 39a55bdf1a Merge branch 'search-layout' into 'master' 
Improvements to search layout

Improve search layout to match new UI style and make it more mobile-firendly

See merge request !585
 2015-04-29 18:40:16 +00:00
Dmitriy Zaporozhets 5bf9f69df7 Fix visibility settings UI in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-29 20:32:48 +03:00
Stan Hu 808b05e974 Move service template and project service settings into a shared view 2015-04-29 07:52:27 -07:00
Sullivan SENECHAL 2b0a1ca013 Fix .container position on navbar (reloaded) 2015-04-29 12:42:39 +02:00
Dmitriy Zaporozhets acad85459f Revert "Fix '.container or .container-fluid should be the first child inside of a .navbar' issue" 
This reverts commit 570594a469.
 2015-04-29 12:24:54 +03:00
Dmitriy Zaporozhets 24037e7e63 Move search categories (projects, issues etc) below search field. Instead use sidebar for dashbaord nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-29 12:19:54 +03:00
Dmitriy Zaporozhets 1ff01d26e1 Continue refactoring and restyle of search layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-28 22:04:19 +03:00
Dmitriy Zaporozhets d5fe1e57d5 Draft improvements to search layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-28 12:48:42 +03:00
Dmitriy Zaporozhets 2940de43a5 Merge branch 'admin-add-group-members' into 'master' 
Fix adding new group members from admin area

Fix for #2222

Tests for this case already exists but it was green.
It related to current way dealing with ajax selectbox.
Improving tests might be a reason for another merge requests - everyone is welcome to participate.

See merge request !1796
 2015-04-28 08:31:48 +00:00
Stan Hu 72a7febead Fix "Revspec not found" errors when viewing diffs in a forked project with submodules 
Closes #1413
 2015-04-27 20:42:38 -07:00
Dmitriy Zaporozhets f21e269668 Fix adding new group members from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-27 18:05:51 +03:00
Jeroen van Baarsen 5b69b2686f Merge pull request #9208 from Soullivaneuh/container-class 
Fix .container position on navbar
 2015-04-27 13:19:16 +02:00
Jeroen van Baarsen 365360098f Merge pull request #9207 from Soullivaneuh/x-ua-compatible 
Fix missing X-UA-Compatible meta tag
 2015-04-27 13:18:35 +02:00
Dmitriy Zaporozhets 278c3ba401 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets 57759c9aee Merge branch 'forked-event' into 'master' 
Use Projects::CreateService to fork projects so that after-create hooks are run.

Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run.

See merge request !575
 2015-04-27 07:41:20 +00:00