Commit Graph
1485 Commits
Author SHA1 Message Date
Douwe Maan ff28ac9c18 Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master'
Add ability to see and sort on vote count from Issues and MR lists

Fixes #3763

* Sort options

![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png)

* Most popular

![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png)

* Least popular

![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png)

See merge request !2781
2016-02-17 17:20:35 +00:00
Rémy Coutable 42c2064a36 Sort line notes used in parallel diff by created_at
Fixes #13464.
2016-02-17 16:31:14 +01:00
Douglas Barbosa Alexandre 9823d00e0b Add ability to see and sort on vote count from Issues and MR lists 2016-02-17 11:32:02 -02:00
Rémy Coutable d28fa2ce23 Display "iid of max_iid" in Issuables' sidebar 2016-02-16 12:58:12 +01:00
Rémy Coutable 54613b6af5 Fix the "x of y" displayed at the top of Issuables' sidebar
1. We now display the index of the current issuable among all its project's
issuables, of the same type and with the same state.
2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper
module.
3. Added acceptance specs for the sidebar counter.
2016-02-15 15:40:24 +01:00
Ben BoeckelandRémy Coutable e919b5a4e9 Fix relative links in other markup formats
- Apply the RelativeLinkFilter filter to other formats, e.g.,
  reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline

Fixes #3533.
2016-02-12 17:20:59 +01:00
Oliver RogersandRémy Coutable a7567ca152 Fix milestone order in project and issue edit lists to due_date 2016-02-10 17:42:20 +01:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan aacde42d55 Merge branch 'rs-broadcast-markdown' into 'master'
Allow limited Markdown in Broadcast Messages

Closes #11853

See merge request !2695
2016-02-09 11:44:08 +00:00
Valery Sizov e0d7d2e9b4 Merge branch 'snippet_search_refactoring' 2016-02-09 12:04:59 +02:00
Robert Speicher 201fb4c7e3 Merge branch 'ci-permissions' into 'master'
Limit guest access to builds

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646

See merge request !1942
2016-02-08 23:33:44 +00:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages
Closes #11853
2016-02-06 14:30:07 -05:00
Jacob Schatz e63941ab34 Merge branch 'project-title-dropdown-toggle-button' into 'master'
Changed the project switcher dropdown toggle

Moved the positioning of the dropdown to be more aligned with the title

Closes #13219 and #13214 

cc. @jschatz1 @dzaporozhets 

See merge request !2733
2016-02-05 22:12:03 +00:00
Dmitriy Zaporozhets 008ef89d16 Merge branch 'bug/jschatz1/sidebar-issues' into 'master'
Fix diff and commit view on merge requests

with new sidebar
Fixes #3981

See merge request !2718
2016-02-05 20:55:51 +00:00
Phil Hughes b79d9e8017 Uses icon helper for dropdown toggle icon 2016-02-05 20:02:46 +00:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions
# Conflicts:
#	db/schema.rb
2016-02-05 20:15:32 +01:00
Phil Hughes 0a094cb1df Changed the project switcher dropdown toggle
Moved the positioning of the dropdown to be more aligned with the title

Closes #13219 and #13214
2016-02-05 18:56:37 +00:00
Valery Sizov 94af78ac4a Faster snippet search 2016-02-05 18:20:29 +02:00
Rémy Coutable 2ffe160df8 Merge branch 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master'
Fix label links for a merge request pointing to issues list

_Originally opened at !2150._

---

I have added a type parameter to the `link_to_label` helper method that is set to `'merge_request'` when in the context of a merge request.

I have also improved the specs to actually test the output of the method instead of its implementation.

Fixes #3007.

See merge request !2700
2016-02-05 08:21:23 +00:00
Dmitriy Zaporozhets 42e0e35784 Merge branch 'search-on-groups-is-ugly' into 'master'
Change placeholder text to just 'search'

Fixes #13168 

![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png)


