home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 05:56:37 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,564 Commits 48 Branches 340 Tags
a63187f28b18e2feea16681b313166a982254e4e
Commit Graph
13564 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer a63187f28b Don't create zombies with IO.popen 
The previous recommend incantation would leave the process we read from
hanging around, even though it had finished. That gives you a
'defunct'/'zombie' process.
 2015-01-22 15:53:16 +01:00
Jacob Vosmaer f937e05949 Stop git zombie creation during force push check 2015-01-22 15:51:20 +01:00
Dmitriy Zaporozhets 2b10520b30 Merge pull request #7999 from cirosantilli/append-inplace 
Append in place for strings and arrays [failure unrelated]
 2015-01-21 23:07:15 -08:00
Dmitriy Zaporozhets 7f1633e294 Merge pull request #7615 from yglukhov/new-branch-submit-button-validation 
Validation of 'Create branch' and 'Create tag' buttons
 2015-01-21 23:05:02 -08:00
Dmitriy Zaporozhets 7d1e6f1546 Merge pull request #8607 from skburgart/fix-typos 
Fix various typos
 2015-01-21 23:02:48 -08:00
Dmitriy Zaporozhets 581b2c5e90 Merge branch 'vote-count' of https://github.com/mc1arke/gitlabhq into mc1arke-vote-count 
Conflicts:
	CHANGELOG
 2015-01-21 22:40:12 -08:00
Dmitriy Zaporozhets 111d95f7b0 Merge pull request #8614 from axilleas/disable_check_all_issues_for_unprivileged_users 
Disable 'check all issues' checkbox for unprivileged users.
 2015-01-21 22:35:09 -08:00
Dmitriy Zaporozhets 2ac03a8661 Merge pull request #8626 from dblessing/fix_spinner 
Fix spinner icon to match others
 2015-01-21 22:33:19 -08:00
Dmitriy Zaporozhets ae1be43722 Make sidebar smaller by 10px 2015-01-21 15:58:35 -08:00
Dmitriy Zaporozhets 45bebd76d6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-21 15:56:29 -08:00
Dmitriy Zaporozhets 6a1aa4763a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-21 15:56:20 -08:00
Job van der Voort ac050b6f32 Merge branch 'fix_sentence_in_notification_page' into 'master' 
Fix sentence in notification page

Correct the sentence in profile notification settings page.

/cc @jacobvosmaer @dzaporozhets

See merge request !1421
 2015-01-21 21:39:14 +00:00
Marin Jankovski ab2a6111ee Fix the sentence on notification page. 2015-01-21 13:36:27 -08:00
Dmitriy Zaporozhets 8a66a10c2a Merge branch 'fix_avatar_url' into 'master' 
Remove unnecessary / from avatar url

## What does this MR do?

This MR removes the unecessary / from the avatar url.

## What Use Case does this MR solve?

The // in the url cold lead to avatars not being displayed (reported on IRC)

With this MR the avatar url changes from
http://localhost:3000//uploads/user/avatar/1/gitlab_logo.png
to
http://localhost:3000/uploads/user/avatar/1/gitlab_logo.png

@dblessing Can you take a look?

See merge request !303
 2015-01-21 20:04:35 +00:00
Drew Blessing 855fe20165 Fix spinner icon to match others 2015-01-21 14:02:30 -06:00
Dmitriy Zaporozhets e5d491b7c7 Merge pull request #7389 from skv-headless/show-submodules-in-diff 
show diff in submodules
 2015-01-21 11:53:09 -08:00
Dmitriy Zaporozhets 0c4bb84910 Merge pull request #7762 from jubianchi/commit-closing-issues 
Allow commit messages to close several issues at once
 2015-01-21 11:49:13 -08:00
Dmitriy Zaporozhets 2395b8f079 Merge branch 'show_tags_in_commit_view' into 'master' 
Show tags in commit view

### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)

### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit

### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png)

@dblessing Can you take a look at this MR as well please?

See merge request !297
 2015-01-21 18:23:46 +00:00
Dmitriy Zaporozhets 1050f5230e Merge branch 'protected_branches' into 'master' 
Developer can push to protected branch if allowed

#1876

See merge request !1418
 2015-01-21 07:08:31 +00:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Dmitriy Zaporozhets 148740cc67 Merge branch 'github_importer' into 'master' 
Github importer: AJAX update status

#1907

See merge request !1417
 2015-01-20 21:07:37 +00:00
