home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,984 Commits 48 Branches 340 Tags
9f4613bb8696cf15739ce2deb469407c0bbdefee
Commit Graph
10984 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 9f4613bb86 Fix projects ending with _git or -git being ignored by post-receive hook 2014-08-13 07:24:50 +00:00
Dmitriy Zaporozhets 53ead2e35c Merge branch 'more-email-threading' into 'master' 
Additions to email threading

This MR follows !142:

* Add threading to "Merge request reopened" emails (see 310231dbed)

See merge request !145
 2014-08-12 12:28:19 +00:00
Dmitriy Zaporozhets 3d99622c2d Merge branch 'mr-accept-widget' into 'master' 
Improve MR accept widget

* fixes UX problem with 2 confusing `click here` links.
* separate Accept MR block from manual merge instructions

See merge request !1014
 2014-08-12 12:27:18 +00:00
Dmitriy Zaporozhets 423390a2c7 Separate accept MR settings from manual merge instructions. Remove confusing click here links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-12 11:48:58 +03:00
Dmitriy Zaporozhets aaa2bbd790 Update cahngelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 21:39:02 +03:00
Dmitriy Zaporozhets 43619db515 Merge branch 'increase-import-timeout' into 'master' 
Increase import timeout

Increase import timeout from 2 to 4 minutes. It allows repositories like `gitlabhq` be imported via UI

See merge request !1013
 2014-08-11 18:38:02 +00:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 20:58:39 +03:00
Dmitriy Zaporozhets 2c77dae2d7 Merge branch 'improve-dev-seeds' into 'master' 
Improve dev seeds

See merge request !1012
 2014-08-11 17:24:41 +00:00
Dmitriy Zaporozhets 2804902cfc Improve developer seeds 
* Improt projects inline so after seeds you have repos
* Fix merge request seeds
* Add comment seeds to both issues and merge requests
* Remove some projects from seeds to increase speed

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 17:55:31 +03:00
Dmitriy Zaporozhets 3cc2c6ef79 Remove outdated seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 16:01:07 +03:00
Dmitriy Zaporozhets f8eedb4cda Cleaner variable name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 15:25:25 +03:00
Dmitriy Zaporozhets 80036470c3 more changelog entries 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 13:31:58 +03:00
Dmitriy Zaporozhets 80f8cb2f88 Merge branch 'fix_markup_encoding' into 'master' 
Fix encoding of output of markup, prevent 500 for non-ascii characters

#### What does this MR do?

This MR forces the output of `Github::markup` to have the same encoding as the input to it.

#### Why was this MR needed?

This prevents 500 errors if the markup contains non-asci characters.

#### What are the relevant issue numbers / Feature requests?

This MR closes

* #296
* https://github.com/gitlabhq/gitlabhq/issues/7023

/cc @jacobvosmaer

See merge request !160
 2014-08-11 10:20:34 +00:00
Robert Schilling 8265d43d01 Force of markup output to be the input encoding 2014-08-11 12:18:07 +02:00
Dmitriy Zaporozhets e794b56133 Merge pull request #7463 from Razer6/improve/travis 
Add retry option of travis and bundler
 2014-08-11 13:11:26 +03:00
Dmitriy Zaporozhets 9238616d6f Merge pull request #7468 from Razer6/fix_wrong_compare_message 
Turn if/else branch for valid compare error message
 2014-08-11 13:11:00 +03:00
Dmitriy Zaporozhets 505203e7d5 Merge pull request #7466 from Razer6/improve_markup_handling 
Improve readme markup,  fixes #7455
 2014-08-11 13:02:24 +03:00
Dmitriy Zaporozhets ddd238eff8 Revert "history for files follows after rename" 
This reverts commit a547356133.
Because grit does not respect offset setting when follow: true which
cause invalid commit history for file
 2014-08-11 13:00:37 +03:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00
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 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