home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,331 Commits 48 Branches 340 Tags
c8a0c0281759e7dd11e8f2021981b57a33a7bbbd
Commit Graph
18331 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c8a0c02817 Fix factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 12:05:37 +02: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
Dmitriy Zaporozhets 22d5d8913b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 10:38:44 +02:00
Dmitriy Zaporozhets b7d20f14c6 Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master' 
Order commit comments in API chronologically

When fetching commit comments via API, the comments were not ordered,
but just returned in the order Postgresql finds them. Now the API always
returns comments in chronological order.

Same as !628 but with CI

See merge request !768
 2015-06-05 08:38:19 +00:00
Dmitriy Zaporozhets 1498de225c Merge branch 'ci_script_simplify1' into 'master' 
CI script: remove directives with default value

See merge request !1841
 2015-06-05 07:42:31 +00:00
Valery SizovandValery Sizov 64b6dbea74 CI script: remove directives with default value 2015-06-04 23:06:37 +03:00
Dmitriy Zaporozhets bedc66eb04 Merge branch 'rs-remove-guard' into 'master' 
Remove Guard

None of the GitLab B.V. developers were using it.

See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360

See merge request !764
 2015-06-04 17:54:33 +00:00
Dmitriy Zaporozhets 1498d76053 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-06-04 19:48:27 +02:00
Dmitriy Zaporozhets 32ba92a7e2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 18:03:53 +02:00
Dmitriy Zaporozhets 9287865599 Merge branch 'fix-upgrader-script' into 'master' 
Fix upgrader script

This is a fix for upgrader script not guessing the latest version correctly.

Upgrader now handles versions where a version part (major/minor/patch) can have multi-digit number, also ensures that the latest version is chosen from git tags by converting tag to Gitlab::VersionInfo and than selecting the latest/greatest version.

Fixes: #1476

See merge request !695
 2015-06-04 16:01:13 +00:00
Dmitriy Zaporozhets 8b089fa27e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 18:00:10 +02:00
Dmitriy Zaporozhets b9219469f7 Merge branch 'make-namespaces-api-available-to-all-users' into 'master' 
Make namespace API available to all users

### What does this MR do?

This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API.

### Why was this MR needed?

Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9328

See merge request !708
 2015-06-04 15:59:17 +00:00
Dmitriy Zaporozhets 1d945945bb Merge branch 'sn-push-email-plussign' into 'master' 
Use entity number for plus sign in push emails

Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added.

This is how gmail shows it:
![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png)

And this is for Outlook:
![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png)

iOS devices work with the &plus; entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5).

Changing the entity to `&#43;` and both gmail and outlook and iOS and Mail.

See merge request !721
 2015-06-04 15:57:53 +00:00
Dmitriy Zaporozhets ef3e0931b9 Merge branch 'fix-no-labels-page' into 'master' 
Omit link to generate labels if user does not have access to create them

On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label.

Screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/cb04659cf3a0abe1e072cb78d0964b94/image.png)

Closes https://github.com/gitlabhq/gitlabhq/issues/8353

See merge request !752
 2015-06-04 15:56:13 +00:00
Robert Speicher 44396e44a3 Remove unnecessary require from Spinach env 2015-06-04 11:47:00 -04:00
Robert Speicher 65be969b78 Remove unnecessary require from RepositoryCache spec 2015-06-04 11:40:43 -04:00
Dmitriy Zaporozhets 8645a0d39e Merge branch 'refacor-ci-script' into 'master' 
Refactor CI script

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

cc @valery

See merge request !1840
 2015-06-04 15:36:49 +00:00
Dmitriy Zaporozhets b18ac382b7 Refactor CI script 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-04 16:54:32 +02:00
Dmitriy Zaporozhets 7f042e8bcb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 16:46:51 +02:00
Dmitriy Zaporozhets e063c8f3e2 Merge branch 'trigger_hooks_create_on_backup_restore' into 'master' 
Trigger hooks create on backup restore

Number of users migrating from installation from source to omnibus get this issue. This can be fixed with a bash one liner but we already have a script that creates hooks in gitlab-shell. Added to gitlab:shell:install task call to `bin/create-hooks`. This script is idempotent which means it will only rewrite hooks if something changed.

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2208, https://github.com/gitlabhq/gitlabhq/issues/9101 and for the most part https://github.com/gitlabhq/gitlabhq/issues/8161

See merge request !762
 2015-06-04 14:46:24 +00:00
Dmitriy Zaporozhets d204c8f862 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-04 16:42:16 +02:00
Dmitriy Zaporozhets 28b6cde345 Merge branch 'add_ci_yaml' into 'master' 
Added autogenerated .gitlab-ci.yml

See merge request !1839
 2015-06-04 14:40:21 +00:00
Valery Sizov 3d5a51d416 added ci yaml 2015-06-04 13:47:44 +03:00
Dmitriy Zaporozhets 971e57cffa Merge branch 'rs-issue-1741' into 'master' 
Remove show actions from Admin and Project DeployKeys

Example styling after:

> ![Screen_Shot_2015-06-03_at_6.04.51_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/105801a7e390224066721bba200c4909/Screen_Shot_2015-06-03_at_6.04.51_PM.png)

