Commit Graph
323 Commits
Author SHA1 Message Date
Valery Sizov 7c091d701b Merge branch 'master' into ce_upstream 2015-12-03 14:09:00 +02:00
Douwe Maan d5fd9b26b1 Remove style duplication between snippet and issue detail pages 2015-12-02 14:50:12 +01:00
Douwe Maan 0159d78a3b Remove padding around form-actions 2015-12-02 14:48:06 +01:00
Douwe Maan 3ae7dba931 Use gl-padding instead of 15px/20px where appropriate 2015-12-02 14:46:15 +01:00
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Robert Speicher 3723182a88 Move project visibility level off of the clone panel 2015-11-27 16:15:06 -05:00
Valery Sizov a9b8612818 Merge branch 'ce_upstream' into 'master'
CE upstream



See merge request !64
2015-11-26 08:01:23 +00:00
Robert Speicher 1d80cd315e Add clipboard button to project clone panel
Closes #3585
2015-11-24 19:32:06 -05:00
Robert Speicher af65046c5f Move HTTP/SSH clone button logic to helpers 2015-11-24 16:55:26 -05:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Rubén Dávila 1278a1fb29 Discourage users from clicking 'Clear LDAP permission cache'. #280 2015-11-24 10:48:05 -05:00
Valery Sizov 3eb15786e9 Merge remote-tracking branch 'ee_com/8-2-stable-ee' into ce_upstream 2015-11-24 15:00:14 +02:00
Dmitriy Zaporozhets 1f4dc0b14c Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-20 14:05:09 +01:00
Dmitriy Zaporozhets ef1ed8f702 Merge branch 'missing_dot_confirm_modal' into 'master'
Add missing dot in confirm modal



See merge request !1645
2015-11-19 21:26:10 +00:00
Robert SpeicherandRobert Speicher 463a3cfe09 Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
2015-11-19 11:46:24 -05:00
Robert Speicher 3a85c93a7a Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
2015-11-19 16:45:45 +00:00
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
2015-11-19 10:33:18 -05:00
Douwe MaanandRobert Speicher 834e440f70 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 16:50:49 -05:00
Douwe MaanandRobert Speicher 371e8505f8 Merge branch 'ce-mirror-backport' into 'master'
Backport relevant changes from gitlab-org/gitlab-ee!51

To do:

- [x] Update gitlab-shell

See merge request !1822
2015-11-18 16:41:56 -05:00
Douwe Maan 91fdbdcde7 Add tooltips to home panel buttons. 2015-11-18 12:02:09 +01:00
Douwe Maan 01d2b1943f Move import form to partial. 2015-11-18 12:00:56 +01:00
Douwe Maan e945ec0280 Add "Start a new merge request" option to every commit form 2015-11-17 18:53:56 +01:00
Douwe Maan 31b1ffd55c Allow mirror user to be set. 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
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Douwe Maan 5aeefc13ed Fix styling of mirror status 2015-11-12 12:46:33 +01:00
Douwe Maan 293c4fdf7f Move update mirror button to other buttons. 2015-11-12 12:46:33 +01:00
Douwe Maan c85f4c548c Add tooltips to home panel buttons. 2015-11-12 12:46:33 +01:00
Douwe Maan 8a9c8156f7 Add "Mirror repository" checkbox to new project form. 2015-11-11 16:41:01 +01:00
Douwe Maan e09a5de348 Add mirror status to project homepage. 2015-11-11 16:41:00 +01:00
Douwe Maan 9098fc54db Add Mirror Repository to project settings. 2015-11-11 16:41:00 +01:00
Douwe Maan 519f24f595 Move import form to partial. 2015-11-11 16:40:30 +01:00
Jason Lee 18cb430f79 Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
2015-11-10 19:17:37 +08:00
Dmitriy Zaporozhets 4099751ce9 Render same markdown hint for issue, merge request, wiki and comment forms
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-07 20:22:16 +01:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Dmitriy Zaporozhets 696a708401 Move rendering CI status to helper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-23 17:32:52 +02:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Dmitriy Zaporozhets 01315cfe76 Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master'
Update style of snippets pages

![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png)

![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png)

Replaces !1567.

Fixes #1767 and #2538.


See merge request !1637
2015-10-22 13:34:34 +00:00
Douwe Maan d37cf64237 Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-show 2015-10-21 10:24:06 +02:00
Job van der Voort dd0552c36d Animate the logo on hover
The logo is now rendered as pure SVG, rather than image referencing a
svg. The SVG has an id and the shapes of the logo have a shared class.
The shapes change their fill color on hover with a transition.
2015-10-21 08:59:30 +02:00
Achilleas Pipinellis ab6d426a48 Add missing dot in confirm modal 2015-10-19 21:04:05 +03:00
Douwe Maan b371b6d139 Update style of snippet detail page 2015-10-18 12:54:02 +02:00
Douwe Maan eeea6ef25f Sentences end in periods. 2015-10-18 12:19:42 +02:00
Han Loong Liauw 1565a95da1 Merge branch 'master' into add-dates-snippets-show 2015-10-17 09:30:43 +11:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Han Loong Liauw 1f92c22fec New snippet design for projects
Split out header into shared partial
Used action partials to have unique actions for shared and personal
snippets
changed back to created date in list view
Switched to using existing color classes
2015-10-14 23:53:52 +11:00
Douwe Maan d10e3c4498 Merge branch 'master' into filter-label 2015-10-14 13:23:01 +02:00
Douwe Maan 3a69dd20a1 Allow dashboard and group issues/MRs to be filtered by label 2015-10-14 12:33:39 +02:00
Han Loong Liauw e1d70c4f31 Merge branch 'master' into add-dates-snippets-show
Also removed fixes to btn-sm as they have appears to
be already merged into master
2015-10-14 19:46:27 +11:00
Valery Sizov 0e34154d21 Project names are not fully shown if group name is too big, even on group page view 2015-10-13 11:37:57 +03:00