summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-153-24/+3
* Fix wrong partial path in JS viewRémy Coutable2016-06-152-2/+2
* Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-153-0/+21
|\
| * Added test to dropdown searchPhil Hughes2016-06-151-0/+16
| * Fixed issue with move dropdown not being searchableproject-move-dropdown-searchPhil Hughes2016-06-152-0/+5
* | Merge branch '17333-u2f-only-after-authenticator' into 'master' Douwe Maan2016-06-154-43/+40
|\ \
| * | Fix teaspoon spec.17333-u2f-only-after-authenticatorTimothy Andrew2016-06-151-1/+2
| * | Update `u2f_spec` to cover U2F being disabled until authenticator is set up.Timothy Andrew2016-06-151-34/+23
| * | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha...Timothy Andrew2016-06-152-8/+15
* | | Merge branch '18451-track-new-redis-connections' into 'master' Douwe Maan2016-06-153-1/+18
|\ \ \
| * | | Fix spec description typo18451-track-new-redis-connectionsSean McGivern2016-06-141-1/+1
| * | | Track new Redis connectionsSean McGivern2016-06-142-0/+17
* | | | Merge branch 'doc/issue-move-assigns-labels-and-milestone' into 'master' Achilleas Pipinellis2016-06-151-0/+3
|\ \ \ \
| * | | | Add docs for assigning labels/milestone when moving issueGrzegorz Bizon2016-06-151-0/+3
* | | | | Merge branch 'ci-build-token' into 'master' Achilleas Pipinellis2016-06-151-0/+2
|\ \ \ \ \
| * | | | | Document CI_BUILD_TOKENci-build-tokenMark Pundsack2016-06-141-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '14320-note-grouped_awards' into 'master' Yorick Peterse2016-06-152-2/+7
|\ \ \ \ \
| * | | | | Include user relationship when retrieving award_emoji14320-note-grouped_awardsPaco Guzman2016-06-152-2/+7
| |/ / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-15126-754/+2385
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'dont-drop-stuck-builds' into 'master' Stan Hu2016-06-153-4/+18
| |\ \ \ \
| | * | | | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-buildsKamil Trzcinski2016-06-123-4/+18
| * | | | | Merge branch 'fix-sidekiq-troubleshooting' into 'master' Stan Hu2016-06-141-1/+2
| |\ \ \ \ \
| | * | | | | Fix typo in obtaining a backtrace from all threads in gdbStan Hu2016-06-121-1/+2
| * | | | | | Merge branch 'rs-fix-note-polling' into 'master' Jacob Schatz2016-06-142-2/+6
| |\ \ \ \ \ \
| | * | | | | | Fix note polling when a window has been hiddenrs-fix-note-pollingRobert Speicher2016-06-132-2/+6
| * | | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-1414-14/+169
| |\ \ \ \ \ \ \
| | * | | | | | | CHANGELOGmanual-todos-issuable-sidebarPhil Hughes2016-06-141-1/+1
| | * | | | | | | Todo service testsPhil Hughes2016-06-141-0/+16
| | * | | | | | | Returns created todos to control rather than re-queryPhil Hughes2016-06-143-4/+4
| | * | | | | | | Updated TODO descriptionPhil Hughes2016-06-141-1/+1
| | * | | | | | | Uses update URL to update the status of a todoPhil Hughes2016-06-144-41/+51
| | * | | | | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-147-41/+33
| | * | | | | | | Cached jQuery selectorsPhil Hughes2016-06-142-19/+19
| | * | | | | | | Fixed bug with sidebar when user is not logged inPhil Hughes2016-06-142-11/+15
| | * | | | | | | Todo tests and CHANGELOGPhil Hughes2016-06-142-0/+34
| | * | | | | | | Fixed issue with todo button not updating statePhil Hughes2016-06-142-5/+5
| | * | | | | | | Fixed issue with sidebar button stylingPhil Hughes2016-06-141-1/+1
| | * | | | | | | todo title text update for manual todosPhil Hughes2016-06-141-0/+1
| | * | | | | | | Manually create todo for issuablePhil Hughes2016-06-1411-13/+111
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'changelog-updates' into 'master' Jacob Schatz2016-06-141-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Update CHANGELOGAnnabel Dunstone2016-06-141-0/+5
| |/ / / / / / /
| * | | | | | | Merge branch 'fix-bulk-assign-labels-init' into 'master' Jacob Schatz2016-06-144-73/+30
| |\ \ \ \ \ \ \
| | * | | | | | | Update tests to make it work with Turbolinks approachfix-bulk-assign-labels-initAlfredo Sumaran2016-06-142-20/+23
| | * | | | | | | Use Turbolink instead of ajaxAlfredo Sumaran2016-06-141-51/+1
| | * | | | | | | Reinitialize checkboxes to toggle event bindingsAlfredo Sumaran2016-06-142-2/+6
| | * | | | | | | Turn off handlers before binding eventsAlfredo Sumaran2016-06-141-2/+2
| |/ / / / / / /
| * | | | | | | Merge branch 'nav-horizontal-alignment' into 'master' Jacob Schatz2016-06-142-19/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Removed console.logPhil Hughes2016-06-141-8/+3
| | * | | | | | | Hides the fade right unless requirednav-horizontal-alignmentPhil Hughes2016-06-132-14/+31
| | * | | | | | | Aligned the two navs horizontallyPhil Hughes2016-06-131-5/+3
View Lorry Controller Status