summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Created helper class to hide content in issue sidebar when collapsedsidebar-hide-classPhil Hughes2016-02-253-26/+19
* Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-245-68/+32
|\
| * Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizingAlfredo Sumaran2016-02-232-0/+2
| * Fix failing specAlfredo Sumaran2016-02-231-1/+0
| * Set window_size to 1366*768Alfredo Sumaran2016-02-232-2/+2
| * Ability to toggle sidebar on smaller screensAlfredo Sumaran2016-02-233-20/+12
| * Fixes padding when right sidebar is not presentAlfredo Sumaran2016-02-231-0/+11
| * Update scrollbars after toggle sidebarAlfredo Sumaran2016-02-231-0/+6
| * Sidebar overlaps content when screen is below 1200px.Jacob Schatz2016-02-163-67/+22
* | Merge branch 'bugfix/jschatz/sidebar-issues/minimize-on-diff' into 'master' Jacob Schatz2016-02-242-2/+14
|\ \
| * | Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diffAlfredo Sumaran2016-02-241-3/+7
| * | Remove unused methodsAlfredo Sumaran2016-02-241-16/+0
| * | Move script inside of MergeRequestTabs classAlfredo Sumaran2016-02-242-12/+10
| * | Merge branch 'master' into minimize-on-diffAlfredo Sumaran2016-02-24328-4090/+26555
| |\ \
| * | | Shrink on diff viewJacob Schatz2016-02-172-0/+26
* | | | Merge branch 'fix_git_tag_in_architecture' into 'master' Achilleas Pipinellis2016-02-241-1/+1
|\ \ \ \
| * | | | Fixed ~git beeing displayed as link to issues tagged with gitFinn Glöe2016-02-131-1/+1
* | | | | Merge branch 'commit-status-permission-update' into 'master' Achilleas Pipinellis2016-02-241-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update commit status permissions [ci skip]commit-status-permission-updateKamil Trzcinski2016-02-231-0/+2
* | | | | Merge branch 'feature/slack-notifications-on-ci' into 'master' James Lopez2016-02-242-0/+54
|\ \ \ \ \
| * | | | | updated gitlab ci based on feedbackJames Lopez2016-02-241-2/+2
| * | | | | fix gitlab-ci.ymlJames Lopez2016-02-221-3/+3
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-n...James Lopez2016-02-22227-3633/+25421
| |\ \ \ \ \
| * | | | | | resolve merge conflictJames Lopez2016-02-181-1/+9
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-n...James Lopez2016-02-18365-2260/+6005
| |\ \ \ \ \ \
| * | | | | | | default slack notification channelJames Lopez2016-02-081-1/+1
| * | | | | | | update with branch and tags restrictionJames Lopez2016-02-052-7/+6
| * | | | | | | typo to make build failJames Lopez2016-02-051-1/+1
| * | | | | | | removed slack task and added bash script instead. Updated gitlab-ci config fileJames Lopez2016-02-053-13/+20
| * | | | | | | uncomment restriction to branches or tagsJames Lopez2016-02-031-3/+3
| * | | | | | | refactored rake task and make build passJames Lopez2016-02-033-6/+5
| * | | | | | | testing build failureJames Lopez2016-02-031-1/+2
| * | | | | | | update gitlab ci configJames Lopez2016-02-031-1/+1
| * | | | | | | make build fail so we can test notifications...James Lopez2016-02-031-1/+1
| * | | | | | | update ci configuration to send slack notifications on failure and added rake...James Lopez2016-02-032-1/+41
* | | | | | | | Merge branch 'andywgrant/gitlab-ce-master' into 'master' Dmitriy Zaporozhets2016-02-242-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add "issue" to Close/Reopen buttons for clarityandywgrant/gitlab-ce-masterAndy Grant2016-02-222-6/+6
* | | | | | | | | Add 8.5.1 in CHANGELOGRémy Coutable2016-02-241-0/+17
* | | | | | | | | Merge branch 'user-bio-improve' into 'master' Jacob Schatz2016-02-243-18/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve the formatting for the user page bioconnorshea/gitlab-ce-user-bio-improveconnorshea2016-02-233-18/+30
* | | | | | | | | | Merge branch 'highlighted-note' into 'master' Jacob Schatz2016-02-247-9/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changed variable name to -hoverhighlighted-notePhil Hughes2016-02-237-8/+8
| * | | | | | | | | | Changed padding & background color for highlighted notesPhil Hughes2016-02-232-2/+2
* | | | | | | | | | | Merge branch 'gray-content-block-btn-alignment' into 'master' Jacob Schatz2016-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correctly aligned buttons vertical in gray-content-blockgray-content-block-btn-alignmentPhil Hughes2016-02-231-1/+1
* | | | | | | | | | | | Merge branch 'activity-tabs-single-select' into 'master' Jacob Schatz2016-02-242-16/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | changed bind to on for activity link click eventactivity-tabs-single-selectPhil Hughes2016-02-241-1/+1
| * | | | | | | | | | | | fixed testsPhil Hughes2016-02-241-3/+9
| * | | | | | | | | | | | Treats activity tabs as single selectPhil Hughes2016-02-241-13/+5
* | | | | | | | | | | | | Merge branch 'issue_13602' into 'master' Rémy Coutable2016-02-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \