summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-147-19/+56
|\
| * Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-141-0/+2
| |\
| | * Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-buildsTomasz Maczukin2016-01-142-4/+2
| | * Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-147-7/+45
| | |\
| | * \ Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-137-11/+22
| | |\ \
| | * \ \ Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1146-199/+333
| | |\ \ \
| | * | | | Modify builds scope filtering in builds APITomasz Maczukin2016-01-081-0/+4
| * | | | | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-142-1/+5
| |\ \ \ \ \
| | * | | | | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-141-0/+4
| | * | | | | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-1/+1
| * | | | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-142-3/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-111-1/+1
| | * | | | | Add #can_unsubscribe? to SentNotificationZeger-Jan van de Weg2016-01-091-0/+4
| | * | | | | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-092-3/+11
| * | | | | | Merge branch 'ci/view-build-artifacts' into 'master' Grzegorz Bizon2016-01-143-15/+34
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-141-2/+2
| | * | | | | Improvements, readability for artifacts browserGrzegorz Bizon2016-01-142-2/+2
| | * | | | | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-141-3/+1
| | * | | | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-6/+4
| | * | | | | Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-141-17/+3
| | * | | | | Improve path sanitization in `StringPath`Grzegorz Bizon2016-01-141-5/+5
| | * | | | | Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-141-5/+6
| | * | | | | Use metadata stored in artifacats metadata fileGrzegorz Bizon2016-01-141-2/+17
| | * | | | | Add artifacts metadata uploader filedGrzegorz Bizon2016-01-141-3/+5
| | * | | | | Make some conditions in `Ci::Build` more readableGrzegorz Bizon2016-01-141-4/+6
| | * | | | | Add method that checks if artifacts browser is supportedGrzegorz Bizon2016-01-141-0/+6
| | * | | | | Update specs for CI Build, add `artifacts?` methodGrzegorz Bizon2016-01-141-12/+14
| | * | | | | Rename method that returns url to CI build artifacts downloadGrzegorz Bizon2016-01-142-2/+6
| | * | | | | Mix `url_helpers` into `Ci::Build`Grzegorz Bizon2016-01-141-10/+6
| | * | | | | Add button to CI build artifacts browser into build summaryGrzegorz Bizon2016-01-141-0/+7
| | * | | | | Remove artifacts metadata column from databaseGrzegorz Bizon2016-01-141-2/+4
| | * | | | | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-2/+0
| | * | | | | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-141-1/+1
| | * | | | | Add `artifacts_metadata` field to `Ci::Build`Grzegorz Bizon2016-01-141-0/+2
* | | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-141-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-146-6/+40
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-1350-220/+371
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-1/+5
| * | | | | | Add features for list and show details of variables in APITomasz Maczukin2015-12-311-0/+1
* | | | | | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-146-6/+40
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-142-1/+17
| |\ \ \ \ \ \
| | * | | | | | fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-0/+1
| | * | | | | | Codestyle changesGabriel Mazetto2016-01-121-1/+1
| | * | | | | | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-082-0/+5
| | * | | | | | Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-081-1/+11
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix-safe-import-url' into 'master' Douwe Maan2016-01-141-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix the undefinded variable error in Project's safe_import_url methodDJ Mountney2016-01-131-1/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-142-2/+6
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-134-9/+15
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Move complex view condition to a model methodRémy Coutable2016-01-131-0/+4
View Lorry Controller Status