See merge request !2711
2016-02-04 20:09:29 +00:00
Jacob Schatz 5d2299ac21 Fix diff and commit view on merge requests
with new sidebar
Fixes #3981
2016-02-04 14:56:25 -05:00
Rémy Coutable 6e79ce2efd Allow link_to_label to take an optional type arg
You can set type: :merge_request to create a link to merge request
lists instead of issues list. Accept both Symbol & String as type
argument for the link_to_label helper
2016-02-04 19:14:48 +01:00
Dmitriy Zaporozhets 34edb3abe7 Merge branch 'feature/jschatz1/issuable-sidebar' into 'master'
Implement new design for issue and merge request right sidebar

Fixes #3981 



See merge request !2645
2016-02-04 18:01:29 +00:00
Jacob Schatz b1757c200c Change placeholder text to just 'search' 2016-02-04 12:29:32 -05:00
Jacob Schatz 2e6c5fb28e Properly link to the right issue or merge request 2016-02-04 11:10:11 -05:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions
# Conflicts:
#	app/views/projects/builds/index.html.haml
2016-02-04 13:16:48 +01:00
Dmitriy Zaporozhets 70e44d63f7 In search autocomplete show only groups and projects you are member of
For big instances search autocomplet is flooded with groups you have no
access to and insternal/public projects you don't care. It affects way
how easily you can go to group/project you are actually member of

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04 12:38:25 +01:00
Dmitriy Zaporozhets 9f8acf8a83 Satisfy rubocop
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04 09:57:17 +01:00
Dmitriy Zaporozhets de6f2884ea Sort projects by last activity for project switcher in header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03 23:27:00 +01:00
Dmitriy Zaporozhets 73bd729ecc Add sort dropdown to dashboard projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03 20:13:26 +01:00
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master'
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
2016-02-03 01:26:30 +00:00
Jacob Schatz c4c919e59d Merge branch 'title-projects-dropdown' into 'master'
Added dropdown to list all projects on project header

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4212

When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user.

When closed:

![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png)

When open:

![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png)


cc. @jschatz1

See merge request !2438
2016-02-02 22:15:40 +00:00
Douglas Barbosa Alexandre 0ea5d764f2 Hide the link for spam logs if the Askimet is disabled 2016-02-02 11:25:44 -02:00
Kamil Trzcinski 055afab5c7 Make the CI permission model simpler
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API

Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
2016-02-02 09:18:08 +01:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
2016-02-01 18:25:32 +01:00
Phil Hughes 09dc9bd568 rubocop fixes 2016-01-30 16:01:49 +00:00
Phil Hughes e79b5ff9d6 removed un-used variable 2016-01-30 16:01:49 +00:00
Phil Hughes 6013934540 fixes issue when user is not logged in but viewing public project 2016-01-30 16:01:49 +00:00
Phil Hughes 81e7086fec uses AJAX to select the projects 2016-01-30 16:01:49 +00:00
Phil Hughes 14394e8bad pulls in all user projects 2016-01-30 16:01:49 +00:00
Phil Hughes 9040010481 Added dropdown to list all projects on project header
When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user
2016-01-30 16:01:48 +00:00
Douwe Maan 47afe7ae8f Fewer html_safes 2016-01-30 12:54:19 +01:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Jacob Schatz 541fcc37bf Add detail to collapsed icons 2016-01-28 20:36:48 -05:00
Jacob Schatz 9c2bd8b70e Sidebar collapse and expand work with whole page. 2016-01-28 18:26:47 -05:00
James Lopez 69c4e0a119 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-broken-update 2016-01-28 18:14:28 +01:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master'
Show list of forks for a given Project

Closes #2406

See merge request !2376
2016-01-28 16:58:38 +00:00
James Lopez 902baa2e1c trick rubocop and temporarily add ruby 2.1 images for any branch 2016-01-28 11:41:58 +01:00
Jacob Schatz f64e35069e Add js to expand and contract side menu 2016-01-27 23:47:37 -05:00
Jacob Schatz 087abdf7fd New right side gutter design.
[WIP]
2016-01-27 17:38:19 -05:00