Dmitriy Zaporozhets 5ade3a6b78 We dont support ruby 2.2 yet 2015-01-20 11:59:35 -08:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
Dmitriy Zaporozhets f9fb76670f Merge pull request #8603 from jubianchi/hook-merge-request-action 
Add action property to merge request hook
 2015-01-20 09:12:20 -08:00
jubianchi 4ffdb83e71 Add action property to merge request hook 2015-01-20 10:50:24 +01:00
jubianchi b21a2d821a Allow commit messages to close several issues at once (thanks @123Haynes 
for his work and help)
 2015-01-20 10:45:48 +01:00
Achilleas Pipinellis 46755a7bfe Disable 'check all issues' checkbox for unprivileged users. 2015-01-20 09:16:26 +02:00
Dmitriy Zaporozhets 0af2a161fa Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-19 23:09:09 -08:00
Dmitriy Zaporozhets a680b41eac Merge branch 'github_importer_feature_desc' into 'master' 
Github importer feature desc

@job Can you take a look?

See merge request !1414
 2015-01-20 07:08:35 +00:00
Dmitriy Zaporozhets 902ecdf75f Merge branch 'border-radius-fixx' into 'master' 
Border radius fixx

Fixes the border radius in the description box.

See merge request !1416
 2015-01-20 07:04:47 +00:00
Job van der Voort 54f9432255 fix border radius top left for descriptions 2015-01-19 22:25:09 -08:00
Valery Sizov c92de64bdb GitHub importer description 2015-01-19 21:43:25 -08:00
Dmitriy Zaporozhets d960b9aea2 Merge branch 'master' into 'master' 
print validation errors when gitlab-rake gitlab:import:repos fails for project

Currently, when gitlab-rake gitlab:import:repos is not able to import a project it justs prints "Failed trying to create project" to the console. There seems to be no way to find out what exactly has failed. Since the check uses validation, it should at least print the validation issues. That might be a bit cryptic, but may be better than leaving the user in the dark completely.

See merge request !147
 2015-01-20 05:03:22 +00:00
Dmitriy Zaporozhets e3987bb6b1 Merge pull request #8585 from duduribeiro/fix_email_in_ssh_help_page 
Fix the email variable substituation in ssh help page
 2015-01-19 15:01:00 -08:00
Valery Sizov a4bd1f2ae3 Merge branch 'update_doc_github_importer1' into 'master' 
Update doc github importer.

See merge request !1413
 2015-01-19 22:19:45 +00:00
Valery Sizov fe1e3db5a3 fix url in update doc 2015-01-19 14:18:31 -08:00
Valery Sizov 63a32bc29b Merge branch 'update_doc_github_importer' into 'master' 
Update doc github importer

See merge request !1412
 2015-01-19 22:15:16 +00:00
Valery Sizov b63e6e5abc fix url in update doc 2015-01-19 14:14:00 -08:00
Michael Clarke 505a492cd8 Only count the user's last vote 2015-01-19 21:18:36 +00:00
Dmitriy Zaporozhets 20477eb5ca Merge branch 'update_oauth_documentation' into 'master' 
Update oauth documentation

See merge request !1411
 2015-01-19 20:59:09 +00:00
Dmitriy Zaporozhets 0166d8d8e5 Merge branch 'spinach_admin_application' into 'master' 
Spinach admin application

See merge request !1410
 2015-01-19 20:58:12 +00:00
Valery Sizov d5ae521cf7 update documentation regarding github_importer 2015-01-19 12:55:44 -08:00
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08:00
Marin Jankovski 465f41673a Merge branch 'database-fix-setting' into 'master' 
Check for database connection when running current_application_settings

The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown.

See merge request !292
 2015-01-19 18:43:27 +00:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Hannes Rosenögger 6bf58e76bd Remove unnecessary / from avatar url 
So http://localhost:3000//uploads/user/avatar/1/avatar.png
becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
 2015-01-19 14:08:06 +01:00
Dmitriy Zaporozhets 2fba31890e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-18 20:15:18 -08:00
Dmitriy Zaporozhets a5f5849340 Dont allow event content to overflow it UI limits 2015-01-18 20:11:17 -08:00
Drew Blessing a3ef61de92 Merge pull request #8040 from drag00n/updatedhint 
Use full path from root of project.
 2015-01-18 22:02:46 -06:00
Dmitriy Zaporozhets 85c0ce2e1a Reduce sidebar width by 10px 2015-01-18 19:53:46 -08:00