home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,268 Commits 48 Branches 340 Tags
5b0aa252ad052d0c1f1d9699b62271c40935d5cd
Commit Graph
1036 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets aef782888f Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh 
ssh keys publically available for sysadmins via http, the github way
 2014-02-11 18:41:10 +02:00
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
Dmitriy Zaporozhets 9a3d665919 Show last commit for Blob#show 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 21:46:46 +02:00
Dmitriy Zaporozhets 657eb7ba93 Merge branch 'bug/filtering_service' into 'master' 
Fix wrong issues appears at Dashboard#issues page

Fixes #1028
 2014-02-10 18:52:08 +00:00
Dmitriy Zaporozhets 58ac731c37 Fix Issues#bulk_update 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:36:58 +02:00
Dmitriy Zaporozhets 56f989e53e Fix wrong issues appears at Dashboard#issues page 
Filtering service used klass instead of passed items.
Because of this you see list of all issues intead of authorized ones.
This commit fixes it so people see only issues they are authorized to
see.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:04:52 +02:00
Dmitriy Zaporozhets bed05a1381 Fix submodule_helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 13:02:26 +02:00
Dmitriy Zaporozhets 54b8921534 Merge branch 'feature/submodule-links' into 'master' 
Better submodule links

Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
 2014-02-08 19:47:11 +00:00
Dmitriy Zaporozhets 4ecf30cd5b Fix bug with cross-reference note on commit 
It should not set noteable_id if noteable_type is Commit
We have Note#commit_id for this

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-07 12:34:30 +02:00
GitLab 319f355aed merge with upstream master 2014-02-06 16:56:20 +05:30
Jason Hollingsworth fcc906e6aa Better submodule links. 
Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
 2014-02-05 20:44:14 -06:00
Dmitriy Zaporozhets 55572c4e86 Repository#blob_at_branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 11:39:55 +02:00
Dmitriy Zaporozhets 97a4d8aea4 Improve code according to new gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:46:15 +02:00
Dmitriy Zaporozhets ca7e4a948b Use new tags/branches from gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 18:13:24 +02:00
Dmitriy Zaporozhets f416b2f5cf Fix bug with merge request branch select 
Merge request target branch select is broken if you submit form and have
some errors on page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:24:38 +02:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Sytse Sijbrandij 05eb618548 Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce 2014-01-26 15:22:13 +00:00
Dmitriy Zaporozhets 4645f464a3 Allow developers to mange issue tracker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:22 +02:00
Dmitriy Zaporozhets 1338c7dd71 Fix mr update issue if merge_request_diff missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 14:38:02 +02:00
Dmitriy Zaporozhets 48f741eed9 MergeRequests services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 14:18:32 +02:00
Carlos Paramio b373158077 Project name was hardcoded (oops) 2014-01-24 08:42:24 +01:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets 380342784d Fix MR spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 12:55:43 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets 4b3afe2325 Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
Dmitriy Zaporozhets 51ea42e238 Improve commit render performnace for MR show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:54:53 +02:00
Dmitriy Zaporozhets 39a86963e9 Set mr_diff state to collected if diff is ok 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:30:14 +02:00
Dmitriy Zaporozhets 79bfbe5918 Remove commits/diff store login from MergeRequest model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:20 +02:00
Dmitriy Zaporozhets d9be420ee6 MergeRequestDiff model responsoible for storing commits/diff info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:19:02 +02:00
Dmitriy Zaporozhets 5f9d90e218 Merge pull request #5958 from brunoga/go-repository-fetch 
Added support for Go's repository retrieval.
 2014-01-21 02:27:21 -08:00
Bruno Albuquerque fb782476f9 Change web_url_without scheme to web_url_without_protocol. 2014-01-20 06:26:34 -05:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516 
Better check on the validity of emails
 2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 712a2ec4fd Case-insensetive search autocomplete for projets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:22:57 +02:00
Dmitriy Zaporozhets 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02:00
Jeroen van Baarsen 05e4af5b4c Better check on the validity of emails 
At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
 2014-01-16 12:14:47 +01:00
Jacob Vosmaer 5ae0d61d0a Disable SSL peer verification for all webhooks 
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
 2014-01-15 15:29:22 +01:00
Dmitriy Zaporozhets 2e7abbd66c Move repo rename email to notification service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 14:03:52 +02:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets b85e4d3cbd Move issues sort logic to Issuable concern 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:49:32 +02:00
Jeppe Toustrup 6cd745c2f7 Removed hash from "<user> #pushed to branch..." Hipchat notification 2014-01-14 10:57:10 +01:00
Dmitriy Zaporozhets 09d5868c22 Fix mr controller specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 10:47:28 +02:00
Dmitriy Zaporozhets db966364de MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_message generate default one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 17:20:30 +02:00
Drew Blessing 09cbe95b20 Add note for assignee changes 
Change to username per @PixnBits suggestion
 2014-01-06 15:38:13 -06:00
Bruno Albuquerque ee3046f9a9 Use web_url for web_url_without_scheme. 
- Previus version was still incorrect as it ignored cases where GitLab would
  be installed in a custom location.
- This assumes that if this method can be calle, web_url will return a valid
  URL.
 2013-12-30 17:44:11 -05:00
Bruno Albuquerque 9393809066 Use project methods instead of attributes. 
- This should work correctly in all cases now.
- Added a new project method that returns the web url for a project without
  the scheme prefix.
 2013-12-30 15:14:15 -05:00
Dmitriy Zaporozhets 611c5f1d7c Sort dropdown for Dashboard#projects page 
Be default it sorts by name now
Respect filters like scope, label, visibility when do sort or another
filter

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-29 12:58:00 +02:00
Dmitriy Zaporozhets 7bf0add0d1 Merge branch 'refactor/notes' of /home/git/repositories/gitlab/gitlabhq 2013-12-26 08:23:08 +00:00