Commit Graph
2824 Commits
Author SHA1 Message Date
Robert Speicher 076956cb2b Merge branch 'issue_13501' into 'master'
Add link to open merge requests on label index

Closes #13501 

See merge request !3057
2016-03-02 17:18:03 +00:00
Rémy Coutable cb6af81670 Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'
Tag deletion doesn't use AJAX anymore



See merge request !2986
2016-03-02 13:02:41 +00:00
Jacob Schatz 773718cbd3 Merge branch 'username-issue-header' into 'master'
Added username to issue & merge request header

Closes #13771 

## Issue header

![Screen_Shot_2016-03-01_at_16.59.32](/uploads/a112dfb91eb9b6f911c716265b35043c/Screen_Shot_2016-03-01_at_16.59.32.png)

## Merge request header

![Screen_Shot_2016-03-01_at_16.59.26](/uploads/67bf9e65ac5cae4667db6c5148cb57a0/Screen_Shot_2016-03-01_at_16.59.26.png)

See merge request !3048
2016-03-02 11:43:35 +00:00
Alfredo Sumaran c5df14ff98 Add link to open merge requests 2016-03-01 21:07:08 -05:00
Rubén Dávila 7773180219 Show days remaining instead of elapsed time for Milestone. 2016-03-01 19:40:50 -05:00
Rémy Coutable 722d74c7e9 Make the tags delete button remote in the tags list 2016-03-01 18:44:01 +01:00
Rémy Coutable 550d314839 Tag deletion doesn't use AJAX anymore
The controller was actually changed to not respond to AJAX but the
deletion button in the index.html was still using AJAX. There is no need
for AJAX when deleting a tag since it's a very rare use-case. KISS.

Fixes #13781
2016-03-01 18:44:01 +01:00
Phil Hughes 6f265eb757 Added username to issue & merge request header
Closes #13771
2016-03-01 16:57:53 +00:00
Phil Hughes 43f3439d98 Changed page title 2016-03-01 13:15:09 +00:00
Phil Hughes 8e8df6d562 Removed un-used variables 2016-03-01 13:03:39 +00:00
Phil Hughes fbe6b8eeca Replaced prefix with to_reference method calls 2016-03-01 13:03:39 +00:00
Phil Hughes aff5e73f2a Changed # to ! on merge requests on activity view
Closes #9082
2016-03-01 13:03:39 +00:00
Alfredo Sumaran 4f529a8806 Merge branch 'master' into issue_13212 2016-02-29 12:04:45 -05:00
Dmitriy Zaporozhets eb9838d38b Merge branch 'issue_13648' into 'master'
Improve implementation to check read access to forks and add pagination.

Fixes #13648 

The following optimizations where made:

- Pagination was added.
- Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project.


See merge request !2991
2016-02-29 17:00:23 +00:00
Alfredo Sumaran c4b9b2cfcf Wrap icon with edited time 2016-02-29 11:01:28 -05:00
Phil Hughes 2f0c3ca352 Changed too many changes buttons to white
Closes #13751
2016-02-29 09:18:29 +00: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
Dmitriy Zaporozhets d51f3b7b35 Refactor styles for merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:48:25 +01:00
Dmitriy Zaporozhets 2b5a6487ba Refactor styles for issues list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 820d227b9e Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' 2016-02-25 19:02:57 +01:00
Dmitriy Zaporozhets fc31840d4e Merge branch 'andywgrant/gitlab-ce-master' into 'master'
Add "issue" to Close/Reopen buttons for clarity

_Originally opened by @andywgrant at !2884_

---

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

See merge request !2929
2016-02-24 16:32:56 +00:00
Jacob Schatz 1142b327e8 Merge branch 'dz-small-ui-fixes' into 'master'
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler 

See merge request !2758
2016-02-23 15:38:20 +00:00
Jacob Schatz 6263a3ca3c Merge branch 'files-view-row-click' into 'master'
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

See merge request !2933
2016-02-23 14:52:21 +00:00
Jacob Schatz 06f7fd2fb7 Merge branch 'empty-repo-instructions-fix' into 'master'
Users don't get instructions to push to other users empty projects

Fixes #12518

![Screen_Shot_2016-02-22_at_17.38.18](/uploads/42a3c32af1326f15a7b40fd7153a89fb/Screen_Shot_2016-02-22_at_17.38.18.png)

See merge request !2923
2016-02-23 14:07:36 +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
Andy GrantandRobert Speicher aead14b052 Add "issue" to Close/Reopen buttons for clarity 2016-02-22 15:36:48 -05:00
Steffen KöhlerandRémy Coutable bea6aa3377 Show test coverage on project builds page 2016-02-22 19:33:25 +01:00
Phil Hughes 62f4a9de19 Users don't get instructions to push to other users empty projects
Fixes #12518
2016-02-22 17:37:26 +00:00
Phil Hughes fbc578a7ec Added line links to blame table
Closes #4119
2016-02-22 14:09:13 +00:00
Phil Hughes 51c17329a4 Fixed failing issues tests
Removed up/down vote icons from merge requests. Was missed from d8069bd858
2016-02-22 11:35:52 +00:00
Phil Hughes d8069bd858 Only show up or down votes icon on issue list if there are any
Closes #13649
2016-02-22 10:21:02 +00: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
Douwe Maan c352aaa008 Merge branch '12792-emoji-as-text-diff-comment' 2016-02-19 16:59:36 -08: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
Robert Speicher a5c7aea3a9 Merge branch 'issue_3409' into 'master'
Add ability to revert changes introduced by Merge Requests or Commits

Closes #3409 

See merge request !1990
2016-02-19 18:39:31 +00:00
Rémy Coutable 803d6f8f05 Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master'
Consistency in MR and issue header.

Fixes: #13550 

![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png)

See merge request !2874
2016-02-19 18:21:42 +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 169070ba4b Some updates from last code review. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d958d027dc Make #commit_with_hooks return the new obj id plus some other fixes. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d34733efc4 Don't show revert button if commit/MR has already been reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher e8d15f1339 Refactor revert_commit_link helper. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 5ad78cdbda Use a custom title in the revert modal. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher ccd2a8d6b5 Show a tooltip on revert link. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 477ae66b4d Move revert link to the MR widget section plus some refactor. 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 38e708f0ce Add link to fork if user can't revert MR. 2016-02-19 13:14:52 -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 b0693318c3 Show list of branches plus some fixes. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 34e26b8212 Add button to revert commit on Commit detail page. 2016-02-19 13:14:50 -05:00