home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,480 Commits 48 Branches 340 Tags
v6.1.0
Commit Graph
1036 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2898d92397 Merge pull request #4996 from hiroponz/drop-support-of-root-namespace 
[WIP]Drop support of root namespace in routing
 2013-09-14 07:47:41 -07:00
Dmitriy Zaporozhets 4f9098032c Remove code that was accidently added in 5dae40f579 2013-09-14 10:14:55 +03:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Marin Jankovski cb6d7e5192 Rescue an error if group doesn't exist 2013-09-12 15:28:46 +02:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00
Jacob Vosmaer 574d8cc7ed Merge pull request #5012 from jeffb-bt/master 
-i flag allows sudo to work for git users using rvm that is not being us...
 2013-09-11 01:08:38 -07:00
Izaak Alpert 7a56075efa Some of the requested updates, rebase on master 
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
 2013-09-09 12:04:38 -04:00
Izaak AlpertandIzaak Alpert e86e881832 API: admin users can sudo commands as other users 
-Specifying a header of SUDO or adding a :sudo with either user id, or username of the user will set the current_user to be that user if your identifying private_token/PRIVATE_TOKEN is an administrator token
 2013-09-09 12:04:38 -04:00
C. Walker 24bc3e0874 Forgot to fix the comment instructions. 2013-09-06 16:45:42 -07:00
C. Walker a9d3e6ce57 Fixed description. 2013-09-06 16:18:09 -07:00
Jeff '2 bits' BachtelandJeff Bachtel ca1d63c2f6 -i flag allows sudo to work for git users using rvm that is not being used by 
root user (su might be better)
 2013-09-06 18:53:10 -04:00
Dmitriy Zaporozhets 201158f1de Merge pull request #4990 from karlhungus/feature_group_membership_api 
Add group membership api
 2013-09-05 08:03:35 -07:00
Izaak Alpert fadcc25189 Fixes for @randx 
Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
 2013-09-05 10:41:57 -04:00
Izaak Alpert 8248e1f2b8 Add group membership api 
Change-Id: I5b174bba02856ede788dcb51ec9b0d598ea7d0df
 2013-09-04 13:17:17 -04:00
Dmitriy Zaporozhets 9109a20758 Improve commit diff 
* show highlights when replace empty line with content
* show inline diff when replace line with spaces with content
 2013-09-04 18:15:42 +03:00
Dmitriy Zaporozhets a8cb13c85d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-09-04 16:50:42 +03:00
Dmitriy Zaporozhets 496ec8b26d Merge branch 'refactor/oauth' of /home/git/repositories/gitlab/gitlabhq 2013-09-04 13:49:03 +00:00
Dmitriy Zaporozhets 3707cc119b Refactor Gitlab::Auth 2013-09-04 00:12:00 +03:00
Dmitriy Zaporozhets 0df1cf7fcc Inherit Gitlab::LDAP::User from Gitlab::OAuth::User 2013-09-04 00:06:13 +03:00
Dmitriy Zaporozhets b45e92646e Added Gitlab::OAuth::User class 
Authenticate or create users from OAuth providers
 2013-09-04 00:04:27 +03:00
Dmitriy Zaporozhets be7798b810 Merge pull request #4969 from Razer6/update_path_blacklist 
Add 'notes' to path blacklist, fixes #4967
 2013-09-03 13:01:58 -07:00
Jacob Vosmaer 5dad053a82 Merge pull request #4920 from Rovanion/init-rewrite 
Rewrote init script.
 2013-09-03 05:59:55 -07:00
Rovanion fe8fa9a581 Made script path flexible 2013-09-03 14:27:51 +02:00
Robert Schilling e832c4d90d Add 'notes' to path blacklist, fixes #4967 2013-09-03 07:25:39 +02:00
Dmitriy Zaporozhets 7dfb2b6379 Remove include of grack_ldap 2013-09-02 23:52:58 +03:00
Dmitriy Zaporozhets 71abf70458 Move ldap auth to LDAP::User. Removed unused code 2013-09-02 23:50:45 +03:00
Dmitriy Zaporozhets 6bf117c601 Mode User+LDAP functionality from Gitlab::Auth 2013-09-02 23:35:40 +03:00
Rovanion 98ea81e659 Restart works again, grammar mistakes corrected. 2013-08-29 23:29:38 +02:00
Dmitriy Zaporozhets 079d3a5dc1 Merge pull request #4906 from alexvh/standardize_diff_api_url 
Standardize recently added commit diff api url
 2013-08-29 10:02:32 -07:00
RovanionandGitLab cda4d6881a Fixed failure to stop and added handling of failure to remove stale pid 2013-08-28 13:22:01 +02:00
Rovanion f57944cc61 Corrections suggested by jacobvosmaer 2013-08-28 13:11:57 +02:00
Alex Van't Hof 59f428dca2 Standardize commit diff api url, change blob api url, add get single commit 
Use "/commits/:sha/diff" as opposed to "/commit/:sha", keeping in line
with existing api urls (e.g. "/projects/:id", etc.)

Fix 500 error resulting from a diff api call with an invalid commit hash

Move "/commits/:sha/blob" to "/blobs/:sha", leaving the old path for
backwards compatibility.

Add ability to get a single commit via "/commits/:sha"
 2013-08-27 21:22:42 -04:00
James Newton 4994ebbb11 update gitlab:check to look for update hook, not post-receive 2013-08-27 16:15:32 -05:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page 
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
 2013-08-27 21:39:34 +03:00
Rovanion 7c38f4e237 Changes recommended by @axilleas 2013-08-27 15:05:53 +02:00
Rovanion df9e1db904 Rewrote init script. 2013-08-27 13:43:01 +02:00
Dmitriy Zaporozhets cd7c131b23 Merge pull request #4916 from marbindrakon/merge_request_api 
Fix project_id field in MergeRequest API
 2013-08-27 01:21:57 -07:00
Andrew Austin 45280499b8 Fix project_id field in MergeRequest API 2013-08-27 01:54:09 +00:00
Dmitriy Zaporozhets 3cc26654d5 Remove old migration tasks 
You should update to 6.0 before proceed with update to higher version.
So its no reason to keep old tasks any more.
It should be still available in 6-0-stable but not in master
 2013-08-26 14:53:36 +03:00
Dmitriy Zaporozhets 6b206c9d96 Allow markdown tables 2013-08-26 14:27:19 +03:00
Dmitriy Zaporozhets c8e3d31925 Merge pull request #4892 from Aigeruth/feature/api-add-diff 
Feature: get the diff of a commit via API.
 2013-08-26 04:02:09 -07:00
Dmitriy Zaporozhets cc4b638c34 Set iid in fixtures. Add rake dev:setup for development 2013-08-26 13:20:45 +03:00
Dmitriy Zaporozhets 48ce80a60c Fix issue when developers are able to push to protected branch 
When that branch contain a '/' in the branch name.
Fix for git over HTTP
 2013-08-26 12:54:57 +03:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Gabor Nagy d139cc6b32 Adds feature: get a diff via API. 2013-08-25 23:48:11 +02:00
Dmitriy Zaporozhets ac13960943 Merge pull request #4841 from Razer6/update_path_blacklist 
Add 'hooks' to path blacklist.
 2013-08-25 12:21:22 -07:00
Dmitriy Zaporozhets 23d443a512 Merge pull request #4854 from aus/patch-1 
Fix GitLab Shell version check
 2013-08-25 12:20:26 -07:00
Jacob Vosmaer 2b9d48ccd0 Fix the service gitlab restart command 
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
  worker processes.
 2013-08-23 10:31:32 +02:00