91836272fe
Merge branch 'mr-widget-text' into 'master'
...
Improve text of MR merge widget and manual merge modal
Modal with manual merge instructions:
Archived:
WIP:
Missing target branch:
Missing source branch:
Nothing to merge:
Checking ability to merge:
Conflicts when allowed to merge:
Conflicts when not allowed to merge:
Mergeable when allowed to merge:
Mergeable when not allowed to merge:
Merge in progress:
Merge failed:
Merged:
Closed:
cc @dzaporozhets @rspeicher
See merge request !1120
2015-08-11 19:24:50 +02:00
f293d991a4
Revert "Merge branch 'mr-widget-text' into 'master'
"
...
This reverts commit 151d9fb35f819d110cab
2015-08-11 10:26:12 +02:00
b8590da024
Improve MR merge widget text and UI consistency.
2015-08-08 21:24:43 +02:00
66cc712fa5
Fix method name.
2015-07-30 15:31:34 +02:00
e496c35fed
Dynamically check `:admin_*` ability on issuable form
...
Closes #2092
2015-07-24 15:50:12 -04:00
37bc7bac19
Add Issuable#to_ability_name
2015-07-24 15:50:12 -04:00
e65b081062
Dynamically check `:admin_*` ability in issuable context
...
Closes #2001
2015-07-19 16:48:33 -04:00
057d45fb23
Use password field default password masking.
2015-07-13 13:32:14 +02:00
bda04bc687
Merge branch 'fork_visibility_level' into 'master'
...
Forks should not have more permissive visibility levels than the original
https://dev.gitlab.org/gitlab/gitlabhq/issues/2286
See merge request !936
2015-07-10 12:05:54 +00:00
27a9ff8264
Merge branch 'rs-dev-issue-2372' into 'master'
...
Filter by issues/merge requests without a milestone
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372
See merge request !886
2015-07-08 21:42:29 +00:00
5e7f7f8d31
Redesign project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-07 15:22:56 +02:00
3ee3cb24d4
Allow user to filter by Issues/Merge Requests without a Milestone
2015-07-06 22:39:55 -04:00
111ebe5471
Fork visibility level fix
2015-07-06 17:40:33 +03:00
d5947ada44
Simplify set of assignee, milestone and label to admin_issue rule
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:45:45 +02:00
b9fa82daee
Update tests and use js-issuable class for context form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:05:30 +02:00
a9095280c7
UsersSelect is part of filter so I rather keep js executed in partial
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:54:35 +02:00
2d31568b27
Refactor issue and merge request sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:04:50 +02:00
d315d1eba4
Dont allow guest to set assigne, milestone and label when create new issue or merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 15:38:04 +02:00
60baa1e866
Move issuable partials in common directory
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 15:11:22 +02:00
cc9b5c49d1
Merge branch 'revert-mr-state-names'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/merge_requests.rb
2015-06-22 15:43:09 +02:00
ea9dda9541
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-06-22 11:26:33 +02:00
c0df5ff126
Merge branch 'snippet_optional_filename' into 'master'
...
Make snippet filename optional.
Fixes #2384 .
See merge request !1866
2015-06-20 10:47:06 +00:00
aecc989154
Make snippet filename optional.
...
Fixes #2384 .
2015-06-20 01:06:57 +02:00
7524d7c082
Revert merge request states renaming
...
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 17:09:50 +02:00
da15428340
Simplify line numbering
2015-06-19 04:31:24 -04:00
b3f9be0639
Refactor and spec BlobView JS
2015-06-19 04:31:23 -04:00
0d7a0675ac
Bootlint: Fix incorrectly nested `form-group` element
2015-06-16 13:33:48 -04:00
09b4e11d26
Bootlint: Add missing `type` attribute for buttons
2015-06-16 13:33:48 -04:00
e3c1818a3e
Bootlint: Modals no longer need a '.hide' class
2015-06-16 13:32:33 -04:00
0a03b9b717
Remove visibility icon from projects list on dashboard and group page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-12 18:16:19 +02:00
78d4b6ae8d
Remove arrow to the right of project name on dashboard
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-08 17:27:50 +02:00
8641cda4a5
Dont use fixed pixel size if form controls - its bad for mobile devices
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-08 16:34:58 +02:00
9a50db693a
Fix timeout when rendering file with thousands of lines.
2015-06-05 13:56:37 +02:00
9eec0d5436
Merge branch 'accepted-rejected-mrs' into 'master'
...
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201 .
See merge request !702
2015-05-27 11:40:36 +00:00
35853033b9
Fix for Snippets with a project
2015-05-26 15:48:32 -04:00
d25026a512
Add Accepted and Rejected tabs to MR lists.
2015-05-25 17:01:27 +02:00
b0659c1b07
Simplify and unify helpers for rendering markup
2015-05-18 22:52:13 +02:00
c7ae428b4c
Fix labels for project/snippet visibility selection
2015-05-16 16:09:04 -04:00
15bbb4ee1a
Merge pull request #9244 from dreis2211/firefox_issuable_filter_patch
...
Fix Firefox problems when it wants to render issuable component
2015-05-08 22:24:51 +03:00
15909d6411
Move project visibility from clone bar to repository details block for non empty project.
2015-05-08 18:12:07 +02:00
f972a9e34c
Fix bootlint issues on git clone holder bar
2015-05-07 18:32:10 +02:00
342078a76d
Small UI improvements to make project sidebar more neat
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-06 16:38:45 +03:00
a1152e19d1
Fix Firefox problems when it wants to render issuable component
2015-05-05 21:52:06 +02:00
5bc5188a06
Fix missing button types
2015-05-05 00:45:06 +02:00
e6ee8d0ebe
Group milestones by title in the dashboard and all other issue views
...
This groups milestones by title for issue views like it has been done for
the milestone dashboard/project overview. Before milestones with the
same title would show up multiple times in the filter dropdown and one could
only filter per project and milestone. Now the milestone filter is based
on the title of the milestone, i.e. all issues marked with the same
milestone title are shown.
2015-05-01 01:12:58 +02:00
93359c7e06
Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside
2015-04-30 19:40:05 +03:00
808b05e974
Move service template and project service settings into a shared view
2015-04-29 07:52:27 -07:00
f28f5e49f6
Fix wrong placement of show-aside link
2015-04-27 00:43:02 +02:00
bd557e4b64
Add new admin settings
...
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
6977810360
Add issue and merge request count for state filters.
2015-04-24 13:53:21 +02:00
Dmitriy Zaporozhets
Douwe Maan
Robert Speicher
Marin Jankovski
Valery Sizov
Nicolas
Jakub Jirutka
Sullivan SENECHAL
dreis
Dominik Sander
Stan Hu
Vinnie Okada
