home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,673 Commits 48 Branches 340 Tags
6d034e5f538e661835ad22124e487b0ecdfee3ea
Commit Graph
13673 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -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
Dmitriy Zaporozhets e6b97d0947 Improve font sizes for code and diff 2015-01-26 18:56:56 -08:00
Dmitriy Zaporozhets 0f52d25961 Merge branch 'init-from-ui' into 'master' 
File creation and editing refactored

* Refactored controllers/helpers/views related to blob resource
* make it possible to create new file in empty repository

Second step in building #1930

See merge request !1440
 2015-01-27 02:45:54 +00:00
Dmitriy Zaporozhets ed8c3e2d73 Remove unnecessary reload in test 2015-01-26 16:10:34 -08:00
Dmitriy Zaporozhets 90ba3a385c Fix tests for blobs refactoring 2015-01-26 16:08:59 -08:00
Dmitriy Zaporozhets 79915528d8 Merge branch 'bigger-font' into 'master' 
Bigger font-size for code browsing

See merge request !1439
 2015-01-27 00:08:30 +00:00
Dmitriy Zaporozhets 2b05060149 Merge branch 'init-from-ui' into 'master' 
Create first file from empty repository via UI. pt1

* Backend can now commit file to empty repository.
* Empty project UI has new file button

First step in building #1930

See merge request !1438
 2015-01-26 23:36:57 +00:00
Dmitriy Zaporozhets 2b8b060236 Make code font size a bit bigger so its easier to read it 2015-01-26 15:15:51 -08:00
Dmitriy Zaporozhets ed91378627 Fix blob controller rendering in case of errors 2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets 752cb506c0 Refactor blob views 2015-01-26 15:03:30 -08:00
Dmitriy Zaporozhets 21297e78af Refactor blob helpers 2015-01-26 15:03:14 -08:00
Dmitriy Zaporozhets e07da5989f SEtup new routes for creating and changing repository files 2015-01-26 15:02:59 -08:00
Dmitriy Zaporozhets 59b08942aa Refactor blob controllers 2015-01-26 15:02:28 -08:00
Dmitriy Zaporozhets c916124178 Explicitly set before_filter for ref-related controllers 2015-01-26 15:01:51 -08:00
Dmitriy Zaporozhets 6a2384e0bc Make draft UI for creating new file in empty repository 2015-01-26 13:37:18 -08:00
Dmitriy Zaporozhets 3e47ea5064 Files::CreateService can now commit file to empty repository 2015-01-26 13:31:24 -08:00
Marco Wessel 05b6bb4bf7 Don't require omniauth to be enabled, to use github importer 2015-01-26 21:25:13 +01:00
Dmitriy Zaporozhets ff7055eef3 Merge branch 'redesign-project-avatar' into 'master' 
Redesign project avatar page

See merge request !1437
 2015-01-26 17:26:32 +00:00
Dmitriy Zaporozhets e20dba0299 Redesign way how project avatar displayed on project page 2015-01-26 00:23:16 -08:00
Dmitriy Zaporozhets b926b02332 Merge branch 'notify-participants' into 'master' 
Notify participants on close or reopen of issue/mr

Fixes #1891

cc @sytse

See merge request !1436
 2015-01-26 07:37:33 +00:00
Dmitriy Zaporozhets 9d85ea3acf Organize event order execution when update issue or mr 2015-01-25 22:49:05 -08:00
Dmitriy Zaporozhets 2b02852507 Add issue/mr participants to reasign events 
Also refactor NotificationService a bit
 2015-01-25 20:31:02 -08:00
Dmitriy Zaporozhets 615488150b Update CHANGELOG with notify participants change 2015-01-25 20:01:32 -08:00
Dmitriy Zaporozhets ce9686e3f5 Include issue/mr participants in list of recipients for close/reopen emails 2015-01-25 19:59:04 -08:00
Dmitriy Zaporozhets a4dad70858 Fix project name truncation for dashboard 2015-01-24 23:59:03 -08:00
Dmitriy Zaporozhets 1f770b0ffa Merge branch 'improve-project-icon-ui' into 'master' 
Improve project icon UI

See merge request !1435
 2015-01-25 07:37:34 +00:00
Dmitriy Zaporozhets 7a84dcf222 Merge branch 'remove-default-project-icon' into 'master' 
Remove default project icon

See merge request !1434
 2015-01-25 07:36:57 +00:00
Dmitriy Zaporozhets 773b1eaf8f Fix avatar margin for project home page 2015-01-24 23:35:02 -08:00
Dmitriy Zaporozhets 3588a07b83 Remove default project icon 2015-01-24 23:08:52 -08:00
Dmitriy Zaporozhets 89f9ae77e2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-24 22:46:10 -08:00
Dmitriy Zaporozhets 254d1d7aa0 Merge branch 'haynes/gitlab-ce-project_avatar' into 'master' 
Project avatar

See merge request !1433
 2015-01-25 06:45:32 +00:00
Dmitriy Zaporozhets b92449c73e Predefine colors for project identicons 2015-01-24 22:03:30 -08:00
Dmitriy Zaporozhets 3af2ac9df0 Merge branch 'wip-documentation' into 'master' 
Add return value example to ssh key creation

See merge request !307
 2015-01-25 04:38:39 +00:00
Robert Schilling fae7b3519a Merge pull request #8650 from yatish27/patch-1 
Fixes typo in config.rb
 2015-01-24 20:48:07 +01:00
Yatish Mehta 517cc92c65 Fixes typo in config.rb 2015-01-24 14:25:16 -05:00