home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets 4d5435410f Merge branch 'jubianchi-api/improve-error-reporting' into 'master' 
Merge jubianchi-api/improve-error-reporting

Closes https://github.com/gitlabhq/gitlabhq/pull/7502

See merge request !1112
 2014-09-24 09:25:55 +00:00
Dmitriy Zaporozhets 7dba4ece66 Merge branch 'git-access-tests' into 'master' 
Gitlab::GitAccess tests

Fixes #1616

See merge request !1113
 2014-09-24 09:25:18 +00:00
Dmitriy Zaporozhets 15ba6ea105 Refactor Gitlab::GitAccess tests 2014-09-24 12:04:40 +03:00
Dmitriy Zaporozhets 3aa7132adc Add GitAccess specs 2014-09-24 11:37:30 +03:00
Robert Schilling b794fdbbbe Merge pull request #7838 from cirosantilli/evaluate-exec 
evaluate -> execute_script when return not needed.
 2014-09-24 10:28:15 +02:00
Robert Schilling b64702316d Merge pull request #7837 from cirosantilli/go-back 
evaluate_script history -> go_back and go_forward.
 2014-09-24 10:13:44 +02:00
Ciro Santilli b9c2e6ebdc evaluate -> execute_script when return not needed. 2014-09-24 10:03:51 +02:00
Ciro Santilli 4e89860826 evaluate_script history -> go_back and go_forward. 2014-09-24 09:51:27 +02:00
skv a286f92050 blame with rugged 2014-09-24 11:35:13 +04:00
Sytse Sijbrandij 8d7ed7e53b Add notice about weekend in release cycle. 2014-09-24 08:42:45 +02:00
Ciro Santilli 99bc22d7b4 Remove test line without effect because no should. 2014-09-23 23:55:23 +02:00
Robert Schilling 6da15541d3 Merge pull request #7833 from cirosantilli/wiki-cur-url 
Factor current_url + URI.path into current_path.
 2014-09-23 22:14:17 +02:00
Ciro Santilli b095c1a44e Factor current_url + URI.path into current_path. 2014-09-23 21:56:38 +02:00
Ciro Santilli b5c0bdd7c9 Factor fork button view. 2014-09-23 21:16:27 +02:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Dmitriy Zaporozhets 3c9ea7f4a9 Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edge 
Fix not rendered the network graph edges
 2014-09-23 21:33:50 +03:00
Dmitriy Zaporozhets a8fc10e3d0 Merge pull request #7317 from drpdigitalmedia/master 
set the collation to utf8_general_ci
 2014-09-23 21:33:33 +03:00
Dmitriy Zaporozhets 66955bba38 Merge pull request #7795 from cirosantilli/factor-notes-css 
Factor .add-diff-note active state.
 2014-09-23 21:31:56 +03:00
Dmitriy Zaporozhets 6e328d5590 Merge pull request #7793 from cirosantilli/replace-javascript 
Replace javascript:; links with buttons.
 2014-09-23 21:28:35 +03:00