home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,781 Commits 48 Branches 340 Tags
e71e8609cf7b92b9d2fc9e92f2c58490a6432afd
Commit Graph
11781 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling e71e8609cf Merge pull request #7859 from Razer6/fix_profile_spelling_error 
Fix spelling error on profile page
 2014-09-26 02:03:31 +02:00
Robert Schilling 53f6f537b0 Fix spelling error on profile page 2014-09-26 01:48:17 +02:00
Dmitriy Zaporozhets 143b936300 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-25 18:57:59 +03:00
Dmitriy Zaporozhets d6f04ad831 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-25 18:57:53 +03:00
Dmitriy Zaporozhets 74d4031bbe Minor UI improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:52:33 +03:00
Jacob Vosmaer 8f0551de05 Merge branch 'master' into 'master' 
Small documentation update, add unixsocketperm

If you run gitlab as user ``git`` while redis runs as user ``redis`` and you add git to ``redis`` group, you'll need to set ``unixsocketperm = 0775`` to grant write access to group.

See merge request !192
 2014-09-25 15:48:45 +00:00
Dmitriy Zaporozhets ae94f59bd5 Merge pull request #7803 from cirosantilli/rm-unused-mr-contributing 
Remove ununsed CONTRIBUTING link on edit MR form.
 2014-09-25 18:45:02 +03:00
Dmitriy Zaporozhets 5040dbfbf8 Merge branch 'improve-flash-message' into 'master' 
Improve flash message

* dont fadeout so user can read
* show inside content block so user can notice it

See merge request !1119
 2014-09-25 15:43:10 +00:00
Dmitriy Zaporozhets 8ebe769f26 Small improvements to code rendering for white highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:40:27 +03:00
Daniel Widerin 99e5e6db73 Remove obsolete line 2014-09-25 15:34:11 +00:00
Daniel Widerin 16a6d2450b Use edit in place with sed instead of tee 2014-09-25 15:24:56 +00:00
Daniel Widerin d5dc171cb7 Path on ubuntu is different 2014-09-25 15:23:40 +00:00
Daniel Widerin b874cb21eb Use 'sed' with pre-search to enable only if present in redis config file. 2014-09-25 15:23:06 +00:00
Dmitriy Zaporozhets 20d6f96928 Improve flash messages 
* dont fadeout so user can read
* show inside content block so user can notice it

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:00:21 +03:00
Dmitriy Zaporozhets a6b4e371ee Use gitlab_git v7.0.0.rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 17:25:20 +03:00
Dmitriy Zaporozhets 868755777f Merge branch 'add-bugzilla' into 'master' 
Add bugzilla

See merge request !1114
 2014-09-25 13:59:24 +00:00
Dmitriy Zaporozhets ab729e5c41 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-25 16:58:38 +03:00
Dmitriy Zaporozhets 3a72af480d Merge branch 'use-more-rugged' into 'master' 
Make GitLab CE works with new gitlab_git

Recently we removed grit dependency from `gitlab_git` in favor of rugged.

This changes make GitLab works with new library.

See merge request !194
 2014-09-25 13:58:20 +00:00
Dmitriy Zaporozhets eaeb4a90d4 Fix branch API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:22:08 +03:00
Dmitriy Zaporozhets 66ef5c1aa2 Fix satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:10:10 +03:00
Dmitriy Zaporozhets 3bf316dbd9 Fix security tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 16:10:03 +03:00
Dmitriy Zaporozhets 619c81b488 Fix Commit stats and diff encoding issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:26:35 +03:00
Dmitriy Zaporozhets 3a106cbcd3 Fix graphs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:06:41 +03:00
Dmitriy Zaporozhets 424b42d6e9 Fix 500 error on empty search in project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 15:01:02 +03:00
Daniel Widerin 18adc4f67d Fix 'Invalid socket file permissions' error 2014-09-25 11:09:46 +00:00
Dmitriy Zaporozhets 4b65b0e0f5 Fix wiki 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 13:56:23 +03:00
Dmitriy Zaporozhets b13c1469a3 Rollback diff drop and set default commit id to HEAD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:46:30 +03:00
Dmitriy Zaporozhets 3695ae185b Decorate commit parents 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 12:19:26 +03:00
Jacob Vosmaer b0a4ec5ea2 Merge branch 'backup-time' into 'master' 
Backup time

The suggested backup time conflicts with daylight savings time, which occurs between 1-3am, causing the backup either to be skipped or ran twice.

See merge request !1118
 2014-09-25 07:52:23 +00:00
Jacob Vosmaer 9cd5ff043a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-25 09:50:19 +02:00
Jacob Vosmaer 475c554fdd Merge branch 'sed_backlog' into 'master' 
Sed backlog

See merge request !1117
 2014-09-25 07:47:51 +00:00
Job van der Voort 4ed5a506be set the proposed backup time to 4am 2014-09-25 09:38:17 +02:00
Jacob Vosmaer b268fa0595 Fix the sed command for increasing the backlog 2014-09-25 09:34:29 +02:00
Robert Schilling abab92dc7f Merge pull request #7847 from axilleas/doc_install_redis 
Add missing Redis item list in installation.md#overview
 2014-09-24 22:23:56 +02:00
Achilleas Pipinellis 05b535e1c0 Add missing Redis item list in Overview [ci skip]. 2014-09-24 22:59:26 +03:00
Dmitriy Zaporozhets 2aeac794c2 New entries for 7.4.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-24 19:46:42 +03:00
Dmitriy Zaporozhets 64a2afd3a4 Fix creating new file via web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-24 19:30:58 +03:00
Dmitriy Zaporozhets 184e0f8df1 Fix non-showing error message when edit file via web 2014-09-24 19:15:37 +03:00
Dmitriy Zaporozhets 13aec95264 Improve diff and bump gitlab_git revision 2014-09-24 15:59:57 +03:00
Sytse Sijbrandij de717a3335 Merge branch 'gitlab_ldap_filter' into 'master' 
Add more LDAP user_filter documentation

See merge request !1115
 2014-09-24 12:06:47 +00:00
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +02:00
Daniel Widerin d3dbd353cc Add unixsocketperm note to upgrade guide 2014-09-24 10:48:33 +00:00
Dmitriy Zaporozhets 53f2130e63 Use new version of gitlab_git with extended rugged usage 2014-09-24 13:26:53 +03:00
Dmitriy Zaporozhets 28b6f09fcc Merge pull request #7823 from cirosantilli/test-fetch-shell 
Only clone GitLab Shell on tests if necessary.
 2014-09-24 12:58:10 +03:00
Dmitriy Zaporozhets 0b7377d86e Merge pull request #7820 from skv-headless/move_blame_to_rugged 
blame with rugged
 2014-09-24 12:55:40 +03:00
Sytse Sijbrandij 41cfdd25e2 Add bugzilla to list because people ask about it. 2014-09-24 11:50:00 +02:00
Dmitriy Zaporozhets 79a4da907d Merge pull request #7816 from cirosantilli/factor-fork 
Factor fork button view.
 2014-09-24 12:41:16 +03:00
Dmitriy Zaporozhets f0c0edc2a6 Merge branch 'improve-protect-wording' into 'master' 
Improve protect wording

See merge request !1103
 2014-09-24 09:39:09 +00:00
Marin Jankovski 5c908ba28c Add fixes to changelog 2014-09-24 11:29:47 +02:00
Dmitriy Zaporozhets b390ee1a83 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-24 12:27:10 +03:00