Commit Graph
813 Commits
Author SHA1 Message Date
Phil Hughes a45cb68809 Fixed failing tests 2016-03-18 15:18:06 +00:00
Phil Hughes 0eecc21485 Updated controller with before_action
Fixed other issues based on feedback
2016-03-18 15:18:06 +00:00
Phil Hughes 645b7a0a33 Full labels data in JSON 2016-03-18 15:18:06 +00:00
Phil Hughes 0858cb097a Fixed issue with labels dropdown getting wrong labels 2016-03-18 15:18:06 +00:00
Douglas Barbosa Alexandre 34ee75379c Restrict access to confidential issues 2016-03-17 20:55:38 -03:00
Douglas Barbosa Alexandre 6b86d3fb80 Add an option to user make an issue confidential 2016-03-17 20:55:38 -03:00
Douwe Maan cf2e3ff6f9 Merge branch 'new-branch-button-issue' into 'master'
New branch button on issues

Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field.

The button; with styling

![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png)

Links to the related branches on the issue

![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png)

Styled like the MR links

![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png)


Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching:

![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png)

Closes #3886 

cc @DouweM 


See merge request !2808
2016-03-17 14:14:32 +00:00
Grzegorz Bizon 019fed0f72 Reuse no_cache_headers method in badges controller 2016-03-17 12:16:34 +01:00
Zeger-Jan van de Weg 2b97c92119 Incorporate review 2016-03-15 20:21:11 +01:00
Zeger-Jan van de WegandZeger-Jan van de Weg ad97bebfed Enhance new branch button on an issue 2016-03-15 20:21:11 +01:00
Zeger-Jan van de WegandZeger-Jan van de Weg 228007dfbc new-branch-button 2016-03-15 20:21:11 +01:00
Rémy Coutable c98089b2b2 Move the #toggle_subscription controller method to a concern 2016-03-15 18:22:03 +01:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
2016-03-15 17:25:37 +01:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

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

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Zeger-Jan van de Weg dfb96ed84b ContinueToParams -> ContinueParams 2016-03-13 13:13:19 +01:00
Zeger-Jan van de Weg 1cefb73a9c Check redirect path in the continue_params
Fixes
https://dev.gitlab.org/gitlab/gitlabhq/issues/2649
https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
2016-03-13 13:13:19 +01:00
Dmitriy Zaporozhets e1dffa32db Render project members from shared group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-12 18:02:16 +01:00
Dmitriy Zaporozhets 746ac56b6f Add functionality to setup share of project with group via project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 18:37:46 +01:00
Douwe Maan afb8d76f3c Merge branch 'cache-raw-2' into 'master'
Set cache headers for raw blobs

This changes allows browsers and (in the case of public projects)
proxy caches to cache raw Git blob responses.

See merge request !3113
2016-03-07 22:05:15 +00:00
Jacob Vosmaer 41bc9c463c Refactor caching code 2016-03-07 14:27:53 +01:00
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05:00
Grzegorz Bizon bf921d084e Invalidate cache for builds badge
Closes #13982
2016-03-04 10:34:35 +01:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Jacob Vosmaer fc90d9e589 Tell clients/proxies to cache raw blob requests 2016-03-03 17:59:47 +01:00
Dmitriy Zaporozhets 11b6aeafba Merge branch 'refactor-projects-list' into 'master'
Refactor projects list

1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

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

cc @jschatz1 @DouweM 

See merge request !3075
2016-03-03 14:35:41 +00:00
Douwe Maan 1cb4f810a5 Merge branch 'issue_13648' into 'master'
Reuse query from ProjectsFinder to get projects accessible to current user.

Fixes #13648

This is a refactor to reuse the existing query from our `ProjectsFinder` class

See merge request !3049
2016-03-03 14:28:25 +00:00
Dmitriy Zaporozhets 7455d950bc Refactor projects list
1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-03 13:09:58 +01:00
Rubén Dávila 49e4ef3b41 Add specs to ForksController#index.
* Also refactor query to get projects accessible for current user.
  ProjectsFinder actually return public projects when no user is passed.
2016-03-02 12:35:56 -05:00
Rubén Dávila 0e1d440805 Reuse query from ProjectsFinder to get projects accessible to current user. 2016-03-01 12:48:09 -05:00
Rémy Coutable 722d74c7e9 Make the tags delete button remote in the tags list 2016-03-01 18:44:01 +01:00
Douwe Maan fac1e0e83c Merge branch 'safe-content-type' into 'master'
Explain why we mangle blob content types

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079

See merge request !2956
2016-03-01 13:39:26 +00:00
Rubén Dávila 8c948548e1 Logged in user should be able to read internal forks. 2016-02-27 10:04:36 -05:00
Rubén Dávila f96ce4079f Improve implementation to check read access to forks and add pagination. 2016-02-26 19:34:52 -05:00
Jacob Vosmaer cf2c5396e0 Explain why we mangle blob content types 2016-02-24 11:53:30 +01:00
Phil Hughes 01b965f6da Correctly checks if tree view is on screen 2016-02-23 13:41:03 +00:00
Phil Hughes d80205b755 Fixes issue with file view rows not clickable on project main view
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests

Fixes #3916
2016-02-23 09:06:26 +00:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre ce78813c2a Create or mark task pending as soon the action happens 2016-02-20 12:12:05 -02:00
Douwe Maan 31682eb987 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-19 17:54:13 -08:00
Douwe Maan 3a97a5ddfd Merge branch 'rs-blob' into 'master'
Add a `Blob` model that wraps `Gitlab::Git::Blob`

This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.

It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.

See merge request !2887
2016-02-20 01:12:52 +00:00
Jacob Schatz de84fa365e Merge branch 'issue_3276' into 'master'
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
2016-02-19 19:44:13 +00:00
Rubén DávilaandRobert Speicher 5ef3f80d41 More updates from the last code review. 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher b8295fc323 Fix build and add specs 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 9d4c105ab0 Remove code introduced when endpoint was in MR controller. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 1469b72c46 Check that target_branch is present. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 4dc8350517 Reuser revert commit modal in MR detail page. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00