Commit Graph
22306 Commits
Author SHA1 Message Date
Robert Speicher 80a12e642a Merge branch 'license-as-key' into 'master'
Allow license to be uploaded as text rather than file

RE gitlab-com/www-gitlab-com#423

See merge request !63
2015-11-24 17:58:18 +00:00
Douwe Maan 531f3ac462 Allow license to be uploaded as text rather than file 2015-11-24 15:55:02 +01:00
Dmitriy Zaporozhets c2d03df846 Merge branch 'flog' into 'master'
Reduce method complexity in AutocompleteController



See merge request !58
2015-11-23 16:33:59 +00:00
Douwe Maan eaef646651 Reduce method complexity in AutocompleteController 2015-11-20 13:49:32 +01:00
Dmitriy Zaporozhets 2c7563c97d Merge branch 'fix-flog' into 'master'
Refactor complex methods to make CI green



See merge request !57
2015-11-19 08:49:39 +00:00
Douwe Maan 6967bad302 Merge branch 'mirror-repository' into 'master'
Add option to mirror an upstream repository.

Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/279

Depends on gitlab-org/gitlab-shell!29

To do:

- [x] Decide on what user should be the author of the activity feed events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.
- [x] Write specs!
- [x] Write documentation
- [x] Port back relevant commits to CE: gitlab-org/gitlab-ce!1822

----

## Mirror status on project homepage

![Screen_Shot_2015-11-12_at_12.48.15](/uploads/39666b0e4a14723407b0f66e2aaddb46/Screen_Shot_2015-11-12_at_12.48.15.png)


## Settings navigation item

![Screen_Shot_2015-11-10_at_17.32.27](/uploads/116ece85f65681bbd3c7c5e282ab3b3c/Screen_Shot_2015-11-10_at_17.32.27.png)

## Mirroring settings

![Screen_Shot_2015-11-17_at_11.17.17](/uploads/ff57c89831524435ec6a063c3c470203/Screen_Shot_2015-11-17_at_11.17.17.png)


## Activity feed with new "pushes" (mirror updates)
![activity_feed](/uploads/04754251f2142fd06b1fddc2aae45232/activity_feed.png)

I have yet to decide on what user should be the author of these events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.

## Warning that branch has diverged from upstream
![diverged](/uploads/ecf7ae6c5709f626c750695f45ca521a/diverged.png)

## Commits heading after failed update
![commits_failure](/uploads/d1b3e1f6796431c839ee9e2f67499283/commits_failure.png)

Link send user to the mirroring settings if they are a project admin.

## Mirroring settings after failed update

![Screen_Shot_2015-11-12_at_12.43.09](/uploads/ece68d5021c9a4c374bf6d973cf9fafa/Screen_Shot_2015-11-12_at_12.43.09.png)

## New project page
![new_project](/uploads/296beb6c7faf390a9b7e1facc9c1d4d6/new_project.png)

## Import form after failed import
(Screenshot outdated)

![new_import_failure](/uploads/ac0ebfc8ec23232603126fe0a6e10171/new_import_failure.png)

Shown when the initial import of a project fails, not when an update of an existing project fails.

cc @dzaporozhets @sytses @JobV

See merge request !51
2015-11-18 19:06:36 +00:00
Dmitriy Zaporozhets 1fc20a6b4c Refactor complex methods to make CI green
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-18 17:14:11 +01:00
Dmitriy Zaporozhets a5f7374ada Refuce complexity of Gitlab::LDAP::Access
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-18 16:24:36 +01:00
Douwe Maan 19996fec46 Merge branch 'master' into mirror-repository 2015-11-18 16:00:53 +01:00
Douwe Maan 228326374e Be more inclusive of commits
[ci skip]
2015-11-18 11:54:58 +01:00
Robert Speicher 1ab62227f7 Update VERSION
[ci skip]
2015-11-17 12:04:23 -05:00
Robert Speicher 2722c3d486 Update CHANGELOG
[ci skip]
2015-11-17 12:04:09 -05:00
Robert Speicher 8278cc4562 Update CHANGELOG-EE
[ci skip]
2015-11-17 12:03:24 -05:00
Achilleas Pipinellis 76b95cc97c Merge branch 'ee-to-ce-downgrade-doc' into 'master'
Added documentation on how to downgrade from EE to CE

/cc @dblessing 

