home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,979 Commits 48 Branches 340 Tags
367dee33e260fec07c6ebaf4e10b76e6dcda816d
Commit Graph
13979 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 367dee33e2 Merge branch 'services-index' into 'master' 
Add index on order columns for services table

See merge request !1492
 2015-02-09 22:52:28 +00:00
Dmitriy Zaporozhets 8c8fa63f58 Merge branch 'bug/default_issue_tracker' into 'master' 
Bug fix for default issue tracker

See merge request !1493
 2015-02-09 22:51:57 +00:00
Marin Jankovski 00c7d533a0 Default issue tracker fix for creating default issue service. 2015-02-09 14:33:47 -08:00
Dmitriy Zaporozhets aaa7a065c6 Add index on order columns for services table 2015-02-09 14:21:52 -08:00
Dmitriy Zaporozhets 86bb522713 Merge branch 'changelog-description' into 'master' 
Changelog description

Please merge before tomorrow.

See merge request !1491
 2015-02-09 21:08:45 +00:00
Sytse Sijbrandij f5769c4ced Link about random order doesn't make any sense, added it to the changelog. 2015-02-09 12:50:18 -08:00
Sytse Sijbrandij 29f78d1976 Better explain the changelog policy. 2015-02-09 12:45:39 -08:00
Sytse Sijbrandij 72decfb1b9 Merge branch 'improve-release-guides' into 'master' 
Improve release guides

* move update docs to separate file to prevent mess with rc tasks
* update patch release guide
* update GitLab.com when packages are done. No need to wait 2 days

See merge request !1490
 2015-02-09 19:38:59 +00:00
Dmitriy Zaporozhets 43890ed1dc Update patch release document 2015-02-09 10:46:38 -08:00
Dmitriy Zaporozhets 026494029e Update GitLab.com when packages are done. No need to wait 2 days for it 2015-02-09 10:32:56 -08:00
Dmitriy Zaporozhets c93f4662d8 Extract update guide to separate doc to prevent mess 2015-02-09 10:30:06 -08:00
Dmitriy Zaporozhets bd19bce37c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-09 08:46:18 -08:00
Dmitriy Zaporozhets 3e4e5f7063 Merge branch 'improve-oauth-ux' into 'master' 
Improve OAuth UX

See merge request !1489
 2015-02-09 16:45:25 +00:00
Jeroen van Baarsen dc365a1d20 Merge pull request #8620 from namnatulco/master 
Added a note saying inline HTML is disabled by default
 2015-02-09 11:52:28 +01:00
Dmitriy Zaporozhets 0a34f2dcb5 Merge pull request #8580 from j0k3r/asana 
Add Asana service
 2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets fa3a7ef037 Merge pull request #8740 from cinderblock/master 
Be less restrictive on key comment extraction
 2015-02-08 01:07:23 -08:00
Dmitriy Zaporozhets 8c12c93e07 Merge pull request #8749 from sashkab/b8748-emailheader 
Addex X-GitLab-Project header to GitLab emails.
 2015-02-08 01:06:38 -08:00
Dmitriy Zaporozhets 03c8bf39e1 When add new social account - redirect to accounts page and show notice message 2015-02-08 00:53:31 -08:00
Dmitriy Zaporozhets 64673acf9f Merge branch 'duduribeiro-fix_showing_overflow' into 'master' 
Fix project sidebar overflow small screens

See merge request !1488
 2015-02-08 03:43:01 +00:00
Dmitriy Zaporozhets c5a16b8c60 Merge branch 'autosave' into 'master' 
Autosave and autorestore unsaved comments.

Closes #1738.

See merge request !1480
 2015-02-08 02:45:20 +00:00
Dmitriy Zaporozhets 6729e4cfc2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-07 18:42:53 -08:00
Dmitriy Zaporozhets 3cd036e315 Merge branch 'notification_email' 
Conflicts:
	db/schema.rb
 2015-02-07 18:42:34 -08:00
Dmitriy Zaporozhets 377d461f26 Merge branch 'import-all-projects' into 'master' 
Add "Import all projects" button to GitHub and GitLab import pages.

Closes #1963.

See merge request !1482
 2015-02-08 02:39:29 +00:00
