home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Marin Jankovski a720dde67c Remove configuration option from project settings page for external issue trackers. 2015-01-23 11:55:41 -08:00
Marin Jankovski 041bad0fe1 Manipulate external tracker issues urls generated from services. 2015-01-23 11:10:06 -08:00
Marin Jankovski 7c701acf57 Do a check which issue tracker is used inside the project. 2015-01-23 11:01:09 -08:00
Dmitriy Zaporozhets 99736d4594 Make all avatars rounded for consistency 2015-01-23 10:39:23 -08:00
Marin Jankovski 103a1bb06d Use service settings instead of config file settings to present issues. 2015-01-23 10:28:38 -08:00
Marin Jankovski 737f6516e6 Update new services with initialization based on existing data. 2015-01-23 09:14:45 -08:00
Hiroyuki Sato 22b7d2156c Remember the project default tab for 30days 2015-01-23 20:36:53 +09:00
Dmitriy Zaporozhets 497f7be564 Merge branch 'better-mentions' into 'master' 
Faster autocomplete for users/issues/emojiis

Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly

See merge request !1425
 2015-01-23 02:33:42 +00:00
Dmitriy Zaporozhets ce0a667fe3 Merge pull request #8601 from railsmob/master 
Optimize images 24.5% with ImageOptim.
 2015-01-22 17:54:12 -08:00
Dmitriy Zaporozhets 1511999d88 Faster autocomplete for users/issues/emojiis 
Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly
 2015-01-22 17:51:35 -08:00
Dmitriy Zaporozhets 4ade9bf24d lighter hover color 2015-01-22 17:05:31 -08:00
Dmitriy Zaporozhets b1dffe6729 Merge branch 'disable-turbolink-on-ci-links' into 'master' 
Disable turbolink on links pointing out to CI services

### What does this MR do?

This MR adds 'data-no-turbolink' attribute into all links pointing to CI services.

### Are there points in the code the reviewer needs to double check?

No

### Why was this MR needed?

In rare cases where gitlab and CI service is installed on the same host, turbolink will be used for links between those two. This may result in corrupted css and javascript.

This change is harmless for installations that do not share the domain name for GitLab and CI system - in such case, all links modified are already pointing out outside of the domain so turbolink won't handle them.

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

I consider this a small fix, no issue has been added.

See merge request !305
 2015-01-22 23:04:43 +00:00
Dmitriy Zaporozhets 4a10b7509a Merge branch 'gh-import-disabled' into 'master' 
Show modal window with instructions if GitHub integration disabled

See merge request !1424
 2015-01-22 22:48:10 +00:00
Dmitriy Zaporozhets fc55a8964d Merge branch 'improve-commit-page' into 'master' 
Improve commit page

See merge request !1423
 2015-01-22 20:16:44 +00:00
Dmitriy Zaporozhets 130663e7ad Show modal window with instructions if GH OAuth is not enables 2015-01-22 11:48:20 -08:00
Dmitriy Zaporozhets a5f1b67ed4 Dont allow image overflow in comment form and timeline 2015-01-22 11:24:05 -08:00
Dmitriy Zaporozhets 7411fb36c5 Show branches/tags as labels on commit page 2015-01-22 11:15:21 -08:00
Dmitriy Zaporozhets 7afa4d5791 Improve commit title 2015-01-22 11:14:29 -08:00
Dmitriy Zaporozhets 98ee4a1fa7 Annotate models 2015-01-22 09:40:03 -08:00
Dmitriy Zaporozhets a5b255fbdf Code improvements according to styleguide 2015-01-22 09:37:47 -08: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
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 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
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Marin Jankovski e9d6d1e51a Custom issue tracker service. 2015-01-20 16:55:35 -08:00
Marin Jankovski 09de0bfc37 Redmine doesn't require title and description change 2015-01-20 16:55:12 -08:00
Marin Jankovski 62c00661c4 Allow creation of the jira and redmine services. 2015-01-20 16:47:29 -08:00
Marin Jankovski 9371c6b901 Add issue tracker services. 2015-01-20 16:46:27 -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
GitLabandBartlomiej Swiecki 47e0614669 Disable turbolink on links pointing out to ci services 2015-01-20 12:19:16 +01:00
jubianchi 4ffdb83e71 Add action property to merge request hook 2015-01-20 10:50:24 +01:00
Achilleas Pipinellis 46755a7bfe Disable 'check all issues' checkbox for unprivileged users. 2015-01-20 09:16:26 +02:00
Job van der Voort 54f9432255 fix border radius top left for descriptions 2015-01-19 22:25:09 -08: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
Michael Clarke 505a492cd8 Only count the user's last vote 2015-01-19 21:18:36 +00:00
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08: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