Commit Graph
11906 Commits
Author SHA1 Message Date
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
Robert Speicher 70b7eacfb2 Merge branch 'improve-diverging-commit-counts' into 'master'
Dedicated method for counting commits between refs

Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66
Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619

See merge request !2707
2016-02-05 21:45:48 +00:00
Dmitriy Zaporozhets 26f3cc41fc Merge branch 'feature/jschatz1/sidebar-features' into 'master'
Feature/jschatz1/sidebar features

* Changes sidebar width (290px).
* Makes shortcuts for <kbd>j</kbd> and <kbd>k</kbd> keys for next and previous issues.

![Screen_Shot_2016-02-05_at_3.06.22_PM](/uploads/8590be43dc1b9feffd4f32b4e8cb7790/Screen_Shot_2016-02-05_at_3.06.22_PM.png)

cc/ @dzaporozhets 

See merge request !2734
2016-02-05 20:57:45 +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
Robert Speicher ec55d89cf8 Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'
Fixes for issue with poor logo transition animation on Safari

See merge request !2690
2016-02-05 15:12:56 -05:00
Roman RottandRobert Speicher 9cc321ca17 fixed issue with poor logo transition animation on safari
updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors

Updated comments and Changelog

Removed duplicate line in changelog
2016-02-05 15:11:46 -05:00
Jacob Schatz 932c5eb886 Changes sidebar width 2016-02-05 15:06:46 -05:00
Phil Hughes b79d9e8017 Uses icon helper for dropdown toggle icon 2016-02-05 20:02:46 +00:00
Jacob Schatz 4a878e1dfa Add j and k shortcuts 2016-02-05 14:40:50 -05: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
Dmitriy Zaporozhets 2611acfd92 Improve placeholder: search -> Search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-05 19:32:12 +01:00
Jacob Schatz 2e8fe0bdb2 Add JS style changes.
Thanks @rspeicher
2016-02-05 11:31:13 -05:00
Jacob Schatz 80812a5d46 Edited time ago location change.
Change edited icon to word.
Change edited text color to gray
cc/ @creamzy
2016-02-05 11:31:13 -05:00
Dmitriy Zaporozhets fed80f25f5 Merge branch 'fix-double-page' into 'master'
Fix double paging

![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png)

![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png)


See merge request !2727
2016-02-05 16:29:50 +00:00
Dmitriy Zaporozhets b0d5aeaa55 Merge branch 'improve-broadcast-messages' into 'master'
Improve admin broadcast messages page

* Show latest broadcast messages first on admin page
* Use nice looking pagination

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

Fixes #13211 

cc @rspeicher @DouweM 

See merge request !2725
2016-02-05 16:16:14 +00:00
Josh Frye 1a9630acc5 Fix double paging 2016-02-05 10:45:22 -05:00
Dmitriy Zaporozhets 9bf85c01a9 Merge branch 'paginate-dashboard-projects' into 'master'
Page project list on dashboard



See merge request !2689
2016-02-05 15:02:47 +00:00
Dmitriy Zaporozhets 989caaebdc Improve admin broadcast messages page
* Show latest broadcast messages first on admin page
* Use nice looking pagination

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-05 16:01:10 +01:00
Josh Frye f1102b3373 Frontend changes from MR feedback 2016-02-05 09:05:52 -05:00
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
Dmitriy Zaporozhets f8526fef0b Fix project filter form rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-05 11:10:44 +01: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
Jacob Schatz 5d2299ac21 Fix diff and commit view on merge requests
with new sidebar
Fixes #3981
2016-02-04 14:56:25 -05:00
Josh Frye 3f1bd844f1 Implement changes from MR feedback 2016-02-04 14:02:19 -05: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
Yorick Peterse b263ab618c Dedicated method for counting commits between refs
gitlab_git 8.1 adds the ability to count the amount of commits between
two references without having to allocate anything but regular
Rugged::Commit objects. This in turn speeds up the process of counting
the number of commits a branch is ahead/behind by about 3.5x.
2016-02-04 19:42:40 +01:00
Josh Frye 74a4ff6143 Remove js line 2016-02-04 13:24:43 -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
Josh Frye 2ad094132d Various filter fixes 2016-02-04 13:03:41 -05: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
Josh Frye 2c871ca196 Delay filter until user stops typing 2016-02-04 11:40:19 -05:00
Josh Frye 7522ac0b3c Paginate + ajax filter dashboard projects 2016-02-04 11:40:19 -05:00
Josh Frye 87b61db7ed Page project list on dashboard 2016-02-04 11:40:19 -05:00
Jacob Schatz 2e6c5fb28e Properly link to the right issue or merge request 2016-02-04 11:10:11 -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
Jacob Schatz f25ba6e03c Resize sidebar on initial page refresh. 2016-02-04 08:50:25 -05: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 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 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