Robert Speicher
dba47f680d
Merge branch 'issue_13301_emoji-menu' into 'master'
...
Load award emoji picker with ajax request
Fixes #13301 .
See merge request !2888
2016-02-24 02:50:45 +00:00
Jacob Schatz
52ac5242d1
Merge branch 'issue_13510' into 'master'
...
Adds "e" shortcut to issuable pages which redirects to the Edit page
Closes #13510
See merge request !2945
2016-02-23 18:21:45 +00:00
Robert Speicher
ad3433f91e
Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'
...
Show Crowd login even when sign-in is disabled
Fixes #13176 .
See merge request !2749
2016-02-23 18:19:41 +00:00
Alfredo Sumaran
2f63303fdb
Add "e" shortcut to help modal
2016-02-23 11:54:56 -05: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
Peter Hudec and Rémy Coutable
dcaeee4579
Show Crowd login even when sign-in is disabled
2016-02-23 15:13:50 +01: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
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
Annabel Dunstone
7bb378b33d
Create EmojisController
2016-02-22 20:16:00 -06:00
Jacob Schatz
7c80998536
Merge branch 'project-type-icon-your-projects' into 'master'
...
Show project visibility level on project list
Fixes #3779
See merge request !2908
2016-02-22 20:34:31 +00:00
Jacob Schatz
54a5b8831a
Merge branch 'blame-line-link' into 'master'
...
Added line links to blame table
Closes #4119
See merge request !2915
2016-02-22 20:29:38 +00: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
Robert Speicher
8c4cfb1fee
Merge branch 'rs-mask-icon' into 'master'
...
Add a Pinned Tab icon for Safari
See http://apple.co/1SCRzrw
Closes #13540
[ci skip]
See merge request !2883
2016-02-22 16:34:46 +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
Phil Hughes
49a95d9858
Show project visibility level on project list
...
Fixes #3779
2016-02-22 10:08:44 +00:00
Douwe Maan
42cbcb2347
"X assigned you Y" instead of "X assigned Y"
2016-02-20 12:01:55 -08:00
Douwe Maan
d53ae7f14d
Add "Mark all as done" button
2016-02-20 11:59:19 -08:00
Douwe Maan
57d16552ff
Include 'issue'/'merge request' in link
2016-02-20 11:53:15 -08:00
Douwe Maan
0e9775816a
Rename tab from 'Todos' to 'To do'
2016-02-20 11:52:57 -08:00
Douglas Barbosa Alexandre
3d52e139b1
Rename Tasks to Todos
2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre
a7dee0ab01
Refactoring TasksHelper
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
d80678c0da
Improve tasks page list UI
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
a57bf9bd39
Rename menu item and page 'Task queue' to 'Tasks'
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
7200989675
Refactoring task queue partials
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
07eb334c25
Add filters by project, author, type, and action to task queue page list
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
c4c4b808f3
Add a link to Task Queue on dashboard sidebar
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
1d476b0656
Create a pending task when a user is mentioned on a note
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
38026e5f77
Add pending tasks badge on top right next to the new and logout button
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
77d7910b8b
Allow user to mark each task as done manually
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
1e0053f2dc
Fix task queue list page title
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
7cafa2ce92
Add tasks queue list page
2016-02-20 12:10:26 -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
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
See merge request !2874
2016-02-19 18:21:42 +00:00
Rubén Dávila and Robert Speicher
5ef3f80d41
More updates from the last code review.
2016-02-19 13:15:42 -05:00
Rubén Dávila and Robert Speicher
169070ba4b
Some updates from last code review.
2016-02-19 13:14:54 -05:00
Rubén Dávila and Robert 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ávila and Robert 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ávila and Robert Speicher
e8d15f1339
Refactor revert_commit_link helper.
2016-02-19 13:14:54 -05:00
Rubén Dávila and Robert Speicher
5ad78cdbda
Use a custom title in the revert modal.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
ccd2a8d6b5
Show a tooltip on revert link.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
477ae66b4d
Move revert link to the MR widget section plus some refactor.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
328b52d58a
Some updates after last code review.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
38e708f0ce
Add link to fork if user can't revert MR.
2016-02-19 13:14:52 -05:00
Robert Speicher
Jacob Schatz
Alfredo Sumaran
Peter HudecandRémy Coutable
Phil Hughes
Annabel Dunstone
Douwe Maan
Douglas Barbosa Alexandre
Douwe Maan
Rubén DávilaandRobert Speicher