home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,723 Commits 48 Branches 340 Tags
de2098f4e71de02ebc18817dce35eb167983e1bb
Commit Graph
13723 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets de2098f4e7 Merge branch 'haynes/gitlab-ce-commit_calendar' 2015-01-28 23:00:49 -08:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Dmitriy Zaporozhets 2149f8b52c Merge branch 'css-refactoring' into 'master' 
Small css improvements

See merge request !1450
 2015-01-29 06:43:26 +00:00
Dmitriy Zaporozhets 953c1fff8f Be more careful with parsing changes from gitlab-shell 2015-01-28 17:00:40 -08:00
Dmitriy Zaporozhets ef315dda5f Add light border to bootstrap panels 2015-01-28 16:59:25 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Dmitriy Zaporozhets 1718075a02 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-28 15:15:28 -08:00
Dmitriy Zaporozhets 8e1f032e04 Merge branch 'create_gitlab_internal_issue_service' into 'master' 
Create gitlab internal issue service

Part of #1908

Create a default gitlab issue tracker service which will replace having issue tracker fields for project.

See merge request !1449
 2015-01-28 23:15:13 +00:00
Dmitriy Zaporozhets 76f7553863 Merge pull request #8663 from yglukhov/semantic-ui-sass-update 
Update semantic-ui-sass to 1.8
 2015-01-28 14:49:35 -08:00
Marin Jankovski 68f7302474 Add a scope for visible services, code styling changes for easier readability. 2015-01-28 14:25:55 -08:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Job van der Voort 5914c7e1b7 Merge branch 'ldap_defaults' into 'master' 
Saner LDAP defaults

I have the impression that most people use LDAP servers listening
on port 389, without encryption. If we make that the default we
give people a smoother ride setting up GitLab.

See merge request !1446
 2015-01-28 18:24:30 +00:00
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08:00
Jacob Vosmaer 087c4cbc3c Make 'plain', port 389 the default for LDAP 2015-01-28 11:34:33 +01:00
Jacob Vosmaer 43da3f0929 Point out common LDAP port/method combinations 2015-01-28 11:34:33 +01:00
Dmitriy Zaporozhets 8eb365c0a0 Separate admin settings from other links 2015-01-27 22:54:46 -08:00
Dmitriy Zaporozhets f79f758581 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 22:51:36 -08:00
Dmitriy Zaporozhets 50297f7134 Fix gravatar size for head panel icon 2015-01-27 22:51:11 -08:00
Dmitriy Zaporozhets 6290b75da9 Merge branch '1019' into 'master' 
#1019: Broadcast message does not show up properly with new UI

With the new UI, the broadcast message is the first level child element of the body tag and then render full width without respecting the width of the left sidebar. This makes the message goes under the left sidebar in smaller screen.

This commit fixes the issue by moving the message element into the "page-with-sidebar" div so it will always render together with the main content area with same look as before. The rendering for the search, login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable

Fixes: #1019

See merge request !315
 2015-01-28 01:36:19 +00:00
Visay Keo 35d6d1ce46 Fix broadcast message to show up properly with new UI 
With the new UI, the broadcast message is the first level child element
of the body tag and then render full width without respecting the width
of the left sidebar. This makes the message goes under the left sidebar
in smaller screen.

This commit fixes the issue by moving the message element into the
"page-with-sidebar" div so it will always render together with the main
content area with same look as before. The rendering for the search,
login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable
Fixes: #1019
 2015-01-28 07:24:05 +07:00
Dmitriy Zaporozhets 8cc111bd03 Fix random failing test 2015-01-27 13:40:23 -08:00
Dmitriy Zaporozhets f57bffc82a Merge branch 'init-from-ui' into 'master' 
Add tests for creating bare repo and first file in UI

Part of #1930

See merge request !1444
 2015-01-27 21:27:59 +00:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets e9514c5074 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-27 12:51:42 -08:00
Dmitriy Zaporozhets 7155507af5 Merge pull request #8609 from jubianchi/issues/6289-api-handle-error-project-repo 
Handle errors on API when a project does not have a repository
 2015-01-27 12:51:18 -08:00
Dmitriy Zaporozhets 0d86a1a3d4 Merge pull request #8638 from hiroponz/remember-project-default-tab-30days 
Remember the project default tab for 30 days
 2015-01-27 12:50:20 -08:00
Dmitriy Zaporozhets 6d034e5f53 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-27 12:49:44 -08:00
Dmitriy Zaporozhets 5e20cb82d7 Merge pull request #8652 from bladealslayer/feature/system_hook_for_groups 
Added support for firing system hooks on group create/destroy and adding...
 2015-01-27 12:49:24 -08:00
Dmitriy Zaporozhets e13868fa69 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 12:48:07 -08:00
Dmitriy Zaporozhets b35f1d1c2f Increase font size for issue/mr titles 2015-01-27 12:47:39 -08:00
Dmitriy Zaporozhets e956066d4a Add tests for initializing bare repo and creating new file in it 2015-01-27 12:19:32 -08:00
Marin Jankovski 95db00c3e9 Still need the javascript on the project edit page. 2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets 8933149b9e Merge branch 'add_titles_to_links' into 'master' 
Add titles to all nav links

See merge request !313
 2015-01-27 19:41:46 +00:00
Dmitriy Zaporozhets 2fa36ddd9c Replace p with h4 for empty repo text 2015-01-27 11:32:28 -08:00
Sytse Sijbrandij 94381704d1 Merge branch 'active-users-and-logged-in-users' into 'master' 
Active users and logged in users

/cc @marc @haydn @dzaporozhets

See merge request !1443
 2015-01-27 18:37:00 +00:00
Valery Sizov 79ca8146f3 Merge branch 'github-no-omniauth' into 'master' 
Don't require omniauth to enable github importer

I noticed the github importer is only enabled when omniauth authentication is also enabled. That isn't actually necessary -- just the oauth keys from GitHub are required to be configured.

The fix for this is very simple.

See merge request !316
 2015-01-27 18:33:09 +00:00
Dmitriy Zaporozhets 6182f1cabf Use larger avatar on application header 2015-01-27 09:48:42 -08:00
Sytse Sijbrandij 233f9f0766 Prevent confusion between active users and 30 day users. 2015-01-27 09:35:46 -08:00
Dmitriy Zaporozhets 7e6fa0afd6 Update CHANGELOG with new stuff 2015-01-27 09:30:16 -08:00
yglukhov 4fefd353d8 Update semantic-ui-sass to 1.8 2015-01-27 15:14:52 +02:00
Boyan Tabakov 93bc2d5202 Added support for firing system hooks on group create/destroy and adding/removing users to group. 
Added tests and updated docs. Also adding 'user_id' field in the hooks for adding/removing user from team.
 2015-01-27 09:25:28 +02:00
Dmitriy Zaporozhets 724ccadbd2 Merge branch 'improve-web-edit' into 'master' 
Improve web editor

* focus on web editor
* Make editor looks same for new and edit file
* Refactor editor JS
* Improved satellite logic for new files

See merge request !1441
 2015-01-27 07:19:49 +00:00
Marin Jankovski ededa98995 Shorter check in services controller. 2015-01-26 22:46:54 -08:00
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Marin Jankovski 33913f9b8f Make issue tracker service fields required. 2015-01-26 22:08:27 -08:00
Dmitriy Zaporozhets 8ecf7d3207 Improve web editor filename placeholder 2015-01-26 20:58:38 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Dmitriy Zaporozhets aac36b120e Fix app title when browse blob 2015-01-26 19:28:11 -08:00