Commit Graph
12749 Commits
Author SHA1 Message Date
Marin Jankovski d3bf5f63f4 Updated packages for 7.2.0 and 7.2.1 for ubuntu and debian. 2014-10-03 15:43:33 +02:00
Dmitriy Zaporozhets 778923b66c Merge branch 'ee-7-4' into 'master'
Recent 7.4 code from CE into EE

Fixes #187

See merge request !190
2014-10-03 12:29:35 +00:00
Dmitriy Zaporozhets da38e4f5db Merge branch 'do_not_show_ldap_users_in_dropdowns' into 'master'
Do not show ldap users in dropdowns

Fixes #160

See merge request !186
2014-10-03 11:40:35 +00:00
Dmitriy Zaporozhets 9afa80bbae Fix EE code after membership refactoring
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-03 14:09:07 +03:00
Dmitriy Zaporozhets 616e05ef75 Fix a lot of stuff related to membership refactoring
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 17:31:36 +03:00
Sytse Sijbrandij 429924e616 Merge branch 'remove_git_hook_offer' into 'master'
Remove git hook offer

Fixes #184

See merge request !189
2014-10-02 12:15:51 +00:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
2014-10-02 13:24:59 +03:00
Dmitriy Zaporozhets 9f939c9697 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-02 12:50:50 +03:00
Marin Jankovski db5497afe8 Move the check if group is synced with ldap to a method. 2014-10-02 11:50:46 +02:00
Dmitriy Zaporozhets c6f3f9bb33 Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_form.html.haml
2014-10-02 12:50:29 +03:00
Marin Jankovski c2d7ed1a45 Remove git hook offer 2014-10-02 11:32:52 +02:00
Dmitriy Zaporozhets 2478fecae6 Merge branch 'backup_fail_hard' into 'master'
Fail harder in the backup script

See merge request !1143
2014-10-02 09:28:23 +00:00
Sytse Sijbrandij b0349915e2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-02 10:54:07 +02:00
Sytse Sijbrandij cd9a31c2f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-02 10:53:43 +02:00
Sytse Sijbrandij 5b68a9adaf Add docs for the issue closing pattern. 2014-10-02 10:53:33 +02:00
Dmitriy Zaporozhets 0eb27eada4 Bump gitlab_git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 11:53:05 +03:00
Robert Schilling e2073f286e Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholder
Improve new file commit message textarea placeholder.
2014-10-02 10:33:09 +02:00
Robert Schilling 4b6bbf92ab Merge pull request #7881 from cirosantilli/rm-blame-extra-white
Remove blame lines added leading whitespace.
2014-10-02 10:29:03 +02:00
Robert Schilling 8d1137cd6d Merge pull request #7880 from cirosantilli/replace-erb-haml
Replace :erb filter with plain HAML.
2014-10-02 10:28:21 +02:00
Dmitriy Zaporozhets 6c3ad0dab6 Merge pull request #7853 from Razer6/feature/html_pipeline
Factor out Emoji parsing using html-pipeline-gitlab
2014-10-02 11:18:40 +03:00
Marin Jankovski 51bc636eb3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-02 08:46:56 +02:00
Marin Jankovski 630dadd9ae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-02 08:46:27 +02:00
Marin Jankovski b420ab7b1c Merge branch 'fix_selecting_them_upload' into 'master'
Fix selecting them upload

Related to https://gitlab.com/gitlab-org/gitlab-ce/commit/58c0a4f5cf27f76f1dc0474197b8aca06b6db12d#note_293570

See merge request !198
2014-10-02 06:46:09 +00:00
Marin Jankovski 2c2c192641 Merge branch 'fix_selecting_them_upload' of gitlab.com:gitlab-org/gitlab-ce 2014-10-02 08:41:48 +02:00
Sytse Sijbrandij ec7339e6f8 Merge pull request #7920 from cirosantilli/simplify-commit-note
Simplify custom MR good commit message hint.
2014-10-02 08:40:02 +02:00
Sytse Sijbrandij a950783ab2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-02 08:11:44 +02:00
Sytse Sijbrandij 0f673bb707 Merge branch 'packages-in-readme' into 'master'
Packages in readme

See merge request !1144
2014-10-02 06:11:11 +00:00
Sytse Sijbrandij 6614957aa6 Move third party below the installation section and hint at the Omnibus packages. 2014-10-01 20:59:06 +02:00
Robert Schilling 350877d050 Merge pull request #7904 from cirosantilli/titleize-actions
Titleize blob action buttons. [failure unrelated]
2014-10-01 17:58:28 +02:00
Robert Schilling 0f9e6e5191 Merge pull request #7930 from cirosantilli/group-test-up
Move group feature step to match test location [failure unrelated]
2014-10-01 17:54:40 +02:00
Robert Schilling dae670bd69 Search for 'div-dropzone' correctly 2014-10-01 17:30:40 +02:00
Dmitriy Zaporozhets 1099468b32 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-01 17:42:22 +03:00
Robert Schilling 63377c9ba5 Disable dropzone in ZEN mode 2014-10-01 16:40:30 +02:00
Jacob Vosmaer 02bf992f37 Fail harder in the backup script
This change also shows the output of failed Git commands during the
backup.
2014-10-01 15:43:27 +02:00
Sytse Sijbrandij aab2b0bf1a Merge branch 'glflow' into 'master'
GitLab Flow Graphic