Dmitriy Zaporozhets e3a9bb8026 Merge branch 'fix_showing_overflow' of https://github.com/duduribeiro/gitlabhq into duduribeiro-fix_showing_overflow 2015-02-07 18:32:13 -08:00
Carlos Ribeiro eef461d4a1 Fix showing overflow when have several items at sidebar 2015-02-07 21:35:44 -02:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email. 
Closes #1932.
 2015-02-07 23:19:17 +01:00
Douwe Maan db7921f2d8 Add "Import all projects" button to GitHub and GitLab import pages. 
Closes #1963.
 2015-02-07 23:15:04 +01:00
Dmitriy Zaporozhets 49d6721329 Add gitlab to oauth providers 2015-02-07 13:49:05 -08:00
Dmitriy Zaporozhets 9a3afa4d19 Merge branch 'refactor-avatars' into 'master' 
Refactor avatars css

See merge request !1487
 2015-02-07 21:26:26 +00:00
Douwe Maan 463d9f76e4 Autosave and autorestore unsaved comments. 
Closes #1738.
 2015-02-07 20:55:17 +01:00
Dmitriy Zaporozhets 72cf8173ad Merge branch 'clean-up-devise-views' into 'master' 
Clean up devise views

See merge request !1472
 2015-02-07 19:50:15 +00:00
Dmitriy Zaporozhets 2c3fe16fbb Merge branch 'filter-private-token-param' into 'master' 
Filter private_token and password_confirmation params from logs.

Closes #1770.

```
Started GET "/profile?private_token=[FILTERED]" for 127.0.0.1 at 2015-02-06 22:54:03 +0100
Processing by ProfilesController#show as HTML
  Parameters: {"private_token"=>"[FILTERED]"}
```

See merge request !1483
 2015-02-07 19:43:34 +00:00
Dmitriy Zaporozhets f228e17d39 Add project-avatar and group-avatar css classes 2015-02-07 11:38:58 -08:00
Aleks Bunin 36b255e57b Addex X-GitLab-Project header to GitLab emails. 
Fixes #8748.
 2015-02-07 12:35:50 -05:00
Dmitriy Zaporozhets 5bf33f977c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-06 23:58:04 -08:00
Dmitriy Zaporozhets 4cce10583d Fix tests for semaphore 2015-02-06 23:57:28 -08:00
Sytse Sijbrandij d3c2253c6d Merge branch 'webhooks-and-internal-services' into 'master' 
Add doc on "Web Hooks and insecure internal web services".

See #1971.

See merge request !1485
 2015-02-07 01:15:09 +00:00
Douwe Maan 4ed70669ad Add doc on "Web Hooks and insecure internal web services". 2015-02-07 01:54:45 +01:00
Dmitriy Zaporozhets 89f8020fe1 Merge branch 'mention-groups' 
Conflicts:
	CHANGELOG
 2015-02-06 16:45:37 -08:00
Douwe Maan 8d1fa44f23 Filter private_token and password_confirmation params from logs. 
Closes #1770.
 2015-02-06 22:55:43 +01:00
Dmitriy Zaporozhets 8c4b98bec7 Merge branch 'order-index' into 'master' 
Add index to order columns

See merge request !1481
 2015-02-06 21:24:17 +00:00
Dmitriy Zaporozhets bdf49cc70b Fix spelling in changelog 2015-02-06 20:52:34 +00: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 6b61c90498 Merge branch 'markdown-preview-via-post' into 'master' 
Don't have Markdown preview fail for long comments/wiki pages.

See https://github.com/gitlabhq/gitlabhq/issues/8611.

See merge request !1479
 2015-02-06 17:55:30 +00:00
Dmitriy Zaporozhets 07715ce5d5 Merge branch 'update_smtp_example' into 'master' 
Update smtp example to add openssl_verify_mode

See merge request !1478
 2015-02-06 17:54:00 +00:00
Dmitriy Zaporozhets ce0811ae5c Improve tests 2015-02-06 09:19:51 -08:00
Douwe Maan 639c93b4f2 Don't have Markdown preview fail for long content by using POST rather than GET. 
See https://github.com/gitlabhq/gitlabhq/issues/8611.
 2015-02-06 11:23:12 +01:00
Dmitriy Zaporozhets f9e6f66898 Fix tests 2015-02-05 22:40:35 -08:00
Dmitriy Zaporozhets bdfb349ff7 Refactor and improve sorting objects in API for projects, issues and merge requests 2015-02-05 22:00:54 -08:00