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
16,693 Commits 48 Branches 340 Tags
1deccc561d814cb7dfe7e4e5476c66bf3cec423d
Commit Graph
16693 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort 1deccc561d Merge branch 'fix_ldap_sync_doc' into 'master' 
Added notice about the `group_base` setting to the LDAP sync documentation.

Without this setting, GitLab will not be able to look for groups, so it should be explicitly included in the doc.

/cc @sytse

See merge request !368
 2015-04-14 18:37:19 +00:00
Patricio Cano 9e10548339 Missed a ` on the code block 2015-04-14 13:20:51 -05:00
Patricio Cano d8a7096f40 Added notice about the group_base setting to the LDAP sync documentation. 2015-04-14 13:19:23 -05:00
Dmitriy Zaporozhets 3518cc75ab Merge branch 'ce-to-ee' into 'master' 
Recent changes from CE master

See merge request !367
 2015-04-14 13:21:42 +00:00
Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Dmitriy Zaporozhets 66509917f4 Merge branch 'ce-to-ee' into 'master' 
Recent changes from master

See merge request !366
 2015-04-14 12:01:39 +00:00
Dmitriy Zaporozhets 9311f86291 Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/api.js.coffee
	app/assets/javascripts/users_select.js.coffee
 2015-04-14 13:05:39 +03:00
Dmitriy Zaporozhets 7a73c974a9 Merge branch 'ldap-email-update' into 'master' 
Skip email confirmation when updated via LDAP.

Followup to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/494, addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2203.

See merge request !363
 2015-04-08 13:38:07 +00:00
Sytse Sijbrandij 7ad1008e53 Merge branch '793-packages' into 'master' 
Added packages for 7.9.3-ee

Added packages for 7.9.3-ee

/cc @job

See merge request !365
 2015-04-07 22:05:22 +00:00
Patricio Cano d1655ea8da Added packages for 7.9.3-ee 2015-04-07 16:43:43 -05:00
Patricio Cano a7869b77df Merge branch 'fix-members-group-path' into 'master' 
Fix LDAP group links page by using new group members route.

- Reported by Apple: https://gitlab.zendesk.com/agent/tickets/2273
- Reported on gitlab.com: https://gitlab.com/gitlab-org/gitlab-ce/issues/1382

cc @patricio

See merge request !364
 2015-04-07 18:10:17 +00:00
Douwe Maan 368ed5ad27 Use new group members route. 2015-04-06 22:44:19 +02:00
Douwe Maan 4210d0f565 Skip email confirmation when updated via LDAP. 2015-04-06 14:18:45 +02:00
Jeroen van Baarsen 9925051ece Merge pull request #7982 from Soullivaneuh/help-images 
Fix and improve help rendering
 2015-04-03 12:19:12 +02:00
Sullivan SENECHALandSullivan SENECHAL d365004e68 Fix and improve help rendering 2015-04-03 11:56:50 +02:00
Dmitriy Zaporozhets 0d0042d274 Merge branch 'import-current-user' into 'master' 
Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.

Addresses #1347.

Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :)

See merge request !481
 2015-04-02 20:34:52 +00:00
Dmitriy Zaporozhets 424cbf46d5 Merge branch 'repository-archive-worker' into 'master' 
Archive repositories in background worker.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated..

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173.

To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus.

See merge request !436
 2015-04-02 20:30:55 +00:00
Dmitriy Zaporozhets f8f9750323 Merge branch 'username-period' into 'master' 
Don't allow username to end in period.

The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174.

See merge request !438
 2015-04-02 20:28:23 +00:00
Dmitriy Zaporozhets 24b048db59 Merge branch 'backup_skip_option' into 'master' 
Ability to skip some items in backup

https://dev.gitlab.org/gitlab/gitlabhq/issues/1936

Now it is possible to run

```
sudo gitlab-rake gitlab:backup:create SKIP=repositories,uploads
```

available options: repositories,uploads,db

See merge request !470
 2015-04-02 20:21:44 +00:00
Valery Sizov 67c83489ca ability to skip some items in backup 2015-04-02 15:37:50 +03:00
Douwe Maan 2a0d38c03f Merge branch 'rs-icon-symlink' into 'master' 
Check symlink mode as a String for file_type_icon_class

The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69

See merge request !487
 2015-04-02 08:09:02 +00:00
Robert Speicher 6ab8275cd1 Check symlink mode as a String for file_type_icon_class 
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
 2015-04-01 23:34:33 -04:00
Marin Jankovski 254698d6b8 Update CHANGELOG. 2015-04-02 05:06:07 +02:00
Marin Jankovski 897fb55c78 Update changelog for 7.9.2. 2015-04-02 05:04:13 +02:00
Marin Jankovski 20bc37ead1 Add packages for 7.9.2. 2015-04-02 04:53:58 +02:00
Douwe Maan d92e4ccc6e Add tests. 2015-04-01 17:17:18 +02:00
Douwe Maan 85b29f99f0 Make sure Sidekiq picks up archive_repo queue in production. 2015-04-01 14:36:17 +02:00
Job van der Voort 025f79b683 Merge branch 'add_rugged_patch_releases' into 'master' 
Add packages for rugged patch releases

See merge request !290
 2015-04-01 11:18:13 +00:00
Marin Jankovski 16a6ea2d17 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-03-31 19:04:52 -07:00
Marin Jankovski d77f333f9c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Conflicts:
	lib/gitlab/markdown.rb
 2015-03-31 19:03:54 -07:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Dmitriy Zaporozhets c14c03a88f Merge branch 'rs-issue-1340' into 'master' 
Unbind task item checkbox events and then rebind them

Fixes #1340

This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17

`new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events.