Closes #1741

See merge request !763
 2015-06-04 08:34:25 +00:00
Robert Speicher 682d4b6a86 Remove Guard 
None of the GitLab B.V. developers were using it.
 2015-06-03 20:45:53 -04:00
Robert Speicher 793d9799b6 Show key fingerprint on DeployKeys#index 
Also style all key fingerprints consistently across the app.
 2015-06-03 18:03:04 -04:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Marin Jankovski 7af2fbbaf6 Add a changelog item. 2015-06-03 17:08:37 +02:00
Job van der Voort 83e59db55e Merge branch 'rs-2fa-docs' into 'master' 
Add 2FA docs

See merge request !757
 2015-06-03 15:05:54 +00:00
Dmitriy Zaporozhets fb59f04fdf Merge branch 'fix-group-remove' into 'master' 
Group improvements

* remove projects before removing group
* execute all hooks/events from project destroy when group removed
* log group create/remove
* delay remove of namespace directory (to prevent NFS issues)

Inspired by !759

See merge request !761
 2015-06-03 15:02:33 +00:00
Dmitriy Zaporozhets 55715735d1 Add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 17:01:31 +02:00
Dmitriy Zaporozhets 8046b69761 Merge branch 'remove_unecessary_rake_task' into 'master' 
Remove gitlab:env:check task.

Rake task that checks for git user git settings is a leftover from early days.

It is not being used by the web editor(and web editor is also being redone atm) so this rake task just causes confusion.

Adresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2362

See merge request !758
 2015-06-03 14:59:38 +00:00
Marin Jankovski a1be236c87 Trigger hooks-create on gitlab backup restore. 2015-06-03 16:24:37 +02:00
Dmitriy Zaporozhets e414463d9e Merge branch 'repo-remove' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 16:17:36 +02:00
Dmitriy Zaporozhets 53a0ac4734 Skip repo removing whem remove user or group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 16:16:27 +02:00
Dmitriy Zaporozhets 47a95754de Log group creation and removal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 16:15:58 +02:00
Marin Jankovski 7044d649a3 Add autocrlf back to installation docs, add a check for it. 2015-06-03 15:42:22 +02:00
Job van der Voort 41ee2aa2d7 fix typo and add screenshots 2015-06-03 15:35:13 +02:00
Dmitriy Zaporozhets 7bab4817f7 Merge branch 'repo-remove' into fix-group-remove 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2015-06-03 15:15:46 +02:00
Dmitriy Zaporozhets 58ab8a4a9d Fix tests and increase delay time before remove repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 15:09:12 +02:00
Dmitriy Zaporozhets 1edff53444 Remove projects before group/user. Remove namespace directory async 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 14:57:12 +02:00
Jacob Vosmaer 15b1bb47ba Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-03 14:34:15 +02:00
Jacob Vosmaer e57b27d44f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-03 14:33:45 +02:00
Dmitriy Zaporozhets 61cfd1d273 Wrap group removal into service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 14:07:20 +02:00
Job van der Voort 8d24b9354a Merge branch 'ldap-email-attribute' into 'master' 
LDAP users should not control their LDAP email

If they can, they can take over arbitrary GitLab accounts.

See merge request !1837
 2015-06-03 11:58:48 +00:00
Douwe Maan 69630394cf Merge branch 'add-resend-confirmation-email-in-profile' into 'master' 
Add "Resend confirmation e-mail" link in profile settings

Adds a convenience link to resend the confirmation e-mail if necessary. Before, user had to logout or open an Incognito Window to do this.

Screenshot:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/700e6d98e1c5b58726fbed4e52a09c06/image.png)

Fixes https://github.com/gitlabhq/gitlabhq/issues/9274

See merge request !634
 2015-06-03 11:47:45 +00:00
Jacob Vosmaer 98ff4131cd LDAP users should not control their LDAP email 2015-06-03 13:40:47 +02:00
Dmitriy Zaporozhets fd1723f0fc Add tests for project destroy service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 13:08:17 +02:00
Dmitriy Zaporozhets 97ff86e07c Move repository when project is removed 
Ths commit does next:

* When we remove project we move repository to path+deleted.git
* Then we schedule removal of path+deleted with sidekiq
* If repository move failed we abort project removal

This should help us with NFS issue when project get removed but
repository stayed. The full explanation of problem is below:

* rm -rf project.git
* rm -rf removes project.git/objects/foo
* NFS server renames foo to foo.nfsXXXX because some NFS client (think
* Unicorn) still has the file open
* rm -rf exits, but project.git/objects/foo.nfsXXX still exists
* Unicorn closes the file, the NFS client closes the file (foo), and the
* NFS server removes foo.nfsXXX
* the directory project.git/objects/ still exists => problem

So now we move repository and even if repository removal failed

Repository directory is moved so no bugs with project removed but
repository directory taken. User still able to create new project with
same name. From administrator perspective you can easily find stalled
repositories by searching `*+deleted.git`

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-03 13:05:43 +02:00
Jeroen van Baarsen c4161cd147 Merge pull request #9349 from lahdekorpi/patch-1 
Remove "(unreleased)" from v 7.11.0
 2015-06-03 12:51:15 +02:00