home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,657 Commits 48 Branches 340 Tags
306c50cecde50b0bbfc9d665a09ecd2fa1676005
Commit Graph
23657 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Schatz 306c50cecd Make copy button in collapsed sidebar work. 2016-02-05 19:43:18 -05:00
Jacob Schatz dcfdef689a Fix span margin issues 2016-02-05 18:29:17 -05:00
Jacob Schatz 9860bd72ab Add hover for gutter toggle button 2016-02-05 18:25:26 -05:00
Jacob Schatz d164f1982a Change hover color of sidebar buttons 2016-02-05 18:21:50 -05:00
Jacob Schatz ebeb35a01c Fix ugly state of dropdown 
when editing a dropdown,
but not changing anything you end up in an ugly state
Fixes #13215
 2016-02-05 18:18:34 -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
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
Phil Hughes b724f0871a Project dropdown test span -> i 2016-02-05 20:08:28 +00: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
Jacob Schatz 3a98279243 Merge branch 'capitalize-placeholder' into 'master' 
Improve placeholder: search -> Search

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

See merge request !2732
 2016-02-05 19:01:13 +00: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
Achilleas Pipinellis 7f5a87f12d Merge branch 'missing_uploads_dir' into 'master' 
Make sure the public/uploads/ directory is created



See merge request !2730
 2016-02-05 16:30:28 +00: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
Achilleas Pipinellis aa5eca47db Make sure the public/uploads/ directory is created 
[ci skip]
 2016-02-05 18:28:46 +02: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
Achilleas Pipinellis 569c467203 Merge branch 'ruby_sha' into 'master' 
Fix Ruby SHA in installation guide

The Ruby SHA that we were checking against in the
installation guide was wrong. I replaced it with
sha256sum which is also present in the Ruby downloads
page. Also added it as a note in the doc styleguide. 

See merge request !2726
 2016-02-05 15:28:09 +00:00
Achilleas Pipinellis a95c6e38c6 Add ruby version update info in doc_styleguide 
[ci skip]
 2016-02-05 17:26:40 +02: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
Achilleas Pipinellis bf94ddef78 Fix wrong Ruby SHA and replace with sha256sum 
[ci skip]
 2016-02-05 16:53:00 +02:00
Josh Frye f1102b3373 Frontend changes from MR feedback 2016-02-05 09:05:52 -05:00
Dmitriy Zaporozhets 0c449e36ea Merge branch 'improve-nav-controls' into 'master' 
Improve reuse of existing UI components

* Re-use top-are css component for issues/mr pages
* Add support for inline form in nav-controls component

cc @jschatz1 

See merge request !2722
 2016-02-05 13:01:01 +00: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
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
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
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
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