home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,373 Commits 48 Branches 340 Tags
24bc3e0874bd81d1cf8cc8a7104f277d5a9fa5c7
Commit Graph
6373 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Walker 24bc3e0874 Forgot to fix the comment instructions. 2013-09-06 16:45:42 -07:00
C. Walker 0f2299a8d4 Fixed Import Bare Repositories instructions to match rake task. 2013-09-06 16:19:35 -07:00
C. Walker a9d3e6ce57 Fixed description. 2013-09-06 16:18:09 -07: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 6263598314 Respect group members in mentionable concern 2013-09-04 17:05:48 +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 8e238f4273 Fix user remove tests. Remove user even if he has projects 2013-09-04 16:20:40 +03:00
Dmitriy Zaporozhets 7b8bd93e67 Rewrite OAuth specs 2013-09-04 00:53:13 +03:00
Dmitriy Zaporozhets 3832b2aa67 Improve Profile#account page 2013-09-04 00:53:01 +03:00
Dmitriy Zaporozhets 3707cc119b Refactor Gitlab::Auth 2013-09-04 00:12:00 +03:00
Dmitriy Zaporozhets 9028999c93 Use new OAuth classes 2013-09-04 00:06:29 +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 cdc4d64da6 Dont show remove user button for ldap user 2013-09-03 23:58:42 +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
Dmitriy Zaporozhets 38cebe03bc Dont allow html render for RAW view 2013-09-03 20:55:01 +03:00
Dmitriy Zaporozhets 1de270c9e0 Merge pull request #4976 from robertd/master 
Update installation docs to use v1.7.1 of gitlab-shell
 2013-09-03 10:23:32 -07:00
Robert Djurasaj ad52284810 Update installation docs to use v1.7.1 of gitlab-shell 2013-09-03 09:09:12 -06: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 54faf7871e Use normal font-weight for file names on tree view 2013-09-03 00:09:20 +03: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
Dmitriy Zaporozhets 1f3f874142 Color in .rspec 2013-09-01 22:07:02 +03:00
Dmitriy Zaporozhets 84992cd0fa Use original raphael-rails v2.1.2 2013-09-01 01:04:22 +03:00
Dmitriy Zaporozhets cafe181b54 Merge pull request #4941 from Snooze-/master 
Create satellites during update to 6.0. Fix #4938
 2013-08-30 12:50:06 -07:00
Dmitriy Zaporozhets 6ac5960b1b Merge pull request #4955 from jojosch/api-help-example-fixes 
add missing comma(s) in api examples
 2013-08-30 12:49:01 -07:00
Johannes Schleifenbaum cbae8097c0 add missing comma(s) in api examples 2013-08-30 21:10:26 +02:00
Dmitriy Zaporozhets 7008ace6c2 Merge pull request #4945 from jameswritescode/iid_for_emails 
have email views use iid
 2013-08-30 08:12:07 -07:00
Dmitriy Zaporozhets 30b8218ffb Rename team to Project members 2013-08-30 17:10:58 +03:00
James Newton 850b4af0ff have email views use iid 2013-08-29 21:26:32 -05:00
Rovanion 98ea81e659 Restart works again, grammar mistakes corrected. 2013-08-29 23:29:38 +02:00
Snooze- bae719df66 Create satellites during update to 6.0. Fix #4938 
Satellites for projects that were located in the root namespace needs to be recreated once they've been migrated to the creator’s namespace during the upgrade process.

This can be achieved by running the sudo -u git -H bundle exec rake gitlab:satellites:create RAILS_ENV=production during the update process.

The command has been added to the 5.4 to 6.0 update doc.
 2013-08-29 21:23:19 +02:00
Dmitriy Zaporozhets 25a723c3ae Remove colon 2013-08-29 21:49:13 +03:00
Dmitriy Zaporozhets b320884149 List groups on Dashboard#projects page 2013-08-29 21:45:19 +03:00
Dmitriy Zaporozhets 07f156f5c2 Dont update namespace if User name was changed. Use user#username for namespace name because Namespace#name validates by uniq 2013-08-29 21:44:45 +03:00
Dmitriy Zaporozhets 3d41e182c2 Minor UI fix 2013-08-29 21:11:01 +03:00
Dmitriy Zaporozhets 8315f363e4 Merge branch 'feature/reset_event_cache' of /home/git/repositories/gitlab/gitlabhq 2013-08-29 17:55:37 +00:00
Dmitriy Zaporozhets ffb0ad9399 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-29 20:33:57 +03:00
Dmitriy Zaporozhets 255d6d8b21 Update sidekiq and redis-rails 2013-08-29 20:32:40 +03: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
Dmitriy Zaporozhets 4aa2d16a3b Merge pull request #4939 from fintler/key_gen_help_typo 
Fixed up wording on the new SSH key page.
 2013-08-29 09:56:34 -07:00
Dmitriy Zaporozhets 298e6eb6c2 Merge pull request #4924 from jameswritescode/update_check_to_verify_update_hook 
update gitlab:check to look for update hook, not post-receive
 2013-08-29 09:56:16 -07:00
Jon Bringhurst b928d45d51 Fixed up wording on the new SSH key page. 2013-08-29 10:34:37 -06:00