Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Turn Group#owners into a has_many associationgroup-owners-association | Yorick Peterse | 2016-06-15 | 2 | -4/+18 |
* | Merge branch 'seed-fu-award-emoji' into 'master' | Douwe Maan | 2016-06-15 | 2 | -0/+37 |
|\ | |||||
| * | Random selection now also works for MySQLseed-fu-award-emoji | Z.J. van de Weg | 2016-06-15 | 2 | -3/+7 |
| * | Near half of the Issues get Award Emoji when seeding | Z.J. van de Weg | 2016-06-15 | 1 | -4/+4 |
| * | Skip system notes from receiving award emoji | Z.J. van de Weg | 2016-06-15 | 1 | -4/+10 |
| * | Seed Award Emoji while seeding the database | Z.J. van de Weg | 2016-06-15 | 1 | -0/+27 |
* | | Merge branch 'fix-header-logo-link' into 'master' | Jacob Schatz | 2016-06-15 | 2 | -7/+1 |
|\ \ | |||||
| * | | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-link | Connor Shea | 2016-06-14 | 2 | -7/+1 |
* | | | Merge branch 'project-move-dropdown-search' into 'master' | Jacob Schatz | 2016-06-15 | 3 | -0/+21 |
|\ \ \ | |||||
| * | | | Added test to dropdown search | Phil Hughes | 2016-06-15 | 1 | -0/+16 |
| * | | | Fixed issue with move dropdown not being searchableproject-move-dropdown-search | Phil Hughes | 2016-06-15 | 2 | -0/+5 |
* | | | | Merge branch '17333-u2f-only-after-authenticator' into 'master' | Douwe Maan | 2016-06-15 | 4 | -43/+40 |
|\ \ \ \ | |||||
| * | | | | Fix teaspoon spec.17333-u2f-only-after-authenticator | Timothy Andrew | 2016-06-15 | 1 | -1/+2 |
| * | | | | Update `u2f_spec` to cover U2F being disabled until authenticator is set up. | Timothy Andrew | 2016-06-15 | 1 | -34/+23 |
| * | | | | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha... | Timothy Andrew | 2016-06-15 | 2 | -8/+15 |
* | | | | | Merge branch '18451-track-new-redis-connections' into 'master' | Douwe Maan | 2016-06-15 | 3 | -1/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Fix spec description typo18451-track-new-redis-connections | Sean McGivern | 2016-06-14 | 1 | -1/+1 |
| * | | | | | Track new Redis connections | Sean McGivern | 2016-06-14 | 2 | -0/+17 |
* | | | | | | Merge branch 'doc/issue-move-assigns-labels-and-milestone' into 'master' | Achilleas Pipinellis | 2016-06-15 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add docs for assigning labels/milestone when moving issue | Grzegorz Bizon | 2016-06-15 | 1 | -0/+3 |
* | | | | | | | Merge branch 'ci-build-token' into 'master' | Achilleas Pipinellis | 2016-06-15 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Document CI_BUILD_TOKENci-build-token | Mark Pundsack | 2016-06-14 | 1 | -0/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '14320-note-grouped_awards' into 'master' | Yorick Peterse | 2016-06-15 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Include user relationship when retrieving award_emoji14320-note-grouped_awards | Paco Guzman | 2016-06-15 | 2 | -2/+7 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-06-15 | 126 | -754/+2385 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'dont-drop-stuck-builds' into 'master' | Stan Hu | 2016-06-15 | 3 | -4/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-builds | Kamil Trzcinski | 2016-06-12 | 3 | -4/+18 |
| * | | | | | | Merge branch 'fix-sidekiq-troubleshooting' into 'master' | Stan Hu | 2016-06-14 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix typo in obtaining a backtrace from all threads in gdb | Stan Hu | 2016-06-12 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'rs-fix-note-polling' into 'master' | Jacob Schatz | 2016-06-14 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix note polling when a window has been hiddenrs-fix-note-polling | Robert Speicher | 2016-06-13 | 2 | -2/+6 |
| * | | | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' | Stan Hu | 2016-06-14 | 14 | -14/+169 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | CHANGELOGmanual-todos-issuable-sidebar | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| | * | | | | | | | | Todo service tests | Phil Hughes | 2016-06-14 | 1 | -0/+16 |
| | * | | | | | | | | Returns created todos to control rather than re-query | Phil Hughes | 2016-06-14 | 3 | -4/+4 |
| | * | | | | | | | | Updated TODO description | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| | * | | | | | | | | Uses update URL to update the status of a todo | Phil Hughes | 2016-06-14 | 4 | -41/+51 |
| | * | | | | | | | | Moved todo creation over to project todos controller | Phil Hughes | 2016-06-14 | 7 | -41/+33 |
| | * | | | | | | | | Cached jQuery selectors | Phil Hughes | 2016-06-14 | 2 | -19/+19 |
| | * | | | | | | | | Fixed bug with sidebar when user is not logged in | Phil Hughes | 2016-06-14 | 2 | -11/+15 |
| | * | | | | | | | | Todo tests and CHANGELOG | Phil Hughes | 2016-06-14 | 2 | -0/+34 |
| | * | | | | | | | | Fixed issue with todo button not updating state | Phil Hughes | 2016-06-14 | 2 | -5/+5 |
| | * | | | | | | | | Fixed issue with sidebar button styling | Phil Hughes | 2016-06-14 | 1 | -1/+1 |
| | * | | | | | | | | todo title text update for manual todos | Phil Hughes | 2016-06-14 | 1 | -0/+1 |
| | * | | | | | | | | Manually create todo for issuable | Phil Hughes | 2016-06-14 | 11 | -13/+111 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'changelog-updates' into 'master' | Jacob Schatz | 2016-06-14 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update CHANGELOG | Annabel Dunstone | 2016-06-14 | 1 | -0/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'fix-bulk-assign-labels-init' into 'master' | Jacob Schatz | 2016-06-14 | 4 | -73/+30 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update tests to make it work with Turbolinks approachfix-bulk-assign-labels-init | Alfredo Sumaran | 2016-06-14 | 2 | -20/+23 |
| | * | | | | | | | | Use Turbolink instead of ajax | Alfredo Sumaran | 2016-06-14 | 1 | -51/+1 |