Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes | Fatih Acet | 2016-06-09 | 33 | -151/+309 |
|\ | |||||
| * | Merge branch 'saml-ldap-link-flow' into 'master' | Douwe Maan | 2016-06-09 | 3 | -7/+32 |
| |\ | |||||
| | * | Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flow | Patricio Cano | 2016-06-08 | 2 | -6/+6 |
| | * | Moved `find_or_create_ldap_user` method to parent class and added logging. | Patricio Cano | 2016-06-07 | 3 | -31/+13 |
| | * | Adjust the SAML control flow to allow LDAP identities to be added to an exist... | Patricio Cano | 2016-06-06 | 3 | -3/+46 |
| * | | Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' | Yorick Peterse | 2016-06-09 | 12 | -11/+12 |
| |\ \ | |||||
| | * | | Remove require_relative 'import_spec_helper'make-omniauth-tests-to-not-modify-global-state | Kamil Trzcinski | 2016-06-08 | 6 | -6/+0 |
| | * | | Move ImportSpecHelper to spec/support/ | Kamil Trzcinski | 2016-06-08 | 1 | -0/+0 |
| | * | | Make Omniauth providers specs to not modify global configuration | Kamil Trzcinski | 2016-06-08 | 6 | -5/+12 |
| * | | | Merge branch '18019-fix-wiki-linking' into 'master' | Rémy Coutable | 2016-06-09 | 14 | -121/+171 |
| |\ \ \ | |||||
| | * | | | Add #18019 to the CHANGELOG.18019-fix-wiki-linking | Timothy Andrew | 2016-06-09 | 1 | -0/+1 |
| | * | | | Hook up the updated `WikiLinkFilter` to the wiki controllers. | Timothy Andrew | 2016-06-09 | 8 | -9/+15 |
| | * | | | Implement the correct linking behaviour in `WikiLinkFilter`. | Timothy Andrew | 2016-06-09 | 5 | -112/+155 |
| * | | | | Merge branch 'fix-award-emoji-hidden' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | Shows award emoji for comments to all users who are logged in. | Connor Shea | 2016-06-08 | 1 | -1/+2 |
| * | | | | | Merge branch 'mention-loading-indicator' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -5/+73 |
| |\ \ \ \ \ | |||||
| | * | | | | | Show loading indicator for autocompletemention-loading-indicator | Phil Hughes | 2016-05-25 | 1 | -5/+73 |
| * | | | | | | Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' | Jacob Schatz | 2016-06-08 | 2 | -5/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added a line to find the currently saved text and replace the markdown textar... | Luke Bennett | 2016-06-07 | 2 | -5/+9 |
| * | | | | | | | Merge branch 'nav-scroll-bug' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Side nav scrolls if content height taller than screennav-scroll-bug | Annabel Dunstone | 2016-06-07 | 1 | -1/+8 |
| * | | | | | | | | Merge branch 'git-http-no-authenticity-token' into 'master' | Robert Speicher | 2016-06-08 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Skip authenticity token checks for Git HTTP | Jacob Vosmaer | 2016-06-08 | 1 | -0/+2 |
* | | | | | | | | | Move award_menu_url variable into gon object. | Fatih Acet | 2016-06-09 | 4 | -11/+8 |
* | | | | | | | | | Render frequent emoji block once. | Fatih Acet | 2016-06-09 | 1 | -1/+3 |
* | | | | | | | | | Instantiate awardsHandler in application main script. | Fatih Acet | 2016-06-09 | 2 | -2/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '17240-svg' into 'master' | Jacob Schatz | 2016-06-08 | 19 | -28/+230 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix activity SVG17240-svg | Annabel Dunstone | 2016-06-08 | 2 | -11/+7 |
| * | | | | | | | | Fix merge conflicts from removing links from sidebar | Annabel Dunstone | 2016-06-08 | 2 | -22/+4 |
| * | | | | | | | | Add new icons to group page layout nav | Annabel Dunstone | 2016-06-08 | 9 | -23/+97 |
| * | | | | | | | | Add SVG icons to side bar | Annabel Dunstone | 2016-06-08 | 8 | -179/+60 |
| * | | | | | | | | Start adding SVG icons | Annabel Dunstone | 2016-06-08 | 10 | -0/+269 |
* | | | | | | | | | Merge branch '18333-layout-bug' into 'master' | Jacob Schatz | 2016-06-08 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use container helper instead of hard coded container | Annabel Dunstone | 2016-06-08 | 3 | -3/+3 |
* | | | | | | | | | | Merge branch 'dropdown-link-lineheight' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed dropdown line-heightdropdown-link-lineheight | Phil Hughes | 2016-06-08 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'dz-improve-ui-consistency' into 'master' | Jacob Schatz | 2016-06-08 | 19 | -39/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove unnecessary icons from buttonsdz-improve-ui-consistency | Dmitriy Zaporozhets | 2016-06-08 | 9 | -13/+5 |
| * | | | | | | | | | | | Cleanup and imrpove issue/mr buttons | Dmitriy Zaporozhets | 2016-06-08 | 8 | -20/+27 |
| * | | | | | | | | | | | Reject idea of using white/gray button depends on bg color | Dmitriy Zaporozhets | 2016-06-08 | 1 | -1/+1 |
| * | | | | | | | | | | | Improve button color for issue and mr pages | Dmitriy Zaporozhets | 2016-06-08 | 3 | -8/+8 |
| * | | | | | | | | | | | Use hex value instead of rgba for gray border color | Dmitriy Zaporozhets | 2016-06-08 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' | Robert Speicher | 2016-06-08 | 11 | -4/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Allow custom text on 'almost there' page | Sean McGivern | 2016-06-08 | 11 | -4/+39 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into ... | Robert Speicher | 2016-06-08 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Allow clones from /namespace/project | Sean McGivern | 2016-06-08 | 2 | -0/+18 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'password-min-length-placeholder' into 'master' | Robert Speicher | 2016-06-08 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Added minimum password length to password fieldpassword-min-length-placeholder | Phil Hughes | 2016-06-03 | 2 | -1/+2 |
* | | | | | | | | | | | | | Merge branch 'issue_14553' into 'master' | Robert Speicher | 2016-06-08 | 4 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-06-08 | 1 | -0/+1 |