summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-092-2/+7
|
* Filter out variables from production logsKamil Trzcinski2016-02-091-1/+1
| | | | This prevents leakage of CI Secure Variables
* Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-061-2/+19
|\ | | | | | | | | | | | | 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
| * Fixed Window's commands for SSH Help.Aaron Power2016-02-061-2/+19
| |
* | Merge branch 'project-title-dropdown-toggle-button' into 'master' Jacob Schatz2016-02-053-4/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Project dropdown test span -> iPhil Hughes2016-02-051-1/+1
| | |
| * | Uses icon helper for dropdown toggle iconPhil Hughes2016-02-051-1/+1
| | |
| * | Changed the project switcher dropdown togglePhil Hughes2016-02-053-4/+13
| | | | | | | | | | | | | | | | | | Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* | | Merge branch 'improve-diverging-commit-counts' into 'master' Robert Speicher2016-02-053-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Dedicated method for counting commits between refsimprove-diverging-commit-countsYorick Peterse2016-02-043-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'feature/jschatz1/sidebar-features' into 'master' Dmitriy Zaporozhets2016-02-053-4/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Changes sidebar widthfeature/jschatz1/sidebar-featuresJacob Schatz2016-02-051-2/+2
| | | | |
| * | | | Add `j` and `k` shortcutsJacob Schatz2016-02-052-2/+21
| | |/ / | |/| |
* | | | Merge branch 'bug/jschatz1/sidebar-issues' into 'master' Dmitriy Zaporozhets2016-02-051-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff and commit view on merge requests with new sidebar Fixes #3981 See merge request !2718
| * | | | Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issuesJacob Schatz2016-02-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | with new sidebar Fixes #3981
* | | | | Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'Robert Speicher2016-02-055-3/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for issue with poor logo transition animation on Safari See merge request !2690
| * | | | | fixed issue with poor logo transition animation on safariRoman Rott2016-02-055-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'capitalize-placeholder' into 'master' Jacob Schatz2016-02-051-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve placeholder: search -> Search Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2732
| * | | | | Improve placeholder: search -> SearchDmitriy Zaporozhets2016-02-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Add JS style changes.feature/jschatz1/issuable-date-positioningJacob Schatz2016-02-051-2/+4
| | | | | | | | | | | | | | | | | | | | Thanks @rspeicher
* | | | | Edited time ago location change.Jacob Schatz2016-02-055-50/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change edited icon to word. Change edited text color to gray cc/ @creamzy
* | | | | Merge branch 'missing_uploads_dir' into 'master' Achilleas Pipinellis2016-02-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the public/uploads/ directory is created See merge request !2730
| * | | | | Make sure the public/uploads/ directory is createdAchilleas Pipinellis2016-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-053-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Fix double pagingJosh Frye2016-02-053-3/+1
| | | | | | |
* | | | | | | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-052-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'ruby_sha' into 'master' Achilleas Pipinellis2016-02-052-1/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add ruby version update info in doc_styleguideAchilleas Pipinellis2016-02-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Fix wrong Ruby SHA and replace with sha256sumAchilleas Pipinellis2016-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'paginate-dashboard-projects' into 'master' Dmitriy Zaporozhets2016-02-0515-33/+91
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Page project list on dashboard See merge request !2689
| * | | | | | Frontend changes from MR feedbackpaginate-dashboard-projectsJosh Frye2016-02-051-3/+4
| | | | | | |
| * | | | | | Fix project filter form renderingDmitriy Zaporozhets2016-02-052-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Implement changes from MR feedbackJosh Frye2016-02-045-16/+16
| | | | | | |
| * | | | | | Remove js lineJosh Frye2016-02-041-1/+0
| | | | | | |
| * | | | | | Various filter fixesJosh Frye2016-02-0418-62/+90
| | | | | | |
| * | | | | | Delay filter until user stops typingJosh Frye2016-02-046-26/+33
| | | | | | |
| * | | | | | Paginate + ajax filter dashboard projectsJosh Frye2016-02-0410-46/+67
| | | | | | |
| * | | | | | Page project list on dashboardJosh Frye2016-02-041-0/+2
| | | | | | |
* | | | | | | Merge branch 'improve-nav-controls' into 'master' Dmitriy Zaporozhets2016-02-0513-107/+94
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Remove project-issuable-filter from admin builds page :)improve-nav-controlsDmitriy Zaporozhets2016-02-053-27/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Re-use top-are css component for issues/mr pagesDmitriy Zaporozhets2016-02-059-80/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add support for inline form in nav-controls componentDmitriy Zaporozhets2016-02-051-0/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'doc_refactor_session_api' into 'master' Achilleas Pipinellis2016-02-051-17/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor session API documentation See merge request !2473
| * | | | | | | Refactor session API documentation [ci skip]doc_refactor_session_apiAchilleas Pipinellis2016-01-181-17/+25
| | | | | | | |
* | | | | | | | Merge branch 'doc_refactor_deploy_key_multiple_projects_api' into 'master' Achilleas Pipinellis2016-02-051-7/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor deploy_key_multiple_projects API documentation See merge request !2468
| * | | | | | | Refactor deploy_key_multiple_projects API documentation [ci skip]doc_refactor_deploy_key_multiple_projects_apiAchilleas Pipinellis2016-01-181-7/+11
| |/ / / / / /
* | | | | | | Merge branch 'list-padding' into 'master' Dmitriy Zaporozhets2016-02-0510-26/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | New padding for listslist-paddingDmitriy Zaporozhets2016-02-0410-26/+15
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master' Rémy Coutable2016-02-055-24/+29
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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