summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlinkPatricio Cano2016-06-142-4/+3
* Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-143-4/+36
* 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
* | | | Merge branch 'update-allocations-gem-fix-names' into 'master' Rémy Coutable2016-06-144-9/+26
|\ \ \ \
| * | | | Added CHANGELOG entry for allocations Gem/name fixupdate-allocations-gem-fix-namesYorick Peterse2016-06-141-0/+2
| * | | | Filter out classes without names in the samplerYorick Peterse2016-06-142-8/+23
| * | | | Update the allocations Gem to 1.0.5Yorick Peterse2016-06-141-1/+1
* | | | | Merge branch 'revert-06e0ef07' into 'master' Douwe Maan2016-06-145-284/+0
|\ \ \ \ \
| * | | | | Revert "Added API endpoint for Sidekiq Metrics"revert-06e0ef07Patricio Cano2016-06-145-284/+0
|/ / / / /
* | | | | Added API endpoint for Sidekiq MetricsPatricio Cano2016-06-145-0/+284
* | | | | 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 '13948-access-request-to-projects-and-groups' into 'master' Douwe Maan2016-06-1498-622/+2074
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-1462-651/+1850
| |\ \ \ \ \
| * | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-1474-839/+775
| * | | | | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-1435-299/+355
| * | | | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-144-19/+10
| * | | | | | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-146-37/+77
| * | | | | | Add request access for groupsRémy Coutable2016-06-1476-572/+1767
| * | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-1419-14/+248
* | | | | | | Merge branch '18449-instrument-grape-endpoints' into 'master' Yorick Peterse2016-06-142-1/+53
|\ \ \ \ \ \ \
| * | | | | | | Instrument Grape Endpoint with Metrics::RackMiddleware18449-instrument-grape-endpointsPaco Guzman2016-06-142-1/+53
| |/ / / / / /
* | | | | | | Merge branch '18527-instrument-private-methods' into 'master' Yorick Peterse2016-06-145-13/+63
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Instrument private/protected methodsPaco Guzman2016-06-145-13/+63