home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,968 Commits 48 Branches 340 Tags
bd19bce37c9ec0aa3af0e061005d7f146d799708
Commit Graph
1508 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana 
Add Asana service
 2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' 
Conflicts:
	db/schema.rb
 2015-02-07 18:42:34 -08:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01:00
Dmitriy Zaporozhets 4cce10583d Fix tests for semaphore 2015-02-06 23:57:28 -08:00
Dmitriy Zaporozhets 89f8020fe1 Merge branch 'mention-groups' 
Conflicts:
	CHANGELOG
 2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets 3e97ac2022 Add index on order columns 2015-02-06 10:21:48 -08:00
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master' 
Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476
 2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets 8952fc015f Apply default scope to labels and remove one for notes 2015-02-05 20:29:41 -08:00
Dmitriy Zaporozhets c5be267e40 Refactor issuable sorting a bit 2015-02-05 20:21:21 -08:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Dmitriy Zaporozhets e0aa5c371e Fix method overlap for issue sorting 2015-02-05 16:49:41 -08:00
Dmitriy Zaporozhets 62ed1c537e Explicitly define ordering in models using default_scope 2015-02-05 14:20:55 -08:00
Douwe Maan 58ecb06f74 Remove duplicates from group milestone participants list. 2015-02-05 21:26:57 +01:00
Douwe Maan 9910b7ff99 Allow groups to be mentioned. 
Resolves #1673.
 2015-02-05 19:10:52 +01:00
Dmitriy Zaporozhets 0e2fcb68d7 Disable project path blacklist 
Because since project always belongs to namespace it dont need such
strict restrictions any more
 2015-02-04 15:23:38 -08:00
Dmitriy Zaporozhets c2c1630905 Merge branch 'fix/groupsearch' into 'master' 
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.

See merge request !325
 2015-02-04 23:01:52 +00:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets a89d7adfa4 Rescue connection reset for web hooks 2015-02-03 13:57:28 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets 9fbdbf8b3f Rubocop: Style/Alias enabled 2015-02-02 20:57:10 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Jeremy f79b6af18a Fix HoundCI 2015-02-02 09:59:43 +01:00
Jeremy b4d9ceb26f Add Asana service 
Also add ability to render "service.help" in markdown
 2015-02-02 09:59:42 +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 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
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 a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -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
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01: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
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08: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
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
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
Marin Jankovski 00a0d5aeea Move repetition to the parent. 2015-01-26 16:24:11 -08:00
Marin Jankovski 65e700472b Update the issue tracker attribute on issue tracker change. 2015-01-26 11:39:32 -08:00
Marco Wessel aad6ceaef9 Allow configuring protection of the default branch upon first push 2015-01-25 17:09:10 +01:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Marin Jankovski c70dcd2907 Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 2015-01-23 12:38:46 -08:00
Marin Jankovski a720dde67c Remove configuration option from project settings page for external issue trackers. 2015-01-23 11:55:41 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Marin Jankovski 103a1bb06d Use service settings instead of config file settings to present issues. 2015-01-23 10:28:38 -08:00
Marin Jankovski 737f6516e6 Update new services with initialization based on existing data. 2015-01-23 09:14:45 -08:00