Commit Graph
14475 Commits
Author SHA1 Message Date
James Lopez 48fcf54040 add gitlab project controller - still WIP 2016-05-04 18:01:41 +02:00
James Lopez 7a531bb116 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-04 17:44:15 +02:00
James Lopez a4d242b887 refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR 2016-05-04 17:42:02 +02:00
James Lopez e5ee7e8692 typos in export page 2016-05-04 11:10:25 +02:00
James Lopez 6cf88ce480 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-04 11:05:21 +02:00
James Lopez 1ff7735906 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-04 11:02:44 +02:00
James Lopez 9b21207305 updated import worker 2016-05-04 11:01:55 +02:00
James Lopez bc8eebf04a add export worker to process project export async 2016-05-04 10:59:33 +02:00
James Lopez bd2ebf37e6 use worker in controller 2016-05-04 10:57:09 +02:00
James Lopez 17cfce7adc typo 2016-05-03 15:09:28 +02:00
James Lopez fc329696e2 typo 2016-05-03 13:40:49 +02:00
James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb
2016-05-03 13:14:31 +02:00
James Lopez 6139e1433c fixing some rubucop warnings 2016-05-03 12:46:00 +02:00
James Lopez 9d306eb132 picking stuff from ui related to import 2016-05-03 12:41:23 +02:00
James Lopez 548c91e3c5 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
#	lib/gitlab/import_export/command_line_util.rb
2016-05-03 11:34:13 +02:00
James Lopez 2a78e03ad5 Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-05-03 11:15:38 +02:00
James Lopez 58b0b1a661 picking export stuff from the UI branch 2016-05-03 11:13:10 +02:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Stan Hu f64b82e1da Support e-mail notifications for comments on project snippets
Closes #2334
2016-05-02 11:01:32 -07:00
Robert Speicher 0652d92526 Merge branch '15527-fix-wiki-page-creation-issue' into 'master'
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
2016-05-02 17:18:22 +00:00
James Lopez 5a4f576359 fixing issues with project members mapping. Also added some more JS magic to the import page 2016-05-02 18:22:18 +02:00
Robert Speicher ec2710d0f5 Merge branch 'feature/backport-safewebhooks' into 'master'
Backported minimal safewebhook implementation to GitLab CE

This brings a minimal implementation for gitlab-org/gitlab-ce#13478
backported from EE (gitlab-org/gitlab-ee!334).

Also added UI to configure Secret Token

Fixes #15365.

See merge request !3940
2016-05-02 15:13:42 +00:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook
Codestyle changes to easy EE merge
2016-05-02 10:32:01 -03:00
James Lopez 07ab6c2e26 refactoring and fixing a bunch of stuff 2016-05-02 11:29:21 +02:00
Robert Speicher 6a56cff686 Merge branch 'fix/handle-issue-move-access' into 'master'
Handle issue move access instead of raising error

Closes #15533

See merge request !3990
2016-04-30 20:15:54 +00:00
Grzegorz Bizon c9577711ce Handle issue move access instead of raising error
Closes #15533
2016-04-30 21:28:40 +02:00
Gabriel Mazetto 0cd5edf35c Backported minimal safewebhook implementation to GitLab CE 2016-04-30 05:04:10 -03:00
Yorick Peterse b6a18f1093 Tweak checking branches in Project#open_branches
This changes 4 things:

1. Project#protected_branches_names has been renamed to
   Project#protected_branch_names.

2. Project#open_branches uses a Set for the branch names as checking
   values in a Set is faster than checking values in a (large) Array.

3. Some redundant code in Project#open_branches has been removed.

4. Project#protected_branch_names now uses #pluck instead of #map,
   removing the need for loading entire DB records into memory.
2016-04-29 22:44:08 +02:00
Yorick Peterse e28d1fa3cc Use a query in Project#protected_branch?
This changes Project#protected_branch? to use a query to check if a
branch is protected, instead of loading all ProtectedBranch records into
memory just to check if the list of names includes a given branch name.
2016-04-29 22:21:06 +02:00
Jacob Schatz 85d6403278 Merge branch 'dz-small-ui-fixes' into 'master'
Move modal css to separate file and fix danger text for confirmation modal

* in help file I found css for modal that affect whole application -> moved to separate file
* fixed ugly confirmation message when remove project

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