See merge request !478
 2015-04-01 01:33:03 +00:00
Dmitriy Zaporozhets 7ed8b76f64 Merge branch 'no-chmod-r' into 'master' 
Don't use chmod_R for backup tars

When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.  See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472

See merge request !1744
 2015-04-01 01:10:00 +00:00
Dmitriy Zaporozhets dc3b4321ff Merge branch 'group-information-leak' into 'master' 
Don't leak private group existence by redirecting from namespace controller to group controller.

See merge request !440
 2015-04-01 01:01:38 +00:00
Dmitriy Zaporozhets 0622b87537 Merge branch 'admin-user-projects' into 'master' 
Fix admin user projects lists.

The admin user personal projects lists wasn't being rendered anymore.

cc @marin

See merge request !442
 2015-04-01 00:44:09 +00:00
Dmitriy Zaporozhets a9af64855d Merge branch 'refactor-milestones' into 'master' 
Better looking milestone lists

### Before

![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png)

### After

![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png)

See merge request !484
 2015-04-01 00:37:39 +00:00
Dmitriy Zaporozhets d71fbe713b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-01 02:48:54 +03:00
Dmitriy Zaporozhets 6a790b7963 Better looking milestone lists 2015-04-01 02:45:47 +03:00
Robert Speicher 085f12288d Unbind task item checkbox events and then rebind them 
Fixes #1340
 2015-03-31 17:45:11 -04:00
Douwe Maan 45ee9009f5 Fix migration SQL. 2015-03-31 23:42:49 +02:00
Dmitriy Zaporozhets eb2339a401 Merge pull request #9023 from dantudor/patch-1 
Allow ability to delete branches with '/` in name
 2015-03-31 19:30:15 +03:00
Dan Tudor a6c6335671 Added the missing comma 2015-03-31 17:08:33 +01:00
Douwe Maan 737f322e41 Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. 2015-03-31 16:34:13 +02:00
Douwe Maan 91761b0685 Add tests. 2015-03-31 13:37:21 +02:00
Douwe Maan 2fdae52fd1 Add item to changelog. 2015-03-31 12:53:23 +02:00
Douwe Maan ccc01b36ba Small code cleanup. 2015-03-31 12:52:20 +02:00
Douwe Maan e7bbd85b34 Limit number of concurrent archive_repo jobs to 2. 2015-03-31 12:52:20 +02:00
Douwe Maan 2cfd0b59ae Archive repositories in background worker. 2015-03-31 12:52:20 +02:00
Douwe Maan 33a8f53f7a Merge branch 'file-commit-list' into 'master' 
Fixed issue where only 25 commits would load in file listings

Fixes #1310

See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages.

See merge request !477
 2015-03-31 08:24:18 +00:00
Douwe Maan 175f7f68a6 Move files for moved namespaces. 2015-03-31 09:30:34 +02:00