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
13,550 Commits 48 Branches 340 Tags
ae1be437227d4bf7c19ae5eb4aab88d3d2cd8d53
Commit Graph
1446 Commits
Author SHA1 Message Date
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
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
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 77adf81e87 Fix tests 2015-01-18 19:13:41 -08:00
Dmitriy Zaporozhets 390e380225 Merge branch 'hipchat_placeholder' into 'master' 
Add placeholder values to hipchat service

This MR adds placeholder values to the hipchat service.
This should prevent issues like #279 or #772 that popped up because people didn't know what exactly they are supposed to enter in the fields.

See merge request !294
 2015-01-18 19:23:39 +00:00
Hannes Rosenögger 1e9e3fc73d Make the project search case insensitive 2015-01-18 12:28:29 +01:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00
Hannes Rosenögger 33fea08944 Add placeholders to hipchat service 2015-01-17 18:06:43 +01:00
Dmitriy Zaporozhets 38600e328b Validate application settings only if column exists 2015-01-16 17:22:17 -08:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets c5ba87a2fb Merge pull request #8096 from cirosantilli/regex-to-string 
Replace regex methods by string ones since faster and more readable
 2015-01-15 14:37:11 -08:00
Dmitriy Zaporozhets 9c4015f3e8 Merge pull request #8430 from cirosantilli/simplify-ssh-fingerprint-regex 
Simplify SSH fingerprint regexp extraction
 2015-01-15 14:33:24 -08:00
Dmitriy Zaporozhets b758b4c80b If noteable is nil - make discussion outdated 2015-01-10 19:26:00 -08:00
Dmitriy Zaporozhets d0a50985ec Create ApplicationSettings if does not exist in runtime 2015-01-08 11:26:16 -08:00
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets de6256ee67 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-06 21:50:00 -08:00
Dmitriy Zaporozhets 1269faa6ad Merge pull request #8503 from cirosantilli/unused-ex-var 
Remove unused ex local variable from event.rb
 2015-01-06 16:54:27 -08:00
Dmitriy Zaporozhets ccdf08d80a Refactor merge request merge service 
* Add system note when user merges MR in same way as it closes it
* Remove duplicating code
 2015-01-06 16:24:47 -08:00
Robert Schilling 05dd6309ba Raise group avatar filesize limit to 200kb, fixes #8527 2015-01-02 14:54:51 +01:00
Drew Blessing 9f9f1b3b87 Fix HipChat Server 2014-12-29 18:51:39 -06:00
Dmitriy Zaporozhets e0459da2a6 Merge branch 'fix-services' into 'master' 
Fix async services execution broken in 7.6

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/920

See merge request !1360
 2014-12-29 16:31:49 +00:00
Dmitriy Zaporozhets ed4e682eb8 Fix async services execution broken in 7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 17:48:43 +02:00
Dmitriy Zaporozhets b07802ab68 Rescue Net::OpenTimeout exception in web hook 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 16:41:10 +02:00
Marin Jankovski e005d4191a Merge branch 'master' into developer_can_push_to_protected_branches_option 2014-12-29 15:39:03 +01:00
Dmitriy Zaporozhets cf95736865 New feature: add 'Mention' notification level 
It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 15:55:21 +02:00
Ciro Santilli a2afc5c3f9 Remove unused ex local variable from event.rb 2014-12-29 13:07:58 +01:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Marin Jankovski 1c089a8561 Use shorter search for protected branch status. 2014-12-29 09:04:31 +01:00
Ciro Santilli cd688a6011 Replace regex methods by string ones since faster 
and more readable.
 2014-12-28 23:53:27 +01:00
Dmitriy Zaporozhets 803ca9e8cc Merge pull request #7957 from cirosantilli/rm-unused-project-code 
Remove unused Project#code function [failure unrelated]
 2014-12-28 22:15:43 +02:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Ciro Santilli 5dbe94dc9b Simplify SSH fingerprint regexp extraction 
[\d\h] is the same as \h
 2014-12-28 14:36:24 +01:00
Marin Jankovski 61b4214e94 Allow regular code push for developers if the protected branch allows it. 2014-12-26 09:35:49 +01:00
Dmitriy Zaporozhets 592e396869 Rework oauth2 feature 
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:35:04 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
Jeroen van Baarsen 4eb3c47d4e Fixed a lot of already defined notices 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 15:13:09 +01:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets f28a12a559 Add strict validation to snippet file names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:15:42 +02:00
Dmitriy Zaporozhets 0d5265bbec Execute project services asynchronously 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-07 12:29:37 +02:00
Dmitriy Zaporozhets 6487419364 Automatically close merge requests that were locker for 1 day 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:02:08 +02:00
Dmitriy Zaporozhets b23f71ec4d Set/unset merge request locked_at timestamp after transition 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:49:25 +02:00
Dmitriy Zaporozhets d7fa9952ef Merge branch 'prevent-500-test-webhook' into 'master' 
Prevent 500 test webhook

Fixes #1803

See merge request !1299
 2014-12-04 16:03:42 +00:00
Dmitriy Zaporozhets db2edff937 Handle web hook exception 
Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 15:07:01 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Dmitriy Zaporozhets bf39347970 Merge branch 'larger-avatar' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-12-02 12:44:18 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00