home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,474 Commits 48 Branches 340 Tags
0723bf1afaaf13ddcb58c211161389052d18e501
Commit Graph
1510 Commits
Author SHA1 Message Date
Marin JankovskiandDmitriy Zaporozhets f40e87a03b Return better error when account exists when attempting oauth account create. 2014-06-24 15:30:29 +03:00
Dmitriy Zaporozhets aadef92f1d Merge pull request #7013 from jvanbaarsen/better-webhook-information 
Return a little more information in Issue webhook
 2014-06-24 10:37:15 +03:00
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Marin Jankovski 63c1cdce42 Show @all in autocomplete list. 2014-06-23 11:54:58 +02:00
Dmitriy Zaporozhets 68e4a68223 Merge branch 'gitlab_cache_clear' into 'master' 
Patch `rake cache:clear` for large amounts of keys
 2014-06-23 06:39:20 +00:00
Dmitriy Zaporozhets d12b910d20 Merge branch 'remove-observers' into 'master' 
Remove observers from application

Part of #1133
 2014-06-23 06:36:08 +00:00
Jacob Vosmaer cf0a370274 Patch rake cache:clear for large amounts of keys 2014-06-20 13:58:57 +02:00
Andrew Kumanyaev 45f9d15c0e Fix mistake in reference_jira_issue method 
Use local variable instead global
 2014-06-18 11:11:09 +04:00
Dmitriy Zaporozhets 85333f093b Fix notes creation via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-18 09:26:04 +03:00
Dmitriy Zaporozhets 49506fc71a Merge remote-tracking branch 'origin/issue_closing_widget' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-06-14 12:40:42 +03:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Jeroen van Baarsen 87760a290e Added an UrlBuilder for building rails named routes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-13 12:34:15 +02:00
Jacob Vosmaer 90bfe286a6 Skip init script checks on omnibus-gitlab 
Omnibus-gitlab does not use the init script.
 2014-06-12 09:31:17 +02:00
Dmitriy Zaporozhets 9fd6c3d591 Merge branch 'huge-repo-improve' into 'master' 
Better support for huge repositories

This MR contains next improvements to GitLab:
* You can see repo commits count even if it is > 100k commits
* Prevent 500 for commit page for large repos
* Add notice about huge push over http to unicorn config
* File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
* Show spinner when loading data for network graph
 2014-06-11 21:09:23 +00:00
Dmitriy Zaporozhets 56f0f6aba3 Use same 30 seconds satellite timeout for all actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 23:37:21 +03:00
Marin Jankovski 314e4736e4 Strip apostrophe from email generated usernames. 2014-06-11 17:06:28 +02:00
Dmitriy Zaporozhets 1d7735773e Merge branch 'email_with_apostrophe' into 'master' 
Email with apostrophe

Fixes #1225
 2014-06-11 12:15:01 +00:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard 
links to issues on main dashboard
 2014-06-11 15:02:48 +03:00
Marin Jankovski f43e41973f Test for the apostrophe in the email 2014-06-11 13:36:30 +02:00
Marin Jankovski e57fdc1190 Remove email_validator gem and allow apostrophe as a valid character in email. 2014-06-11 13:04:30 +02:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
Dmitriy Zaporozhets f8ea52c3a0 Remove thread vars usage from API notes and mr's 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:56:35 +03:00
Dmitriy Zaporozhets a7be3dfa30 Remove set of thread variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:51:49 +03:00
Marin Jankovski dca6c490cc Update check task and add to monthly release doc lines about gitlab_shell_version file. 2014-06-10 11:16:47 +02:00
Nihad Abbasov dccfb374d3 fix permissions for files API 2014-06-06 06:58:20 +05:00
Dmitriy Zaporozhets db779388fe Merge pull request #7075 from jvanbaarsen/split-spinach-tests 
Splitted the Spinach tests to prevent time-outs
 2014-06-05 21:56:48 +03:00
Achilleas Pipinellis 7be6b8ca73 Move gitlab-ssl nginx config from gitlab-recipes 2014-06-05 16:54:50 +03:00
Jeroen van Baarsen e84057da1b Splitted the Spinach tests to prevent time-outs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-04 22:55:27 +02:00
GitLab fdcc5ddec1 Ensure sidekiq is displayed by setting X-Frame-Options. 2014-06-03 17:06:27 +02:00
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets d54d3324b1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-30 18:05:14 +03:00
Dmitriy Zaporozhets bd7c3955b1 Merge pull request #6882 from Tandrial/master 
Satellites access fix
 2014-05-30 16:59:02 +03:00
Dmitriy Zaporozhets 7a75b3f300 Merge pull request #6986 from agjmills/master 
added SYSV chkconfig property so gitlab starts after MySQLd / nginx
 2014-05-30 16:58:37 +03:00
Dmitriy Zaporozhets d8c7efa626 Dont allow git tag rewrite/removal unless you are master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 16:26:45 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets 900d30798b Use new Projects::TransferService class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:45 +03:00
Dmitriy Zaporozhets 6ba4cb1d2b Remove old rake task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:01:19 +03:00
Marin Jankovski 2341cefd6f Move from script to bin directory. 2014-05-27 17:14:41 +02:00
Dmitriy Zaporozhets 3bdf0e2921 Merge branch 'compare-api' into 'master' 
Compare api

Fixes #1165
 2014-05-27 11:16:07 +00:00
Dmitriy Zaporozhets c7e00aca2d Better specs for Compare API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:27:42 +03:00
Dmitriy Zaporozhets 10ee137e9c Expose timeout and same_ref compare fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:16:50 +03:00
Dmitriy Zaporozhets e918ae240e Merge branch 'no_link_inside_code_block' into 'master' 
No link inside code block
 2014-05-27 06:26:22 +00:00
Dmitriy Zaporozhets 1e7fa8d99b Fix syntax error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 08:12:03 +03:00
Dmitriy Zaporozhets c9020ae586 Fix test.rake 2014-05-26 20:30:45 +00:00
Dmitriy Zaporozhets e426d43924 Check return system value for gitlab test rake tasks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 21:54:57 +03:00
Marin Jankovski 281643a1bf Add feature spec. 2014-05-26 20:43:58 +02:00
Marin Jankovski 52c3179be9 Do not replace links inside code blocks, less code for the same amount of work. 2014-05-26 20:43:58 +02:00
skvandGitLab 9c046fea67 links to issues on main dashboard 2014-05-26 13:24:21 +00:00