home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +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 d3067379a4 Fix project search showing always no results if no merge requests matches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 12:48:00 +03:00
Dmitriy Zaporozhets bdb9340e4d Merge pull request #7385 from Razer6/fix_search_empty_project 
Fix 500 on searching on empty project, restyle search page
 2014-08-11 12:41:58 +03:00
Dmitriy Zaporozhets 7122a823f8 Merge pull request #7393 from Razer6/fix_500_hook_service_down 
Prevent 500 if hook url is down when testing a hook, fixes #7376
 2014-08-11 12:41:35 +03:00
Dmitriy Zaporozhets 42d4ed3a40 Merge pull request #7417 from woita/follow-history-for-files 
history for files follows after rename
 2014-08-11 12:41:00 +03:00
Dmitriy Zaporozhets 91d6f916c7 Merge pull request #7432 from Razer6/disable_comment_btn_if_empty 
Disable 'Save changes' button if input is empty, fixes #6351
 2014-08-11 12:40:48 +03:00
Robert Schilling f361be9eca Restyle search page 
Use ruby 1.9 syntax
 2014-08-11 11:34:45 +02:00
Dmitriy Zaporozhets d4b1770008 Merge branch 'christian.taedcke/gitlab-ce-add_complete_commit_message_to_api' 2014-08-11 12:33:17 +03:00
Dmitriy Zaporozhets 5b52d7b979 Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-11 12:33:04 +03:00
Robert Schilling da7e14c864 fix searching on empty project, prevent 500 
Fix hound
 2014-08-11 11:31:37 +02:00
Dmitriy Zaporozhets 04d1128b8a Merge branch 'less-chatty-hipchat-intergation' into 'master' 
Less chatty HipChat intergation

The HipChat integration is noisy. In our team it constantly overwhelms the channel with a lot of commits or the bodies of their messages. It's very easy to loose the actual conversation in the midst of this.

This request does two things:

* Limit the number of shown commits on every push
* Display only the first line (the subject) of each commit messages

We tried it and found it was nicer for us 😄

See merge request !159
 2014-08-11 09:29:40 +00:00
Dmitriy Zaporozhets d10ecacc47 Merge branch 'master' into 'master' 
Let users limit by archived/not archived projects in GitLab API GET /projects

Adds a boolean parameter, archived, to the /projects endpoint.

See merge request !158
 2014-08-11 09:27:24 +00:00
Robert Schilling 13c17ed494 Turn if/else branch vor valid compare error message 2014-08-11 09:41:05 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Robert Schilling 0e3f8ea2ef Use simple_format if we don't have a proper renderer 2014-08-10 14:33:22 +02:00
Robert Schilling 4862f75a3d Add retry option of travis and bundler 2014-08-10 13:31:11 +02:00
Robert Schilling 2fd30cc57f Rescue if markup fails, fixes #7455 2014-08-10 13:25:35 +02:00
Dmitriy Zaporozhets 9d3e384ae6 Merge branch 'better-formulated-memory-requirements' into 'master' 
Better formulated memory requirements

See merge request !1010
 2014-08-09 18:02:43 +00:00
Dmitriy Zaporozhets d28077204a Merge branch 'sidekiq-and-ram' into 'master' 
Sidekiq and ram

/cc @jacobvosmaer

See merge request !1011
 2014-08-09 18:01:50 +00:00
Dmitriy Zaporozhets 8c34c94a4f Fix test broken by abdc442648 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-09 21:00:03 +03:00
Dmitriy Zaporozhets e09ef2fc38 Merge branch 'improve-test-env' into 'master' 
Improve test env

