summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Address feedback about wording.cs-issue-pr-templatesConnor Shea2016-06-092-4/+4
* Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md to point contributors towa...Connor Shea2016-06-092-0/+6
* Merge branch 'fix-git-http-routing' into 'master' Douwe Maan2016-06-092-18/+99
|\
| * Add test for getting info/refs from repoSean McGivern2016-06-091-0/+28
| * Ensure only IDs ending in .git perform git actionsfix-git-http-routingSean McGivern2016-06-092-18/+71
* | Merge branch 'saml-ldap-link-flow' into 'master' Douwe Maan2016-06-093-7/+32
|\ \
| * | Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flowPatricio Cano2016-06-082-6/+6
| * | Moved `find_or_create_ldap_user` method to parent class and added logging.Patricio Cano2016-06-073-31/+13
| * | Adjust the SAML control flow to allow LDAP identities to be added to an exist...Patricio Cano2016-06-063-3/+46
* | | Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' Yorick Peterse2016-06-0912-11/+12
|\ \ \
| * | | Remove require_relative 'import_spec_helper'make-omniauth-tests-to-not-modify-global-stateKamil Trzcinski2016-06-086-6/+0
| * | | Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-0/+0
| * | | Make Omniauth providers specs to not modify global configurationKamil Trzcinski2016-06-086-5/+12
* | | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-0914-121/+171
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add #18019 to the CHANGELOG.18019-fix-wiki-linkingTimothy Andrew2016-06-091-0/+1
| * | | Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-098-9/+15
| * | | Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-095-112/+155
* | | | Merge branch 'fix-award-emoji-hidden' into 'master' Jacob Schatz2016-06-091-1/+2
|\ \ \ \
| * | | | Shows award emoji for comments to all users who are logged in.Connor Shea2016-06-081-1/+2
* | | | | Merge branch 'mention-loading-indicator' into 'master' Jacob Schatz2016-06-081-5/+73
|\ \ \ \ \
| * | | | | Show loading indicator for autocompletemention-loading-indicatorPhil Hughes2016-05-251-5/+73
* | | | | | Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' Jacob Schatz2016-06-082-5/+9
|\ \ \ \ \ \
| * | | | | | Added a line to find the currently saved text and replace the markdown textar...Luke Bennett2016-06-072-5/+9
* | | | | | | Merge branch 'nav-scroll-bug' into 'master' Jacob Schatz2016-06-081-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Side nav scrolls if content height taller than screennav-scroll-bugAnnabel Dunstone2016-06-071-1/+8
* | | | | | | | Merge branch 'git-http-no-authenticity-token' into 'master' Robert Speicher2016-06-081-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Skip authenticity token checks for Git HTTPJacob Vosmaer2016-06-081-0/+2
* | | | | | | | Merge branch '17240-svg' into 'master' Jacob Schatz2016-06-0819-28/+230
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix activity SVG17240-svgAnnabel Dunstone2016-06-082-11/+7
| * | | | | | | | Fix merge conflicts from removing links from sidebarAnnabel Dunstone2016-06-082-22/+4
| * | | | | | | | Add new icons to group page layout navAnnabel Dunstone2016-06-089-23/+97
| * | | | | | | | Add SVG icons to side barAnnabel Dunstone2016-06-088-179/+60
| * | | | | | | | Start adding SVG iconsAnnabel Dunstone2016-06-0810-0/+269
* | | | | | | | | Merge branch '18333-layout-bug' into 'master' Jacob Schatz2016-06-083-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use container helper instead of hard coded containerAnnabel Dunstone2016-06-083-3/+3
* | | | | | | | | | Merge branch 'dropdown-link-lineheight' into 'master' Jacob Schatz2016-06-081-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed dropdown line-heightdropdown-link-lineheightPhil Hughes2016-06-081-0/+1
* | | | | | | | | | | Merge branch 'dz-improve-ui-consistency' into 'master' Jacob Schatz2016-06-0819-39/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unnecessary icons from buttonsdz-improve-ui-consistencyDmitriy Zaporozhets2016-06-089-13/+5
| * | | | | | | | | | | Cleanup and imrpove issue/mr buttonsDmitriy Zaporozhets2016-06-088-20/+27
| * | | | | | | | | | | Reject idea of using white/gray button depends on bg colorDmitriy Zaporozhets2016-06-081-1/+1
| * | | | | | | | | | | Improve button color for issue and mr pagesDmitriy Zaporozhets2016-06-083-8/+8
| * | | | | | | | | | | Use hex value instead of rgba for gray border colorDmitriy Zaporozhets2016-06-081-1/+1
* | | | | | | | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher2016-06-0811-4/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow custom text on 'almost there' pageSean McGivern2016-06-0811-4/+39
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into ...Robert Speicher2016-06-082-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow clones from /namespace/projectSean McGivern2016-06-082-0/+18
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'password-min-length-placeholder' into 'master' Robert Speicher2016-06-082-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added minimum password length to password fieldpassword-min-length-placeholderPhil Hughes2016-06-032-1/+2
* | | | | | | | | | | | | Merge branch 'issue_14553' into 'master' Robert Speicher2016-06-084-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
View Lorry Controller Status