Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 'wiki-bottom-padding' into 'master' | Jacob Schatz | 2016-06-06 | 1 | -1/+1 |
|\ | |||||
| * | Add padding to bottom of wiki page, fix #12921. | Connor Shea | 2016-06-06 | 1 | -1/+1 |
* | | Merge branch 'issue_3359' into 'master' | Yorick Peterse | 2016-06-06 | 5 | -6/+30 |
|\ \ | |||||
| * | | change add_concurrent_index function argumentsissue_3359 | Felipe Artur | 2016-06-06 | 2 | -10/+13 |
| * | | Add index to notification settings | Felipe Artur | 2016-06-03 | 4 | -1/+22 |
* | | | Merge branch 'activity-links' into 'master' | Jacob Schatz | 2016-06-06 | 1 | -3/+7 |
|\ \ \ | |||||
| * | | | Fixed issue with activity links not being consistentactivity-links | Phil Hughes | 2016-06-02 | 1 | -3/+7 |
* | | | | Merge branch 'edit-mobile' into 'master' | Jacob Schatz | 2016-06-06 | 3 | -9/+26 |
|\ \ \ \ | |||||
| * | | | | Shows the edit comment button on mobileedit-mobile | Phil Hughes | 2016-06-02 | 3 | -9/+26 |
| |/ / / | |||||
* | | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto... | Jacob Schatz | 2016-06-06 | 7 | -70/+1 |
|\ \ \ \ | |||||
| * | | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttons | Alejandro Rodríguez | 2016-06-06 | 7 | -70/+1 |
* | | | | | Merge branch 'confidential-issue-notice' into 'master' | Jacob Schatz | 2016-06-06 | 3 | -0/+40 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix error on non-issue pages with comment areas. | Connor Shea | 2016-06-05 | 1 | -1/+1 |
| * | | | | Add Changelog entry. | Connor Shea | 2016-06-03 | 1 | -0/+1 |
| * | | | | Add confidential issue notice in comment box. | Connor Shea | 2016-06-03 | 2 | -0/+39 |
* | | | | | Merge branch 'notes-are-awardables' into 'master' | Douwe Maan | 2016-06-06 | 22 | -136/+1501 |
|\ \ \ \ \ | |||||
| * | | | | | Updated MR notes.notes-are-awardables | Fatih Acet | 2016-06-06 | 6 | -22/+21 |
| * | | | | | Update tests on wording | Z.J. van de Weg | 2016-06-06 | 1 | -2/+2 |
| * | | | | | Fix scss-lint. | Fatih Acet | 2016-06-06 | 1 | -1/+1 |
| * | | | | | Added tests for award emoji feature. | Fatih Acet | 2016-06-06 | 8 | -24/+1235 |
| * | | | | | Create and show emoji loader on the fly. | Fatih Acet | 2016-06-06 | 2 | -6/+21 |
| * | | | | | Some design related tweaks. | Fatih Acet | 2016-06-06 | 6 | -7/+24 |
| * | | | | | Be consistent on naming. | Fatih Acet | 2016-06-06 | 1 | -22/+22 |
| * | | | | | Animate emoji when rendered. | Fatih Acet | 2016-06-06 | 1 | -1/+12 |
| * | | | | | Fix mutual exclusivity for emoji only comments. | Fatih Acet | 2016-06-06 | 1 | -1/+4 |
| * | | | | | Refactor awardsHandler methods to work with votesBlock. | Fatih Acet | 2016-06-06 | 2 | -35/+36 |
| * | | | | | Award emoji implementation for notes. | Fatih Acet | 2016-06-06 | 3 | -65/+92 |
| * | | | | | Show emoji menu in notes. | Fatih Acet | 2016-06-06 | 3 | -3/+25 |
| * | | | | | Backend awardables on comments | ZJ van de Weg | 2016-06-06 | 6 | -2/+61 |
* | | | | | | Merge branch 'tests/extend-specs-for-build-badge' into 'master' | Rémy Coutable | 2016-06-06 | 1 | -3/+23 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Extend specs for builds badgetests/extend-specs-for-build-badge | Grzegorz Bizon | 2016-06-03 | 1 | -3/+23 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jquery2' into 'master' | Jacob Schatz | 2016-06-06 | 8 | -18/+274 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed JS errorsjquery2 | Phil Hughes | 2016-06-05 | 6 | -17/+15 |
| * | | | | | Upgraded jQuery to version 2 | Phil Hughes | 2016-06-05 | 2 | -1/+259 |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-06-06 | 49 | -146/+1889 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '15337-yubikey-support' into 'master' | Rémy Coutable | 2016-06-06 | 49 | -146/+1889 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Add the U2F feature to the CHANGELOG15337-yubikey-support | Timothy Andrew | 2016-06-06 | 1 | -0/+1 |
| | * | | | | | Add documentation for U2F registration & authentication. | Timothy Andrew | 2016-06-06 | 3 | -6/+57 |
| | * | | | | | Add feature specs covering U2F registration and authentication. | Timothy Andrew | 2016-06-06 | 2 | -0/+275 |
| | * | | | | | Add a U2F-specific audit log entry after logging in. | Timothy Andrew | 2016-06-06 | 2 | -3/+36 |
| | * | | | | | Implement authentication (login) using a U2F device. | Timothy Andrew | 2016-06-06 | 8 | -43/+230 |
| | * | | | | | Implement U2F registration. | Timothy Andrew | 2016-06-06 | 16 | -65/+1086 |
| | * | | | | | Render `gon` data in the page `body`, not `head` | Timothy Andrew | 2016-06-06 | 5 | -2/+5 |
| | * | | | | | Update the `browser` gem. | Timothy Andrew | 2016-06-06 | 3 | -5/+5 |
| | * | | | | | Add a `U2fRegistrations` table/model. | Timothy Andrew | 2016-06-06 | 13 | -22/+194 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' | Douwe Maan | 2016-06-06 | 3 | -34/+138 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Remove 'unscoped' from project builds selection | Tomasz Maczukin | 2016-06-04 | 3 | -34/+138 |
| | |_|/ / | |/| | | |