* Replace big gitlabhq repo with small one (https://gitlab.com/gitlab-org/gitlab-test)
* dont stub gitlab-shell calls

Advantages:

* test gitlab-shell install during tests
* test integration with gitlab-shell features (fork, change default branch etc)
* don't store archive with test repo inside gitlab
* less stubs - easier to write/read tests

During this refactoring __next issues are be fixed__:

* satellite error if gitlab_shell path is relative
* project rename repo -> 500 error
* fixed wrong diff for MR `download plain diff`
* fixed bug when gfm ignores `@ref` variable during link parsing

Fixes #1451

See merge request !1005
 2014-08-09 17:51:31 +00:00
Sytse Sijbrandij ab19a966f0 Explain that sidekiq doesn't eat as much ram as some people seem to suspect https://twitter.com/khrogos/status/498062432938782720 2014-08-09 14:21:25 +02:00
Sytse Sijbrandij a52db7831b Ensure that people know you need swap. Raise swap space for 512MB setups. 2014-08-09 11:19:19 +02:00
Dmitriy Zaporozhets a0755d2f05 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:46:17 +03:00
Dmitriy Zaporozhets fe228b89d5 Fix application helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-07 20:12:02 +03:00
Jacob Vosmaer c0e1312567 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-07 17:19:23 +02:00
Jeroen van Baarsen 95336ac0fb Merge pull request #7442 from bbodenmiller/patch-9 
make bullet punctuation on protected branches page consistent
 2014-08-07 10:49:24 +02:00
Jeroen van Baarsen f02d9eb254 Merge pull request #7434 from Razer6/fix_spelling_error 
Fix spelling errors in documentation
 2014-08-07 10:29:40 +02:00
Robert Schilling abdc442648 Fix spelling errors in doc, closes #7437 
Further changes
 2014-08-07 10:27:54 +02:00
Jeroen van Baarsen e4da9d7c12 Merge pull request #7433 from bbodenmiller/patch-1 
add application check commands to 5.0 to 5.1 upgrade guide
 2014-08-07 10:18:27 +02:00
Jacob Vosmaer e0fea696c6 Skip LDAP cache check when LDAP is disabled 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 1118a6fd34 Add a spec for User#requires_ldap_check? 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 82dc40936a Cache LDAP check in Gitlab::UserAccess 
This changes the number of LDAP calls when users access GitLab via
Git-over-SSH or the API. LDAP check results are cached for 1 hour.
 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 15eaeb8ee1 Merge branch 'doc/api_file_edit' into 'master' 
Make file edit error message less specific

See merge request !1007
 2014-08-06 15:54:48 +00:00
Sytse Sijbrandij 43f560b174 Add comments. 2014-08-06 17:44:57 +02:00
Jacob Vosmaer aa5e663f85 List API file edit failure conditions in docs 2014-08-06 14:28:22 +02:00
Jacob Vosmaer 11d5ad2f17 Make file edit error message less specific 
The truth is that at the point where there error message is written we
can only guess what went wrong.
 2014-08-06 14:27:22 +02:00
Sytse Sijbrandij 352af72f43 Dot after password makes it confusing and hard to copy/paste. 2014-08-06 11:28:14 +02:00
Dmitriy Zaporozhets 349eaaa9c2 Fix gfm specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 12:15:05 +03:00
Dmitriy Zaporozhets e1f141ac1a gfm should respect @ref value when build relative links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 12:14:53 +03:00
Dmitriy Zaporozhets e4c6dbe35f Fix api files specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:57:15 +03:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets b954f24420 Fix MR controller tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:07:11 +03:00
Ben Bodenmiller 66f8a44fd3 make bullet punctuation consistent 2014-08-04 20:51:26 -07:00
Ben Bodenmiller ecd33c9d92 add git config --global core.autocrlf check 
core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script
 2014-08-04 20:41:20 -07:00
Ben Bodenmiller 9e4a9935c2 Add dealing with newlines for editor to 5.1-to-6.0 
backport of https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1
 2014-08-04 15:22:15 -07:00
Ben Bodenmiller 6a412c9969 add application check commands 2014-08-04 12:56:08 -07:00
Robert Schilling 15c682fcb0 Disable 'Save changes' button if input is empty, fixes #6351 2014-08-04 20:29:17 +02:00
Jacob Vosmaer eb7baeef9b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-04 17:44:48 +02:00
Jacob Vosmaer c13d447750 Merge branch 'simplify-ssl-setup' into 'master' 
Simplify ssl setup

/cc @dzaporozhets

Fixes #1409

See merge request !1006
 2014-08-04 14:06:21 +00:00