summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'coffeescript_syntax_error' into 'master' revert-9cc321caJacob Schatz2016-02-261-3/+3
|\
| * Fix syntax error in autosave coffeescript.coffeescript_syntax_errorMarin Jankovski2016-02-261-3/+3
|/
* Merge branch 'rs-crowd-form-view-spec' into 'master' Rémy Coutable2016-02-265-38/+43
|\
| * Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-specRobert Speicher2016-02-245-38/+43
* | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-02-261-1/+1
|\ \
| * | Reformats confusing '[named here]' section for 3rd party code attributionDavid Alexander2016-02-171-1/+1
* | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-02-261-0/+1
|\ \ \
| * | | Add instructions for pushing tags as well as branchesM. Ricketts2016-02-101-0/+1
* | | | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-254-3/+15
|\ \ \ \
| * | | | Does not create a todo when commenting on commit or project snippetDouglas Barbosa Alexandre2016-02-244-3/+15
* | | | | Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'Dmitriy Zaporozhets2016-02-256-3/+22
|\ \ \ \ \
| * | | | | Add a spec for coverage indicator in project's builds listBaertierchen/gitlab-ce-showTestCoverageRémy Coutable2016-02-225-2/+19
| * | | | | Show test coverage on project builds pageSteffen Köhler2016-02-221-1/+3
* | | | | | Merge branch 'fix-gemfile-lock' into 'master' Robert Speicher2016-02-251-1/+1
|\ \ \ \ \ \
| * | | | | | Fix order in Gemfile.lockfix-gemfile-lockJacob Vosmaer2016-02-251-1/+1
* | | | | | | Update CHANGELOGRobert Speicher2016-02-251-0/+3
|/ / / / / /
* | | | | | 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
View Lorry Controller Status