home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Jeremy f79b6af18a Fix HoundCI 2015-02-02 09:59:43 +01:00
Jeremy 3cd1eda5a4 Add restrict_to_branch to service controller 
And add restrict_to_branch to spec
 2015-02-02 09:59:42 +01:00
Jeremy b4d9ceb26f Add Asana service 
Also add ability to render "service.help" in markdown
 2015-02-02 09:59:42 +01:00
Marco Cyriacks a54e9e5459 Fix raw image paste from clipboard 
This patch binds the textarea (markdown area) paste event to the
handlePaste() function (that was already present).

Furthermore the event processing is improved in the following way:

- The default paste event handler of the browser is only disabled if the
  browser fully supports clipboardData AND there realy is image data in
  the event object. In all other cases (no support or no image) the
  default handler processes the text paste.
- Some obsolete code was removed.
- The pasteText() function (which is somehow buggy because it places the
  cursor at the end of the text independantly from its position before the
  paste) is only used to place the image link after image data was pasted.
 2015-02-01 22:26:34 +01:00
Tim Bishop 0fe1c9b648 Fix group search to check path as well as name. 
The API documentation says:

"You can search for groups by name or path with: /groups?search=Rails"

But you can't because the search query only checks the name, not
the path. This fixes that.
 2015-01-30 23:49:01 +00:00
Dmitriy Zaporozhets b7cf72f6ea Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-29 22:43:13 -08:00
Dmitriy Zaporozhets 71ebf3aa1c Merge pull request #8670 from tsigo/rs-fa-icon-helper 
Add icon helper method
 2015-01-29 22:42:37 -08:00
Dmitriy Zaporozhets 78d7c5087b Use tile avatars for user/group show pages 2015-01-29 17:30:51 -08:00
Dmitriy Zaporozhets 31245a40c1 Remove : from headers 2015-01-29 17:13:28 -08:00
Dmitriy Zaporozhets f1cf49218f Improve contribution calendar on user page 
* cache user contributions for day
* ignore forks in calendar contribtuions
 2015-01-29 17:07:44 -08:00
Dmitriy Zaporozhets a3c2873f50 Merge pull request #8676 from tsigo/rs-repository-cache 
Refactor Repository to use new RepositoryCache class
 2015-01-29 16:45:39 -08:00
Dmitriy Zaporozhets 5ec36902dd Fix calendar js 2015-01-29 16:00:46 -08:00
Marco Wessel 20e269cb92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 
Conflicts:
	CHANGELOG
	db/schema.rb
 2015-01-30 00:16:24 +01:00
Robert Speicher 4eafc18843 Refactor Repository to use new RepositoryCache class 
Abstracts away the lower-level implementation details from the
Repository model.
 2015-01-29 13:03:47 -05:00
Dmitriy Zaporozhets 08582f1532 Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00
Achilleas Pipinellis 4ce18089f6 Remove text about hidden settings. 2015-01-29 17:13:38 +02:00
Dmitriy Zaporozhets 1f0e16569f Load contribution calendar via AJAX 2015-01-29 01:20:17 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets beb7a42548 Merge branch 'ux-fixes' into 'master' 
UX improvements (Implement lessons from user testing)

* add link to permissions help page from new project/group member form
* Improve UX for widget if merge request can not be merged
* Improve wording for fork project page

See merge request !1448
 2015-01-29 07:01:58 +00: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 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 f2f7b5a18e Better wording 2015-01-28 15:37:20 -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
Dmitriy Zaporozhets 34b7472b33 Improve wording for fork project page 2015-01-28 14:20:00 -08:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Dmitriy Zaporozhets b40809d731 Improve UX for widget if merge request can not be merged 2015-01-28 11:25:13 -08:00
Dmitriy Zaporozhets 965cec68ac Project/Group access dropdown should contain link to permissions help page 2015-01-28 10:53:28 -08:00
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08:00
Robert Speicher 4e7a4cd956 Use icon helper method in helper modules 2015-01-28 03:48:18 -05:00
Robert Speicher fe831dcd6f Move spinner helper into IconsHelper 
Also updates it to use the new `icon` method.
 2015-01-28 03:37:44 -05:00
Robert Speicher 8633bbc9b8 Add icon helper method 2015-01-28 03:37:44 -05: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
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 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 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
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