See merge request !56
2015-11-17 16:43:16 +00:00
Achilleas Pipinellis 2803bef0d2 Split lines to 80 characters [ci skip] 2015-11-17 18:40:14 +02:00
Douwe Maan f8451830b9 Add documentation. 2015-11-17 12:42:39 +01:00
Douwe Maan 7fb2172d24 Add tests for Projects::UpdateMirrorService 2015-11-17 12:17:27 +01:00
Douwe Maan 31b1ffd55c Allow mirror user to be set. 2015-11-17 12:17:27 +01:00
Douwe Maan 6d92872633 Better error handling. 2015-11-17 12:17:27 +01:00
Douwe Maan 76d9636351 Merge branch 'master' into mirror-repository 2015-11-17 10:18:42 +01:00
Patricio Cano 2c5cdb2e94 Merge branch 'master' into ee-to-ce-downgrade-doc
# Conflicts:
#	doc/README.md
2015-11-16 17:31:19 -05:00
Patricio Cano 6320dfbcce Added documentation on how to downgrade from EE to CE 2015-11-16 17:26:32 -05:00
Robert Speicher e64f2da63b Merge branch 'ce-to-ee' into 'master'
CE-to-EE master

See merge request !54
2015-11-16 16:45:51 +00:00
Valery Sizov c67bafca31 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 17:05:47 +02:00
Dmitriy Zaporozhets 9a3df9d5d0 Merge branch 'ci-runners-master-or-owner' into 'master'
Show specific runners from projects where user is master or owner

This fix for permission escalation when handling specific runners.

The users were allowed to assign runners from projects where they were guests.


See merge request !1809
2015-11-16 15:00:55 +00:00
Valery Sizov f194f56538 fix tests 2015-11-16 16:54:13 +02:00
Valery Sizov 699885c3e9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee 2015-11-16 15:52:03 +02:00
Dmitriy Zaporozhets 1328e4b504 Merge branch 'refactor-duplication' into 'master'
Remove some code duplication

* remove duplicate code in uploaders
* remove duplicate code in NotificationHelper
* remove duplicate code in Repository


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

See merge request !1800
2015-11-16 13:05:49 +00:00
Dmitriy Zaporozhets b736a7b15e Merge branch 'lfs' into 'master'
Git LFS  support

Part of gitlab-org/gitlab-ce#2955

See merge request !1727
2015-11-16 13:01:19 +00:00
Kamil Trzcinski 03f5ff750b Show specific runners from projects where user is master or owner 2015-11-16 13:24:56 +01:00
Dmitriy Zaporozhets c9f2f2a483 Fix wrong variable name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 0698c96d7d Remove duplicate code in Repository#*_names_contains
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 433e4a80ef Fix code duplication in NotificationsHelper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets cd513034e6 Set less strict flay option for now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 796bb65170 Remove duplicate methods in uploaders
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Valery Sizov 7d7691cd09 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 13:37:13 +02:00
Valery Sizov 9179fcece8 Merge branch 'test_env_cache' into 'master'
Disabling cache for test environment



See merge request !1807
2015-11-16 11:35:05 +00:00
Valery Sizov 9e0d443f9e Disabling cache for test environment 2015-11-16 12:18:31 +02:00
Dmitriy Zaporozhets 6c8dded20b Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitlab-ce 2015-11-16 10:40:49 +01:00
Dmitriy Zaporozhets 86ce64f053 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-11-16 10:18:40 +01:00
Dmitriy Zaporozhets a43a218c98 Merge branch 'releases-feature' 2015-11-16 10:18:32 +01:00
Dmitriy Zaporozhets 743d66e4da Improve english text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 10:11:16 +01:00
Valery Sizov 0d9e08a891 Merge branch 'master' into ce-to-ee 2015-11-16 10:12:23 +02:00
Valery Sizov 5be2191b1a Merge branch 'rs-revert-gh-9812' into 'master'
Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"

This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.

See merge request !1805
2015-11-16 07:56:56 +00:00
Robert Speicher 9337da7864 Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"
This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.
2015-11-15 21:37:13 -05:00
Robert Speicher 3777b233a3 Merge branch 'relative_links_default_branch' into 'master'
Relative links in project README should point to default branch, not master

Relative links in the README shown on a project's main page currently always point to the "master" branch.  This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file.

This patch changes the relative links to instead point to the default branch.

Resolves #2707, #1134, #1852

See merge request !1801
2015-11-15 18:25:20 +00:00
Robert Speicher 37fe73c337 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-15 00:30:17 -05:00
Alec Cooper 4bb99677b1 Relative links in the README file shown on the repository homepage should point
to the default branch, not to master
2015-11-14 15:00:55 -05:00
Dmitriy Zaporozhets aec9f211e5 Merge branch 'impersonate' into 'master'
refactor login as to be impersonation with better login/logout

Modifies the existing "login as" feature to be called impersonation.

This also adds:

* Application keep track of who is impersonating the user so they can revert back to the original user without having to log out.
* Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop.

## Screenshots:

![](http://sindacio.us/i/2015-10-28_17-52-41.png)
![](http://sindacio.us/i/2015-10-28_17-53-08.png)

See merge request !1702
2015-11-14 09:04:10 +00:00