summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix project star tooltip on the fly.Fatih Acet2016-06-152-0/+14
* Fix project star tooltip in to show actual message.Fatih Acet2016-06-151-1/+1
* Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-152-0/+5
|\
| * 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-152-8/+15
|\ \
| * | Don't allow clicking on "Setup New U2F Device" unless an authenticator app ha...Timothy Andrew2016-06-152-8/+15
* | | Merge branch '14320-note-grouped_awards' into 'master' Yorick Peterse2016-06-151-2/+6
|\ \ \
| * | | Include user relationship when retrieving award_emoji14320-note-grouped_awardsPaco Guzman2016-06-151-2/+6
| | |/ | |/|
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-1591-601/+831
|\ \ \ | |/ /
| * | Merge branch 'dont-drop-stuck-builds' into 'master' Stan Hu2016-06-151-1/+1
| |\ \
| | * | Don't fail builds for projects that are deleted when they are stuckdont-drop-stuck-buildsKamil Trzcinski2016-06-121-1/+1
| * | | Merge branch 'rs-fix-note-polling' into 'master' Jacob Schatz2016-06-141-2/+4
| |\ \ \
| | * | | Fix note polling when a window has been hiddenrs-fix-note-pollingRobert Speicher2016-06-131-2/+4
| * | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-1410-14/+117
| |\ \ \ \
| | * | | | 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-143-40/+50
| | * | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-146-39/+31
| | * | | | Cached jQuery selectorsPhil Hughes2016-06-142-19/+19
| | * | | | Fixed bug with sidebar when user is not logged inPhil Hughes2016-06-142-11/+15
| | * | | | 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-1410-13/+109
| | | |_|/ | | |/| |
| * | | | 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
| * | | | | Merge branch '18539-nav-alignment' into 'master' Jacob Schatz2016-06-142-10/+26
| |\ \ \ \ \
| | * | | | | Put all sidebar icons in fixed width containerAnnabel Dunstone2016-06-142-10/+26
| * | | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-148-58/+124
| |\ \ \ \ \ \
| * | | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-1453-501/+381
| * | | | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-1434-222/+176
| * | | | | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-142-3/+3
| * | | | | | | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-143-31/+66
| * | | | | | | Add request access for groupsRémy Coutable2016-06-1454-469/+519
| * | | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-1416-14/+240
| | |/ / / / / | |/| | | | |
* | | | | | | Fix notes on confidential issues through JSON to users without accessDouglas Barbosa Alexandre2016-06-141-1/+1
* | | | | | | Merge branch '17298-wiki-xss' into 'master' Robert Speicher2016-06-141-0/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Forbid scripting for wiki filesSean McGivern2016-06-141-0/+3
| |/ / / / /
* | | | | | Merge branch 'settings-dropdown-permissions' into 'master' Dmitriy Zaporozhets2016-06-142-49/+50
|\ \ \ \ \ \
| * | | | | | Pass can_edit and access to partial.Connor Shea2016-06-132-3/+1
| * | | | | | Fix a bug that allowed Guests to still see Settings links they couldn't access.Connor Shea2016-06-101-1/+2
| * | | | | | Fix displaying of project settings links the user cannot access.Connor Shea2016-06-102-48/+50
* | | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1415-93/+108
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'confidential-issues-in-private-projects' into 'master' Douwe Maan2016-06-147-31/+40
| |\ \ \ \ \ \
| | * | | | | | Use Issue.visible_to_user in Notes.search to avoid query duplicationDouglas Barbosa Alexandre2016-06-133-30/+14