home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +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
Sytse Sijbrandij 47b9ac664e Fix images on GitHub and link to the about url. 2014-09-09 09:18:32 +02:00
Jacob VosmaerandRobert Schilling 3bffae3383 Update the CHANGELOG for 7.2.1 
Conflicts:
	CHANGELOG
 2014-09-09 08:20:18 +02:00
Robert Schilling ee833ddc7d Merge pull request #7630 from bbodenmiller/patch-3 
add missing config files to check during release process
 2014-09-09 08:06:51 +02:00
Dmitriy Zaporozhets 93dc885530 Fix usage of diff file mode change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:25:20 +03:00
Dmitriy Zaporozhets 02e87d9223 optimize show_diff_size_warning? 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 22:12:54 +03:00
Dmitriy Zaporozhets 3d1a246f2c Merge pull request #7697 from Razer6/fix_project_shortcuts 
Change keyboard shortcut for activity to project
 2014-09-08 22:09:12 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Robert Schilling 7f7bf86bbf Change shortcut for activity to project, because navbar changed 2014-09-08 20:49:15 +02:00
Dmitriy Zaporozhets bde3f25d26 Specs for diff parser! Yay! 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:42:12 +03:00
Dmitriy Zaporozhets c741fcab9d Fix all broken stuff after diff refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:41:55 +03:00
Sytse Sijbrandij 3e66c6a47c Merge branch 'omniauth_doc' into 'master' 
Omniauth doc

Fixes #1481

See merge request !1069
 2014-09-08 13:49:24 +00:00
Marin Jankovski 67c956e16d Link the doc in installation document. 2014-09-08 15:30:10 +02:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets e0eb48031d Refactor diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:26:49 +03:00
Dmitriy Zaporozhets 4ef809c77d Gitlab::Diff classes added 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:25:50 +03:00
Jan-Willem van der Meer b18d1c2786 Remove duplicated create method 2014-09-08 15:25:42 +02:00
Sytse Sijbrandij 69c4026ec1 Merge pull request #7654 from bbodenmiller/patch-13 
update ssl_ciphers
 2014-09-08 15:07:59 +02:00
Marin Jankovski 3131d0609c Merge pull request #7147 from zzet/patch-12 
Update markdown reference to external issues
 2014-09-08 14:56:29 +02:00
Jan-Willem van der Meer 11bb67c3c6 Test authenticate method for Gitlab::LDAP::User 2014-09-08 14:53:59 +02:00
Jacob Vosmaer 59d2f6db75 Wrap arguments for [ -z in double quotes 2014-09-08 14:28:42 +02:00
Jacob Vosmaer 9d0614edbb Add Pavel Novitskiy to the CHANGELOG 2014-09-08 14:28:34 +02:00
Jacob Vosmaer 494d15cfde Merge pull request #7258 from presto53/fix_init_scripts_interpreter 
change bash to sh in web, background_jobs scripts
 2014-09-08 14:22:53 +02:00
Sytse Sijbrandij 8088d22d41 Insert at a random point in the changelog to prevent conflicts. 2014-09-08 14:11:21 +02:00
Marin Jankovski dac5e6de5a After comment is added, button should go back to Close button. 2014-09-08 14:07:31 +02:00
Sytse Sijbrandij 0bb1e4b5c0 Fix problems identified by Achilleas Pipinellis, thanks Achilleas. 2014-09-08 13:54:08 +02:00
Jan-Willem van der Meer f27830fa4c Ensure Gitlab::LDAP::authentication is tested 2014-09-08 13:26:25 +02:00
Jan-Willem van der Meer f88b6d0330 Refactor gitlab auth tests 2014-09-08 13:11:39 +02:00
Marin Jankovski e59b3720e9 Move custom Omniauth directions to omniauth doc. 2014-09-08 12:27:11 +02:00
Dmitriy Zaporozhets b712ded13f Merge branch 'gitlab-development-kit' into 'master' 
Recommend the GitLab Development Kit

See merge request !1067
 2014-09-08 09:20:58 +00:00
Dmitriy Zaporozhets 1c70e21113 Merge branch 'create-hooks' into 'master' 
Use create-hooks instead of rewrite-hooks.sh

The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.

See merge request !1068
 2014-09-08 09:19:54 +00:00
Sytse Sijbrandij 1aec74f374 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-08 11:06:00 +02:00
Sytse Sijbrandij bef923055b Merge pull request #7583 from bbodenmiller/https 
[Documentation] simplify HTTPS setup details
 2014-09-08 11:05:19 +02:00
Sytse Sijbrandij 8904d86b7d Merge pull request #7580 from bbodenmiller/patch-7 
add optional nginx configs to make more secure
 2014-09-08 10:58:18 +02:00
Robert Schilling 5d543eb15e Merge pull request #7668 from bbodenmiller/patch-15 
add cleanup section to 5.0 upgrade guide
 2014-09-08 10:29:07 +02:00
Ben Bodenmiller 9a1dcf8d21 add cleanup section to 5.0 upgrade guide 
Add cleanup details to upgrade guide as gitolite and more is no longer
used
 2014-09-08 01:21:21 -07:00
Jacob Vosmaer 042465c448 Use create-hooks instead of rewrite-hooks.sh 
The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.
 2014-09-08 10:16:15 +02:00
Jacob Vosmaer 26e0741ce1 Recommend the GitLab Development Kit 2014-09-08 09:57:42 +02:00
Sytse Sijbrandij 1535835d3e Merge branch 'name-it-centos' into 'master' 
Name it centos

See merge request !1060
 2014-09-08 07:46:23 +00:00
Marin Jankovski 205358b1ae Cleanup 2014-09-08 09:05:17 +02:00
Marin Jankovski 23706716fc Now refactor all to work properly. 2014-09-08 09:05:17 +02:00
Marin Jankovski 13cfa49a3d Color the lines correctly. 2014-09-08 09:05:17 +02:00
Marin Jankovski 7d45624daf Don't show the line numbers if the lines were removed. 2014-09-08 09:05:17 +02:00
Marin Jankovski 721b75733c Take the next type into consideration 2014-09-08 09:05:17 +02:00
Marin Jankovski dc7554d020 Coloring. 2014-09-08 09:05:17 +02:00
Marin Jankovski 75b04a17cf Take added or removed file into account. 2014-09-08 09:05:17 +02:00
Marin Jankovski 357bf00921 File mode changed note. 2014-09-08 09:05:17 +02:00
Marin Jankovski f827482c12 Remove duplication, expand for next_line. 2014-09-08 09:05:16 +02:00
Marin Jankovski 1067b00724 Duplicate the behaviour and refactor for use with parallel diff. 2014-09-08 09:05:16 +02:00
Marin Jankovski b54f2393c3 Parallel diff in two columns. 2014-09-08 09:05:16 +02:00
Dmitriy Zaporozhets de6f4c3135 Merge pull request #7596 from bbodenmiller/patch-5 
add current sign-in date
 2014-09-08 09:37:21 +03:00