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
11,472 Commits 48 Branches 340 Tags
f2007e748890a2b818b4f3b0dceea0a5158df539
Commit Graph
11472 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij f2007e7488 Merge branch 'testme_url' into 'master' 
Fetch the testme repository from gitlab.com

See merge request !1078
 2014-09-10 10:33:13 +00:00
Jacob Vosmaer b0435576df Fetch the testme repository from gitlab.com 
The repository was removed from github.com/gitlabhq.
 2014-09-10 12:22:47 +02:00
Dmitriy Zaporozhets 6b7e80cb19 Prevent 500 error when search wiki for non-existing repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 17:56:33 +03:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Dmitriy Zaporozhets 04cf074552 Merge branch 'bourne_shell' into 'master' 
Wrap arguments for `[ -z` in double quotes

See merge request !1071
 2014-09-09 12:31:41 +00:00
Dmitriy Zaporozhets 0cff6df0f2 Merge branch 'add-ci-to-blacklist' into 'master' 
Add ci to blacklist

See merge request !1075
 2014-09-09 12:30:55 +00:00
Marin Jankovski 8ebb26fcc1 Add diff_helper spec. 2014-09-09 13:17:42 +02:00
Dmitriy Zaporozhets 29e7647a08 Merge branch 'close_button_after_added_comment' into 'master' 
Close button after added comment

Fixes #1549

See merge request !1070
 2014-09-09 11:02:10 +00:00
Dmitriy Zaporozhets 60ea455d08 Merge branch 'api-project-path' into 'master' 
API: Project create docs miss path argument

Fixes #1551

See merge request !1074
 2014-09-09 11:00:55 +00:00
Marin Jankovski 2ff83aa389 Fix typo. 2014-09-09 11:52:16 +02:00
Marin Jankovski ac6a107ac7 Add line code to parallel diff for linking. 2014-09-09 11:36:29 +02:00
Marin Jankovski 9c3935c5b0 Use the new path to the partial, move the diff related methods to the new helper. 2014-09-09 11:10:40 +02:00
Marin Jankovski be4359efba Merge branch 'refactor-diff-yeild' into 'parallel_diff_refactor' 
Refactor diffs

This refactoring done on top of Marin improvements to side-by-side diff.
Main target of this refactoring is to reduce mess and increase test coverage.

1. Use objects:
  * Gitlab::Diff::Line for line change in diff
  * Gitlab::Diff::File for file changes (diff + blob info)
2. Avoid `yield` magic
3. Move logic from views/helper to models/libs
4. Move diff views under separate dir `app/views/projects/diffs`

See merge request !1072
 2014-09-09 08:34:26 +00:00
Sytse Sijbrandij 685757b9d6 Prevent people from using ci since we plan to host ci on /ci later. 2014-09-09 10:11:07 +02:00
Dmitriy Zaporozhets 8c765aaf3f Update project api docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 10:52:30 +03:00
Dmitriy Zaporozhets a83975ab8d API: Create project - make sure project path is respected 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 10:48:58 +03:00
Dmitriy Zaporozhets 4e4e1cb9b5 More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 10:36:25 +03:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Sytse Sijbrandij 002ce69e8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-09 09:19:52 +02:00
Sytse Sijbrandij 9ae702b0f1 Merge branch 'fix-images-on-github' into 'master' 
Fix images on github

Fixes https://dev.gitlab.org/gitlab/organization/issues/55

/cc @job @dzaporozhets

See merge request !1073
 2014-09-09 07:19:23 +00:00
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
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
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
Marin Jankovski dac5e6de5a After comment is added, button should go back to Close button. 2014-09-08 14:07:31 +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