home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,381 Commits 48 Branches 340 Tags
7ba4e05ffac9ed2e92a2e790fb8a55aa92ec5785
Commit Graph
18381 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 7ba4e05ffa Create Approve model for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 13:38:47 +02:00
Douwe Maan d7d3a2885f Merge branch 'feature/ldap_group_link_api' into 'master' 
Add API support for adding and removing LDAP group links

See merge request !4
 2015-06-09 09:27:39 +00:00
Dmitriy Zaporozhets ccf7927229 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !414
 2015-06-08 17:42:24 +00:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Job van der Voort 64627e7929 Merge branch 'importing-fix' into 'master' 
importing documents renewed

Single commit of !1813

cc @karen

See merge request !1844
 2015-06-08 14:50:53 +00:00
Job van der Voort b368d4a1d1 fix spacing in document 2015-06-08 16:37:04 +02:00
Job van der Voort 8a32c46e6e importing documents renewed 2015-06-08 16:35:03 +02:00
Job van der Voort 7d286ac6b3 Merge branch 'update-deprecations' into 'master' 
update reference to deprecated repo and update guide

See merge request !412
 2015-06-08 10:00:50 +00:00
Job van der Voort c857c7ff1c fix conflicts 2015-06-08 12:00:22 +02:00
Sytse Sijbrandij 509fe1159a Merge branch 'master' into 'master' 
Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
 2015-06-06 13:11:01 +00:00
rugk 975d110688 Changed spelling 2015-06-06 12:34:40 +00:00
Dmitriy Zaporozhets e73d7b6766 Merge branch 'cleaner-project-page' into 'master' 
Remove line under project description

## Before

![Screenshot_2015-06-05_19.44.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e80e03a15ff32de489e61662674f8b70/Screenshot_2015-06-05_19.44.39.png)

## After

![Screenshot_2015-06-05_19.44.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4e2eb43802dbeee397fb6bc051b82b2/Screenshot_2015-06-05_19.44.19.png)

See merge request !776
 2015-06-05 18:32:23 +00:00
Dmitriy Zaporozhets 354b6f1cd3 Remove line under project description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 19:50:23 +02:00
Jacob Vosmaer 0678e9acca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 19:24:14 +02:00
Jacob Vosmaer 7c09da9e8f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-06-05 19:23:38 +02:00
Jacob Vosmaer 0e8296fd56 Make unicorn docs discoverable 2015-06-05 19:23:10 +02:00
Dmitriy Zaporozhets 7880450e8e Merge branch 'header-50-px' into 'master' 
Fix css alignment in header. Use scss variable

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !775
 2015-06-05 17:08:05 +00:00
Dmitriy Zaporozhets 2d5165979f Fix css alignment in header. Use scss variable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 18:49:00 +02:00
Dmitriy Zaporozhets c8a845b200 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-06-05 18:19:38 +02:00
Dmitriy Zaporozhets b6aa7cbccd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 18:19:17 +02:00
Dmitriy Zaporozhets 579ab088dd Merge branch 'ce-to-ee' into 'master' 
CE to EE

@rspeicher @douwe reference extraction / markdown parsing was refactored and improved again and again. And every time I merge CE into EE I has conflicts in this code. Can we have SAME code  CE and EE responsible for reference extraction?

Problem files:

* lib/gitlab/markdown/external_issue_reference_filter.rb
* lib/gitlab/reference_extractor.rb

See merge request !411
 2015-06-05 16:14:42 +00:00
Dmitriy Zaporozhets 87f9c475db Merge branch 'refactor-web-editor' into 'master' 
Refactor web editor

* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes #1761

See merge request !773
 2015-06-05 16:14:34 +00:00
Dmitriy Zaporozhets c9f1fb574f Remove upgrader test because it does not apply to ee tags set 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 17:19:48 +02:00
Dmitriy Zaporozhets 7bde6ae540 Fix editing files via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 17:16:51 +02:00
Sytse Sijbrandij 01cd7d2c2a Improve instructions for publishing gitlab-app. 2015-06-05 14:15:15 +00:00
Douwe Maan 07381fd238 Merge branch 'feature/ldap_sync_keeps_last_owner' into 'master' 
Prevent LDAP group sync from removing a group's last owner

