summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-0916-119/+255
|\
| * Merge branch 'toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-093-4/+38
| |\
| | * Update CHANGELOGDouglas Barbosa Alexandre2016-06-091-0/+1
| | * Toggling a task in a description with mentions doesn't creates a TodoDouglas Barbosa Alexandre2016-06-092-4/+37
| * | Merge branch 'button-focus-state' into 'master' Jacob Schatz2016-06-091-0/+4
| |\ \
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-stateFatih Acet2016-06-06245-1404/+4955
| | |\ \
| | * | | Blur button tags when clicked. Fixes #17748.Fatih Acet2016-06-011-0/+4
| * | | | Merge branch 'labels-ui-fix' into 'master' Jacob Schatz2016-06-097-83/+107
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixed failing label subscribe testlabels-ui-fixPhil Hughes2016-06-091-1/+1
| | * | | Tests updatePhil Hughes2016-06-091-1/+1
| | * | | Updated subscribe iconPhil Hughes2016-06-093-4/+27
| | * | | Fixed failing testsPhil Hughes2016-06-093-3/+3
| | * | | Updated labels UIPhil Hughes2016-06-094-78/+79
| * | | | Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' int...Jacob Schatz2016-06-093-12/+4
| |\ \ \ \
| | * | | | Fixes issue search form hiding when current_user is nil (guest user)Luke Bennett2016-06-073-12/+4
| * | | | | Merge branch 'rs-fix-ldap-2fa-login' into 'master' Robert Speicher2016-06-091-1/+2
| |\ \ \ \ \
| | * | | | | Fix 2FA-based login for LDAP usersrs-fix-ldap-2fa-loginRobert Speicher2016-06-071-1/+2
| * | | | | | Merge branch 'fix-changelog' into 'master' Jacob Schatz2016-06-091-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Update CHANGELOGAlfredo Sumaran2016-06-091-1/+1
| |/ / / / /
| * | | | | 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 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0954-182/+542
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
View Lorry Controller Status