home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
23943 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis bce482a59a Merge branch 'patch-1' into 'master' 
fixed Windows commands in SSH Help.

The current commands shown don't work in Command Line, or PowerShell. Command Line doesn't recognize the `~` character as the home directory, the `<` character is reserved in PowerShell, and `cat` doesn't work in Command Line. This commit provides commands that will work for both the Command Line, and PowerShell.

See merge request !2694
 2016-02-06 18:35:01 +00:00
Kamil Trzcinski 311f407651 Fix commit status tests 2016-02-06 15:01:37 +01:00
Aaron Power b92ce40daa Fixed Window's commands for SSH Help. 2016-02-06 12:17:12 +00:00
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
Robert Speicher 551ce0f245 Add spec for assigning view param from cookie 2016-02-05 16:03:20 -05:00
Robert Speicher 24f048be72 Update CHANGELOG 
[ci skip]
 2016-02-05 16:02:11 -05: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
Kamil Trzcinski 0806476761 Remove current_user && when can? is used 2016-02-05 20:17:58 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01: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
James Lopez a64d881bac fixed spec - at last! 2016-02-05 17:43:05 +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
Valery Sizov d2cb65f310 trigger builds 2016-02-05 18:29:35 +02:00
Achilleas Pipinellis aa5eca47db Make sure the public/uploads/ directory is created 
[ci skip]
 2016-02-05 18:28:46 +02:00
Valery Sizov 8f929b8747 one more improvement to snippet search 2016-02-05 18:27:12 +02:00
Valery Sizov 94af78ac4a Faster snippet search 2016-02-05 18:20:29 +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
Rémy Coutable f6d816f9fe Add a controller test for the new 'diff_view' cookie 2016-02-05 15:40:44 +01:00
kkmandRémy Coutable cf1349adb7 Remember user's inline/tabular diff view preference in a cookie 2016-02-05 15:40:44 +01: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
James Lopez c3ed268ab3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-reference-notes-forks 2016-02-05 13:14:26 +01: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