Commit Graph
23616 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets eaad236b45 Remove project-issuable-filter from admin builds page :)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-05 11:53:06 +01:00
Dmitriy Zaporozhets 9258636021 Re-use top-are css component for issues/mr pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-05 11:35:55 +01:00
Dmitriy Zaporozhets ce39d62c3b Add support for inline form in nav-controls component
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-05 11:14:38 +01:00
Achilleas Pipinellis 9afcacb3a4 Merge branch 'doc_refactor_session_api' into 'master'
Refactor session API documentation



See merge request !2473
2016-02-05 10:11:44 +00:00
Achilleas Pipinellis 6d18f748f0 Merge branch 'doc_refactor_deploy_key_multiple_projects_api' into 'master'
Refactor deploy_key_multiple_projects API documentation



See merge request !2468
2016-02-05 10:10:23 +00:00
Dmitriy Zaporozhets 9d483a5c37 Merge branch 'list-padding' into 'master'
New padding for lists

* improve consistency for list padding
* reduce padding for project/group/events lists

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

Fixes #12511 

cc @jschatz1 @skyruler @creamzy 

See merge request !2715
2016-02-05 09:34:39 +00: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
Dmitriy Zaporozhets 34096bf349 New padding for lists
* improve consistency for list padding
* reduce padding for project/group/events lists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04 19:57:07 +01: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 3720b98e1b Merge branch 'fuzzy-file-search-menu-shortcut-placement' into 'master'
Puts shortcut key in the right place.

Fixes #13192

![Screen_Shot_2016-02-04_at_11.51.15_AM](/uploads/a10dc24b4a836199351ba98fca266695/Screen_Shot_2016-02-04_at_11.51.15_AM.png)


See merge request !2710
2016-02-04 18:01:48 +00: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 a1b475acab Puts shortcut key in the right place. 2016-02-04 11:49:46 -05:00
Dmitriy Zaporozhets c5ed929d33 Merge branch 'fix-test' into 'master'
Fix broken tests

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

cc @DouweM 

See merge request !2708
2016-02-04 16:39:44 +00:00
Drew Blessing e932714e09 Merge branch 'doc_bug' into 'master'
fix documentation bug / typo

Hey, noticed this a little bit ago.  Need to get the example matching up with the following explanation.

See merge request !2709
2016-02-04 16:38:02 +00:00
Douwe Maan ac923b4fb4 Merge branch 'fix/atom-url-issue' into 'master'
Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

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

See merge request !2651
2016-02-04 16:12:47 +00:00
Jacob Schatz 2e6c5fb28e Properly link to the right issue or merge request 2016-02-04 11:10:11 -05:00
Dmitriy Zaporozhets 9f86fcde40 Fix broken tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04 17:00:32 +01:00
Eric L Frederich f835fa8d75 fix documentation bug / typo 2016-02-04 10:42:36 -05:00
Dmitriy Zaporozhets dfe12649f6 Merge remote-tracking branch 'origin/rs-database-info' 2016-02-04 16:42:22 +01:00
Dmitriy Zaporozhets d9624bb87a Merge branch 'rs-backport-ldap-2fa' into 'master'
Support Two-factor Authentication for LDAP users

Closes #12653

See merge request !2688
2016-02-04 15:19:33 +00:00
James Lopez 5dc77d7577 refactored migration based on feedback 2016-02-04 15:35:03 +01:00
Jacob Schatz f25ba6e03c Resize sidebar on initial page refresh. 2016-02-04 08:50:25 -05:00
James Lopez 7b868c61ab refactored migration and spec based on feedback 2016-02-04 13:20:55 +01:00
Dmitriy Zaporozhets e933a50b6b Merge branch 'remove-newrelic' into 'master'
Remove newrelic gem. Closes #12860



See merge request !2682
2016-02-04 12:11:51 +00:00
Dmitriy Zaporozhets 2d9d2e7a7c Merge branch 'better-search-autocomplete' 2016-02-04 13:10:31 +01:00
Douwe Maan b5befc734b Merge branch 'disable-remove-source-branch' into 'master'
Hide remove source branch button when new commit is added to branch

Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch

