Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge branch 'input-padding' into 'master' | Jacob Schatz | 2016-06-09 | 3 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Improve input padding, fix #18237. | Connor Shea | 2016-06-06 | 3 | -1/+3 | |
* | | | | | | | | | | | | | | | | Merge branch 'merge-conflicts-icon-color' into 'master' | Jacob Schatz | 2016-06-09 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-color | Fatih Acet | 2016-06-06 | 2 | -2/+7 | |
* | | | | | | | | | | | | | | | | Merge branch 'note-edit-background-color' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -11/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Edit form background color on highlighted notenote-edit-background-color | Phil Hughes | 2016-06-02 | 1 | -11/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'toggling-task-should-not-generate-todo' into 'master' | Robert Speicher | 2016-06-09 | 3 | -4/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-06-09 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | Toggling a task in a description with mentions doesn't creates a Todo | Douglas Barbosa Alexandre | 2016-06-09 | 2 | -4/+37 | |
* | | | | | | | | | | | | | | | | | Merge branch 'button-focus-state' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-state | Fatih Acet | 2016-06-06 | 245 | -1404/+4955 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Blur button tags when clicked. Fixes #17748. | Fatih Acet | 2016-06-01 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | Merge branch 'labels-ui-fix' into 'master' | Jacob Schatz | 2016-06-09 | 7 | -83/+107 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Fixed failing label subscribe testlabels-ui-fix | Phil Hughes | 2016-06-09 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Tests update | Phil Hughes | 2016-06-09 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Updated subscribe icon | Phil Hughes | 2016-06-09 | 3 | -4/+27 | |
| * | | | | | | | | | | | | | | | | Fixed failing tests | Phil Hughes | 2016-06-09 | 3 | -3/+3 | |
| * | | | | | | | | | | | | | | | | Updated labels UI | Phil Hughes | 2016-06-09 | 4 | -78/+79 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' int... | Jacob Schatz | 2016-06-09 | 3 | -12/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Fixes issue search form hiding when current_user is nil (guest user) | Luke Bennett | 2016-06-07 | 3 | -12/+4 | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs-fix-ldap-2fa-login' into 'master' | Robert Speicher | 2016-06-09 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fix 2FA-based login for LDAP usersrs-fix-ldap-2fa-login | Robert Speicher | 2016-06-07 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-changelog' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-06-09 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'fix-git-http-routing' into 'master' | Douwe Maan | 2016-06-09 | 2 | -18/+99 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Add test for getting info/refs from repo | Sean McGivern | 2016-06-09 | 1 | -0/+28 | |
| * | | | | | | | | | | | | | | | | Ensure only IDs ending in .git perform git actionsfix-git-http-routing | Sean McGivern | 2016-06-09 | 2 | -18/+71 | |
* | | | | | | | | | | | | | | | | | 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 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch '17240-svg' into 'master' | Jacob Schatz | 2016-06-08 | 19 | -28/+230 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |