summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | 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 branch 'artifacts-expire-date' into 'master' Rémy Coutable2016-06-1427-265/+712
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix Ci::Build#artifacts_expire_in= when assigning invalid durationartifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1425-122/+824
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1447-214/+372
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Fix specsKamil Trzcinski2016-06-144-24/+28
| * | | | | | Fix keep action of build artifacts widgetKamil Trzcinski2016-06-131-1/+1
| * | | | | | Update db/schema.rbKamil Trzcinski2016-06-131-6/+6
| * | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-134-5/+32
| |\ \ \ \ \ \
| * | | | | | | Improve ExpireBuildArtifactsWorker specKamil Trzcinski2016-06-131-9/+4
| * | | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1326-178/+621
| |\ \ \ \ \ \ \
| * | | | | | | | Improve testsKamil Trzcinski2016-06-133-18/+12
| * | | | | | | | Fixed spacing with row below in build sidebarPhil Hughes2016-06-131-1/+1
| * | | | | | | | Added documentation to artifacts expireKamil Trzcinski2016-06-132-1/+36
| * | | | | | | | Improve design based on reviewKamil Trzcinski2016-06-139-292/+296
| * | | | | | | | Added missing span element around timePhil Hughes2016-06-131-3/+3
| * | | | | | | | Improve after reviewKamil Trzcinski2016-06-133-4/+5
| * | | | | | | | Displays time remaining relative to nowPhil Hughes2016-06-132-2/+9
View Lorry Controller Status