summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 'wiki-bottom-padding' into 'master' Jacob Schatz2016-06-061-1/+1
|\
| * Add padding to bottom of wiki page, fix #12921.Connor Shea2016-06-061-1/+1
* | Merge branch 'issue_3359' into 'master' Yorick Peterse2016-06-065-6/+30
|\ \
| * | change add_concurrent_index function argumentsissue_3359Felipe Artur2016-06-062-10/+13
| * | Add index to notification settingsFelipe Artur2016-06-034-1/+22
* | | Merge branch 'activity-links' into 'master' Jacob Schatz2016-06-061-3/+7
|\ \ \
| * | | Fixed issue with activity links not being consistentactivity-linksPhil Hughes2016-06-021-3/+7
* | | | Merge branch 'edit-mobile' into 'master' Jacob Schatz2016-06-063-9/+26
|\ \ \ \
| * | | | Shows the edit comment button on mobileedit-mobilePhil Hughes2016-06-023-9/+26
| |/ / /
* | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto...Jacob Schatz2016-06-067-70/+1
|\ \ \ \
| * | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-067-70/+1
* | | | | Merge branch 'confidential-issue-notice' into 'master' Jacob Schatz2016-06-063-0/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix error on non-issue pages with comment areas.Connor Shea2016-06-051-1/+1
| * | | | Add Changelog entry.Connor Shea2016-06-031-0/+1
| * | | | Add confidential issue notice in comment box.Connor Shea2016-06-032-0/+39
* | | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-0622-136/+1501
|\ \ \ \ \
| * | | | | Updated MR notes.notes-are-awardablesFatih Acet2016-06-066-22/+21
| * | | | | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| * | | | | Fix scss-lint.Fatih Acet2016-06-061-1/+1
| * | | | | Added tests for award emoji feature.Fatih Acet2016-06-068-24/+1235
| * | | | | Create and show emoji loader on the fly.Fatih Acet2016-06-062-6/+21
| * | | | | Some design related tweaks.Fatih Acet2016-06-066-7/+24
| * | | | | Be consistent on naming.Fatih Acet2016-06-061-22/+22
| * | | | | Animate emoji when rendered.Fatih Acet2016-06-061-1/+12
| * | | | | Fix mutual exclusivity for emoji only comments.Fatih Acet2016-06-061-1/+4
| * | | | | Refactor awardsHandler methods to work with votesBlock.Fatih Acet2016-06-062-35/+36
| * | | | | Award emoji implementation for notes.Fatih Acet2016-06-063-65/+92
| * | | | | Show emoji menu in notes.Fatih Acet2016-06-063-3/+25
| * | | | | Backend awardables on commentsZJ van de Weg2016-06-066-2/+61
* | | | | | Merge branch 'tests/extend-specs-for-build-badge' into 'master' Rémy Coutable2016-06-061-3/+23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Extend specs for builds badgetests/extend-specs-for-build-badgeGrzegorz Bizon2016-06-031-3/+23
| | |_|/ / | |/| | |
* | | | | Merge branch 'jquery2' into 'master' Jacob Schatz2016-06-068-18/+274
|\ \ \ \ \
| * | | | | Fixed JS errorsjquery2Phil Hughes2016-06-056-17/+15
| * | | | | Upgraded jQuery to version 2Phil Hughes2016-06-052-1/+259
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0649-146/+1889
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '15337-yubikey-support' into 'master' Rémy Coutable2016-06-0649-146/+1889
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Add the U2F feature to the CHANGELOG15337-yubikey-supportTimothy Andrew2016-06-061-0/+1
| | * | | | | Add documentation for U2F registration & authentication.Timothy Andrew2016-06-063-6/+57
| | * | | | | Add feature specs covering U2F registration and authentication.Timothy Andrew2016-06-062-0/+275
| | * | | | | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-062-3/+36
| | * | | | | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-068-43/+230
| | * | | | | Implement U2F registration.Timothy Andrew2016-06-0616-65/+1086
| | * | | | | Render `gon` data in the page `body`, not `head`Timothy Andrew2016-06-065-2/+5
| | * | | | | Update the `browser` gem.Timothy Andrew2016-06-063-5/+5
| | * | | | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-0613-22/+194
| |/ / / / /
* | | | | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' Douwe Maan2016-06-063-34/+138
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove 'unscoped' from project builds selectionTomasz Maczukin2016-06-043-34/+138
| | |_|/ / | |/| | |