See merge request !3979
2016-04-29 17:56:46 +00:00
Dmitriy Zaporozhets f3f820d0bd Move modal css to separate file and fix danger text for confirmation modal
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-29 19:02:30 +02:00
Jacob Schatz ef842562d6 Merge branch 'duplicate-label-dropdown' into 'master'
Removes duplicates from the label dropdown

It concats the duplicate labels into a single label in the dropdown with the color being a gradient of the differnet colors being concatted.

I liked your idea @jschatz1 of using a standard icon color. However, with this i've taken all the duplicated colors & made a little gradient with them so it still half resembles the label colors (this has been limited to 4 or it could get crazy!)

![Screen_Shot_2016-04-28_at_10.35.04](/uploads/41f45f3f92f971e7f38df7a98765cb9d/Screen_Shot_2016-04-28_at_10.35.04.png)

Closes #16555, #14820

See merge request !3963
2016-04-29 17:01:33 +00:00
Jacob Schatz 535896cd1c Merge branch 'notification-email-badge-alignment' into 'master'
Updated spacing between notification label and button

![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png)

Closes #16552

See merge request !3965
2016-04-29 16:54:19 +00:00
Phil HughesandJacob Schatz b2ec176539 Removes duplicates from the label dropdown
It concats the duplicate labels into a single label in the dropdown with
the color being a gradient of the differnet colors being concatted.

Closes #16555
2016-04-29 12:10:30 -04:00
Jacob Schatz 79c27e6a7b Merge branch 'emoji_award_coffee_refactoring' into 'master'
AwardsHandler follows code style conventions



See merge request !3871
2016-04-29 15:55:28 +00:00
Rémy CoutableandStan Hu 3811eb0ba1 Fix error when trying to create a wiki page
Closes #15527.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-29 06:50:18 -07:00
Rémy Coutable bfc6a0e371 Merge branch 'gitattributes' into 'master'
Support supressing text file diffs on the default branch with .gitattributes

This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch.

When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed.

![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png)

I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`.

Fixes and closes gitlab-org/gitlab-ce#2315.

See merge request !3806
2016-04-29 12:40:13 +00:00
Matt Oakes 28dcdb2779 Support supressing text file diffs on the default branch with .gitattributes
This is a combination of 3 commits.

- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
2016-04-29 12:45:15 +01:00
Rémy Coutable b8f28628f5 Merge branch 'fix/remove-deprecated-ci-helper' into 'master'
Remove deprecated CI badge helper

Closes #13446

See merge request !3977
2016-04-29 11:09:34 +00:00
Rémy Coutable 1c0aef4464 Merge branch 'change_message_for_newly_created_milestone' into 'master'
Use a better message when milestone is newly created

closes #14982

See merge request !3925
2016-04-29 10:51:10 +00:00
Jacob Schatz 4997a1e321 Merge branch 'dz-update-outdated-colors' into 'master'
Replace outdated bluish colors with default bg color

cc @skyruler 

See merge request !3973
2016-04-29 10:37:17 +00:00
Grzegorz Bizon 0ea9e47722 Remove deprecated CI badge helper
Closes #13446
2016-04-29 12:21:20 +02:00
Arinde Eniola ded3b02f33 Use a better message when milestone is newly created
make some changes for the checks to determine when the messages should be displayed

add item to changelog and also integration test

make some changes to the test

make some changes
2016-04-29 10:15:49 +01:00
Robert Speicher 10f84f99cb Merge branch 'zj-large-files-no-highlight' into 'master'
Properly handle bigger files

Closes #3967

See merge request !3718
2016-04-28 21:33:50 +00:00
Dmitriy Zaporozhets 9ef18c6c8b Replace outdated bluish colors with default bg color 2016-04-28 23:06:00 +02:00
Jacob Schatz 73990df32f Merge branch 'async-new-branch-button' into 'master'
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
2016-04-28 21:00:22 +00:00
Jacob Schatz 9bccb4c951 Merge branch 'protected-branches-ui' into 'master'
Protected branches UI

![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png)

![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png)

Closes #14027

See merge request !3929
2016-04-28 20:17:41 +00:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master'
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
2016-04-28 20:16:36 +00:00
Jacob Schatz bdcba43873 Merge branch 'project-deploy-keys-ui' into 'master'
Project deploy keys updated UI

Closes #13992

See merge request !3912
2016-04-28 20:16:04 +00:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04:00