home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
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
Sullivan SENECHAL f28f5e49f6 Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
Sullivan SENECHAL 570594a469 Fix '.container or .container-fluid should be the first child inside of a .navbar' issue 2015-04-26 23:32:35 +02:00
Sullivan SENECHAL 4ca2b99f47 Fix "<head> is missing X-UA-Compatible <meta> tag that disables old IE compatibility modes" 2015-04-26 22:49:12 +02:00
Vinnie Okada bd557e4b64 Add new admin settings 
Add new global application settings for default project and snippet
visibility levels.
 2015-04-26 07:48:19 -06:00
Robert Speicher 1e1785cc16 Place the logo's tooltip dynamically 
When collapsed it's on the right like everything else, when expanded
it's on the bottom.
 2015-04-25 16:03:18 -04:00
Robert Speicher 96593d79f9 Add data-placement attributes for all sidebar links 2015-04-25 16:03:03 -04:00
Robert Speicher d30ceda7de Add collapsed navbar links to the default tooltip selector 2015-04-25 16:00:30 -04:00
Robert Speicher 38634b4777 There's no longer a reason to re-render the header on Design updates 2015-04-25 14:03:40 -04:00
Robert Speicher e8faf9178a Remove the has_bottom_tooltip class 
Bootstrap's tooltip JS can read the placement from a `data-placement`
attribute.

Further, when we supply the `selector` option to `tooltip`, tooltips
will be added to any dynamically-added elements matching the selector,
without us having to re-call the `tooltip` method.
 2015-04-25 14:03:40 -04:00
Robert Speicher c597b5d09d Fix Profile > Design live-updating 
`ui_blue` wasn't added to the list of classes to remove, so if a user
changed to that theme, any subsequent changes wouldn't be live-updated.

This change refactors Gitlab::Theme a bit to make it harder for this to
happen in the future with new themes.
 2015-04-25 14:03:40 -04:00
Robert Speicher 3f2f40aa43 Items with tooltips don't need a 'data-original-title' attribute 
Bootstrap's tooltip JS just uses the `title` attribute.
 2015-04-25 14:03:40 -04:00
Douwe Maan 0cf76a0b70 Use Projects::CreateService to fork projects so that after-create hooks are run. 2015-04-24 22:58:27 +02:00
Dmitriy Zaporozhets 34e14b1ca7 Merge branch 'mobile-ui-improvements' into 'master' 
Improve mobile UI for dashboard and project pages

Some love for mobile UI 😃

## Before
- - -
![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png)
![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png)

## After
- - -

![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png)
![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !573
 2015-04-24 16:01:10 +00:00
Douwe Maan 571ba5a7fe Protect OmniAuth request phase against CSRF. 2015-04-24 17:03:18 +02:00
Dmitriy Zaporozhets f912650ded Improve mobile UI for dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-24 17:39:53 +03:00
Marin Jankovski 62117f2f25 Merge branch 'add_count_to_state_filters' into 'master' 
Add issue and merge request count for state filters.

Related to issue #2170

Changes relate to project issues and merge request pages, dashboard and group pages remain the same.

See merge request !1747
 2015-04-24 14:08:40 +00:00
Douwe Maan 6ae606d81f Merge branch 'commit-project' into 'master' 
Link cross-project cross-reference notes to correct project.

- Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits.
- Include commit comments in MR from a forked project.

To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit.

See merge request !554
 2015-04-24 12:46:39 +00:00
Dmitriy Zaporozhets 9409f2a3b3 Merge pull request #9065 from rumpelsepp/issues 
Tweak issue page a bit
 2015-04-24 15:01:27 +03:00
Marin Jankovski 6977810360 Add issue and merge request count for state filters. 2015-04-24 13:53:21 +02:00
Douwe Maan 27af24c1c9 No longer needed to pass project argument to commit methods. 2015-04-24 12:29:36 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets b0ed2ff1a6 Merge branch 'atom-feeds-everywhere' into 'master' 
Add project activity atom feed and show atom feed buttons everywhere where applicable.

See merge request !555
 2015-04-24 10:15:13 +00:00
Stefan Tatschner 4beb295b89 Tweak merge requests 
* Include creation time
* Include author without avatar
* Move assignee to the right
* Include comments counter by default, gray it out when there are 0
  comments.
 2015-04-24 09:36:50 +02:00
Stefan Tatschner dbd0fd20a9 Tweak issue page 
* Include creation time
* Include author without avatar
* Move assignee to the right
* Remove action buttons. IMO they are useless and a bit annoying
* Include comments counter by default, gray it out when there are 0
  comments.
 2015-04-24 09:36:42 +02:00
Robert Speicher 429fe505bd Use fixed width icons in all nav sidebars 2015-04-23 14:29:00 -04:00
Douwe Maan a12d50c5e5 Remove unnecessary private_token params. 2015-04-23 17:11:39 +02:00
Douwe Maan cd450221eb Rename "News Feed" buttons to "Activity Feed" 2015-04-23 17:11:39 +02:00
Douwe Maan 059cc16430 Fix project atom link tag. 2015-04-23 17:11:39 +02:00
Douwe Maan 9c60354a6a Make links and titles of atom feeds consistent. 2015-04-23 17:11:39 +02:00