/cc @DouweM

See merge request !2701
2016-02-04 11:56:58 +00:00
Dmitriy Zaporozhets 9ae125e7e2 Merge branch 'new-issue-projects-sort' into 'master'
Sort projects by last activity for new issue dropdown

When creating new issue from dashboard page I want to see projects
sorted by last activity instead of ID

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

See merge request !2702
2016-02-04 11:50:02 +00: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 ff5f0894ad Sort projects by last activity for new issue dropdown
When creating new issue from dashboard page I want to see projects
sorted by last activity instead of ID

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04 12:23:44 +01:00
Zeger-Jan van de Weg c6e0228ca9 Hide remove source branch button when new commit is added to branch
Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch
2016-02-04 11:56:23 +01:00
Douwe Maan 312d3faf6f Merge branch 'rs-whitelist-in-pipeline' into 'master'
Make Pipelines responsible for defining their custom whitelist

This allows for future pipelines to more easily define a custom
whitelist.

See merge request !2693
2016-02-04 10:16:48 +00:00
Douwe Maan a1fa973123 Merge branch 'wipMergeSpacing' into 'master'
No space required after WIP identifier

Fixes #2426 

Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. 
To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap").

See merge request !1876
2016-02-04 09:49:54 +00:00
Dmitriy Zaporozhets 8d94874446 Merge branch 'sort-projects-dropdown' into 'master'
Sort projects by last activity for project switcher in header

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

Fixes #13172 

See merge request !2692
2016-02-04 09:28:10 +00:00
Dmitriy Zaporozhets 9f8acf8a83 Satisfy rubocop
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-04 09:57:17 +01:00
Jacob Schatz e0efdc4bf7 Make size changes based on screen resize. 2016-02-03 20:35:26 -05:00
Dmitriy Zaporozhets 3b080be3e0 Merge branch 'use-top-area' into 'master'
Use top-area component for top page navigation for pages that contains list of items

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

See merge request !2686
2016-02-03 22:36:15 +00: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
Robert Speicher 47982e50c4 Make Pipelines responsible for defining their custom whitelist
This allows for future pipelines to more easily define a custom
whitelist.
2016-02-03 17:24:08 -05:00
Dmitriy Zaporozhets 088742551d Merge branch 'master' into use-top-area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03 22:51:19 +01:00
Dmitriy Zaporozhets ccd99efe64 Update test after changes build page css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03 22:48:21 +01:00
Dmitriy Zaporozhets c8224f0b92 Merge branch 'dashboard-sort-dropdown' into 'master'
Add sort dropdown to dashboard projects page

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

First step to improve projects page. Related to !2568 and #3968 

See merge request !2691
2016-02-03 21:45:48 +00:00
Jacob Schatz f660d8d044 Fixes sidebar width. 2016-02-03 16:04:48 -05:00
Jacob Schatz bb81eff4bf Issue sidebar bug fix.
Thanks @rspeicher.
2016-02-03 15:49:30 -05:00
Jacob Schatz 1731f45e2b Merge branch 'attach-file-cursor-position' into 'master'
Adds the markdown link at the cursor poisition

When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position

![drop-image-markdown](/uploads/52f41e38faca48c9ee01a02a75ec71be/drop-image-markdown.gif)

Tested in Chrome & Firefox and both working fine 👍 

Fixes #12822 

cc. @jschatz1 

See merge request !2648
2016-02-03 19:56:45 +00:00
Jacob Schatz 7b8ad80777 Merge branch 'remove-useless-text-tips' into 'master'
Remove useless text tips on commonly used pages

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

See merge request !2687
2016-02-03 19:52:37 +00:00
Jacob Schatz d6d3a132b8 Fix sidebar replacement for issues & MRs 2016-02-03 14:45:08 -05:00
Jacob Schatz 90352ee165 Merge branch 'ui-fixes' into 'master'
Fix missing space between fork and star icons

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

See merge request !2685
2016-02-03 19:43:56 +00:00
Dmitriy Zaporozhets f8a33707b7 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-03 20:21:26 +01:00