As requested =)

/cc @mvb

See merge request !199
2014-10-01 13:35:11 +00:00
Job van der Voort 60a33d649f add gitlab_flow graphic to doc 2014-10-01 15:30:29 +02:00
Marin Jankovski 336b7b8783 Disable ldap user showing only if group is synced with LDAP group. 2014-10-01 14:59:37 +02:00
Marin Jankovski cb51407c54 Packages for 7.3.2-ee. 2014-10-01 14:03:12 +02:00
Jacob Vosmaer b10774eba8 Merge branch 'uploader-link' into 'master'
Uploader link

See merge request !1133
2014-10-01 11:56:02 +00:00
Dmitriy Zaporozhets ca1c35aa51 Merge branch 'fork-via-API' into 'master'
API: Add support for forking a project via the API

This adds an API call to create a fork of a project.

Such API "fork button" has been requested by feature requests summing up with 37 votes.

The GitLab user has flagged one of them as accepting merge/pull requests for this feature.

Motivation:

The ability to create a fork is missing in the API.
(The API currently only supports adding and removing the "forked" relationship between two existing projects)

This feature (create fork thru the API) feature has been requested via two feature requests:

15 votes, 13 comments: to be able to fork a project through the API
http://feedback.gitlab.com/forums/176466-general/suggestions/4125380-to-be-able-to-fork-a-project-through-the-api (it was marked as completed in error by referring to the much more special change which allows to add&delete fork information)

22 votes, 3 comments: add a "fork project" API call that acts like the "fork button"
http://feedback.gitlab.com/forums/176466-general/suggestions/5820264-add-a-fork-project-api-call-that-acts-like-the

The implementation is described in the text of the commit message (click on the "..." field to open it).

A comprehensive test suite is added as well: It covers all 5 success / failure modes:
1. Success case
2. Failure if authenticated user has no access the the project to be forked
3. Failure if the forked project already exists in the authenticated user's namespace
4. Failure if the forked project does not exist
5. Failure if not authenticated

Documentation for the new API call is added to the project help page: doc/api/projects.md

I have 2 additional merge requests in progress, one is based on this feature and extend it, the other is related to querying forks.

The merge request that would be directly related is based on a request written comment of one of the feature requests (that was independently also requested in a but entry):
The ability to fork a project (thru the API) to a given namespace, eg. a group, in one case, for trainings.

As this request does not change code, but only adds a new request API for creating forks, it does not have
the capability to break existing code, and as the test spec demonstrates, it works.

It allocates the API request POST /projects/fork/:id, the only other API path I'd have thought of would have been POST /projects/:id/fork but that path is already taken by the API for creating a new fork relationship between projects, so POST /projects/fork/:id is the remaining possibility that I could see.

See merge request !191
2014-10-01 10:20:57 +00:00
Ciro Santilli 64d7761e28 Move group feature step to match test location 2014-10-01 11:44:40 +02:00
Dmitriy Zaporozhets 8b1da505e0 Update coveralls badge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-01 12:40:43 +03:00
Dmitriy Zaporozhets a89af6ab8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-01 12:08:27 +03:00
Dmitriy Zaporozhets 560c3280e0 Merge pull request #7929 from gitlabhq/improve-coveralls
Try wear_merged! without argument
2014-10-01 12:08:09 +03:00
Dmitriy Zaporozhets 6cb4e488ab Merge branch 'checkout_schema.rb' into 'master'
Clear changes to schema.rb when upgrading

See merge request !1142
2014-10-01 08:45:29 +00:00
Dmitriy Zaporozhets 522d754dfe Try wear_merged! without argument
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-01 11:43:16 +03:00
Jacob Vosmaer b040078974 Clear changes to schema.rb when upgrading
Having local changes is quite common and it is a stumbling block when
upgrading GitLab. Because schema.rb is generated from the actual DB
schema it is OK to clear the local changes.
2014-10-01 10:41:20 +02:00
Bernhard Kaindl f030ee846e API: Initial support for forking a project via the API
This change adds POST /projects/fork/:id to the API for forking
a project into the namespace of the authenticated user, like the
"create fork" link in the GUI does. It also calls the same code.

Failure and permission checks (except for conflict) are already
implemented and handled in ForkService and the API, so the added
code is simple and does not alter anything.
2014-10-01 10:27:48 +02:00
Marin Jankovski 3dde6bb3fa Update changelog for 7.3.2
Conflicts:
	CHANGELOG
2014-10-01 09:57:10 +02:00
Marin Jankovski 2ac1f95ba1 Update guides to use gitlab-shell 2.0.1. 2014-10-01 09:56:04 +02:00