As discussed with Patricio in support request 3151

When setting up LDAP group sync, users can easily lock themselves out of their own group (cf. http://doc.gitlab.com/ee/integration/ldap.html#locking-yourself-out-of-your-own-group). The group may be left without any owner and requires intervention of the GitLab Administrators - a significant burden for a large deployment. In order to avoid this situation, this patch prevents the LDAP group sync from removing the last owner of a group, in the same way GitLab does not allow removing the last owner of a group via the Members page. This "last owner" is left in place until a new owner is nominated, the next sync after that will remove him/her.

See merge request !7
 2015-06-05 14:11:11 +00:00
Dmitriy Zaporozhets 5a026152b7 Merge branch 'warn-about-referenced-users' into 'master' 
Show warning when a comment will add 10 or more people to the discussion.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054

New issue:

![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png)

New comment:

![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png)

See merge request !754
 2015-06-05 13:37:08 +00:00
Dmitriy Zaporozhets 6f7bf4e4f0 Merge branch 'wip-mr-docs' into 'master' 
Add info about WIP merge requests to docs.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078.

See merge request !770
 2015-06-05 13:35:16 +00:00
Dmitriy Zaporozhets 3b9792ec72 Merge branch 'fix-long-blob-timeout' into 'master' 
Fix timeout when rendering file with thousands of lines.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2354.

See merge request !771
 2015-06-05 13:34:16 +00:00
Dmitriy Zaporozhets f34e8a265a Fix JIRA integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:32:23 +02:00
Dmitriy Zaporozhets ada2be3c21 Fix spinach tests and some specs after merge CE into EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:24:36 +02:00
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Job van der Voort ef7c0945c3 Merge branch 'understanding-unicorn' into 'master' 
Try to explain Unicorn and unicorn-worker-killer

See merge request !1842
 2015-06-05 13:12:32 +00:00
Dmitriy Zaporozhets dfccb06dda Refactor web editor 
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:01:38 +02:00
Jacob Vosmaer d98bcb9ca9 Try to explain Unicorn and unicorn-worker-killer 2015-06-05 14:23:35 +02:00
Douwe Maan 9a50db693a Fix timeout when rendering file with thousands of lines. 2015-06-05 13:56:37 +02:00
Job van der Voort af1f22adad update reference to deprecated repo and update guide 2015-06-05 13:39:28 +02:00
Douwe Maan 3f59a8f0be Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' 2015-06-05 13:34:25 +02:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Dmitriy Zaporozhets 214f38c422 Merge branch 'fix-empty-navbar' into 'master' 
Fix empty header margin

See merge request !769
 2015-06-05 10:47:13 +00:00
Douwe Maan 45e9150a51 Tweak code. 2015-06-05 12:32:01 +02:00
Douwe Maan 5256b5cc06 Prefer jQuery on to bind, and don't use .js class. 2015-06-05 12:13:02 +02:00
Dmitriy Zaporozhets 8d2996fe0e Fix empty header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 12:08:43 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Dmitriy Zaporozhets c8a0c02817 Fix factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 12:05:37 +02:00
Douwe Maan 1f78aeba40 Merge branch 'improve_bitbucket_docs' into 'master' 
Improve BitBucket integration documentation [ci skip]

This MR will improve the BitBucket integration documentation by

- mentioning the need to reconfigure GitLab after changing the configuration file, if you're using the omnibus package.
- adding a section about configuring a Host entry for bitbucket.org.
- switching additional steps 1 and 2, because connecting to BitBucket will only work after you added the SSH key and the Host entry.
- using sudo for the ssh connection in step 2, so that it is more obvious, that the git account should be used to establish the connection.

See merge request !670
 2015-06-05 10:05:09 +00:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Alex Lossent 7a52573681 Prevent LDAP group sync from removing a group's last owner 2015-06-05 11:06:08 +02:00
Dmitriy Zaporozhets 22d5d8913b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 10:38:44 +02:00