summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-142-0/+49
|\
| * Todo service testsPhil Hughes2016-06-141-0/+16
| * Todo tests and CHANGELOGPhil Hughes2016-06-141-0/+33
* | Update tests to make it work with Turbolinks approachfix-bulk-assign-labels-initAlfredo Sumaran2016-06-142-20/+23
* | Filter out classes without names in the samplerYorick Peterse2016-06-141-7/+18
* | Merge branch '13948-access-request-to-projects-and-groups' into 'master' Douwe Maan2016-06-1417-93/+1390
|\ \
| * \ Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-1413-13/+541
| |\ \
| * | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-1417-317/+372
| * | | Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-141-77/+179
| * | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-2/+2
| * | | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-142-6/+6
| * | | Add request access for groupsRémy Coutable2016-06-1416-90/+1230
* | | | Merge branch '18449-instrument-grape-endpoints' into 'master' Yorick Peterse2016-06-141-0/+29
|\ \ \ \
| * | | | Instrument Grape Endpoint with Metrics::RackMiddleware18449-instrument-grape-endpointsPaco Guzman2016-06-141-0/+29
| |/ / /
* | | | Merge branch '18527-instrument-private-methods' into 'master' Yorick Peterse2016-06-141-2/+54
|\ \ \ \ | |_|/ / |/| | |
| * | | Instrument private/protected methodsPaco Guzman2016-06-141-2/+54
* | | | 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-147-10/+295
|\ \ \ \ | |/ / /
| * | | Merge branch '18528-cpu-time-instrumentation' into 'master' Yorick Peterse2016-06-141-2/+2
| |\ \ \
| | * | | Measure CPU time for instrumented methodsPaco Guzman2016-06-141-2/+2
| | |/ /
| * | | Merge branch 'refactor/ci-config-add-global-entry' into 'master' Rémy Coutable2016-06-146-8/+293
| |\ \ \ | | |/ / | |/| |
| | * | Make method that composes ci config entry privateGrzegorz Bizon2016-06-142-10/+1
| | * | Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-1320-67/+547
| | |\ \
| | * | | Simplify ci config node factoryGrzegorz Bizon2016-06-131-5/+5
| | * | | Duplicate CI config node factory on class levelGrzegorz Bizon2016-06-131-0/+35
| | * | | Add factory for fabricating new ci config nodesGrzegorz Bizon2016-06-101-0/+49
| | * | | Simplify new ci config entry class interfaceGrzegorz Bizon2016-06-103-39/+30
| | * | | Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-1032-341/+867
| | |\ \ \
| | * | | | Rename method that returns allowed nodes in Ci configGrzegorz Bizon2016-06-091-3/+3
| | * | | | Make it possible configure Ci entry descriptionGrzegorz Bizon2016-06-091-0/+5
| | * | | | Extract method that composes new Ci config entryGrzegorz Bizon2016-06-091-4/+25
| | * | | | Rename BeforeScript to Script in new Ci configGrzegorz Bizon2016-06-082-2/+2
| | * | | | Add minor improvements in new Ci config designGrzegorz Bizon2016-06-082-0/+24
| | * | | | Delegate Ci config entry value to single methodGrzegorz Bizon2016-06-083-8/+16
| | * | | | Merge branch 'master' into refactor/ci-config-add-global-entryGrzegorz Bizon2016-06-08100-1038/+3976
| | |\ \ \ \
| | * | | | | Implement script in Ci config and use in legacy oneGrzegorz Bizon2016-06-072-12/+27
| | * | | | | Add DSL for adding nodes in Ci config interfaceGrzegorz Bizon2016-06-071-0/+4
| | * | | | | Do not process new Ci config entry when invalidGrzegorz Bizon2016-06-071-0/+12
| | * | | | | Pass root Ci config entry to each subsequent entryGrzegorz Bizon2016-06-072-4/+2
| | * | | | | Add Ci config entry that implements Null ObjectGrzegorz Bizon2016-06-071-0/+17
| | * | | | | Do not process Ci config node when node is a leafGrzegorz Bizon2016-06-071-0/+6
| | * | | | | Use CI config errors from new processor in legacy oneGrzegorz Bizon2016-06-061-8/+34
| | * | | | | Collect errors from all nodes in new CI configGrzegorz Bizon2016-06-061-2/+23
| | * | | | | Validate new before script CI configuration entryGrzegorz Bizon2016-06-061-1/+23
| | * | | | | Implement CI configuration nodes tree processingGrzegorz Bizon2016-06-062-6/+30
| | * | | | | Rename ci config module that holds nodes to NodeGrzegorz Bizon2016-06-063-6/+6
| | * | | | | Add ci config global and before_script entriesGrzegorz Bizon2016-06-063-1/+18
* | | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1421-85/+239
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'confidential-issues-in-private-projects' into 'master' Douwe Maan2016-06-1413-10/+169
| |\ \ \ \ \ \
| | * | | | | | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-1313-10/+169
| | | |_|_|_|/ | | |/| | | |